GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-07-06 22:42:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

vmxnet3: fix indentation

Browse source 
Minor indentation out of alignment.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
stephen hemminger 2012-11-13 13:53:28 +00:00 • committed by David S. Miller
parent 1007dd1aa5
commit 96800ee73c
1 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

34
drivers/net/vmxnet3/vmxnet3_drv.c
View file

@ -1094,10 +1094,10 @@ vmxnet3_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
{ {
struct vmxnet3_adapter *adapter = netdev_priv(netdev); struct vmxnet3_adapter *adapter = netdev_priv(netdev);
BUG_ON(skb->queue_mapping > adapter->num_tx_queues); BUG_ON(skb->queue_mapping > adapter->num_tx_queues);
return vmxnet3_tq_xmit(skb, return vmxnet3_tq_xmit(skb,
&adapter->tx_queue[skb->queue_mapping], &adapter->tx_queue[skb->queue_mapping],
adapter, netdev); adapter, netdev);
} }
@ -1243,8 +1243,8 @@ vmxnet3_rq_rx_complete(struct vmxnet3_rx_queue *rq,
skb_reserve(new_skb, NET_IP_ALIGN); skb_reserve(new_skb, NET_IP_ALIGN);
rbi->skb = new_skb; rbi->skb = new_skb;
rbi->dma_addr = pci_map_single(adapter->pdev, rbi->dma_addr = pci_map_single(adapter->pdev,
rbi->skb->data, rbi->len, rbi->skb->data, rbi->len,
PCI_DMA_FROMDEVICE); PCI_DMA_FROMDEVICE);
rxd->addr = cpu_to_le64(rbi->dma_addr); rxd->addr = cpu_to_le64(rbi->dma_addr);
rxd->len = rbi->len; rxd->len = rbi->len;
@ -1331,14 +1331,14 @@ rcd_done:
/* if needed, update the register */ /* if needed, update the register */
if (unlikely(rq->shared->updateRxProd)) { if (unlikely(rq->shared->updateRxProd)) {
VMXNET3_WRITE_BAR0_REG(adapter, VMXNET3_WRITE_BAR0_REG(adapter,
rxprod_reg[ring_idx] + rq->qid * 8, rxprod_reg[ring_idx] + rq->qid * 8,
ring->next2fill); ring->next2fill);
rq->uncommitted[ring_idx] = 0; rq->uncommitted[ring_idx] = 0;
} }
vmxnet3_comp_ring_adv_next2proc(&rq->comp_ring); vmxnet3_comp_ring_adv_next2proc(&rq->comp_ring);
vmxnet3_getRxComp(rcd, vmxnet3_getRxComp(rcd,
&rq->comp_ring.base[rq->comp_ring.next2proc].rcd, &rxComp); &rq->comp_ring.base[rq->comp_ring.next2proc].rcd, &rxComp);
} }
return num_rxd; return num_rxd;
@ -2949,11 +2949,11 @@ vmxnet3_probe_device(struct pci_dev *pdev,
spin_lock_init(&adapter->cmd_lock); spin_lock_init(&adapter->cmd_lock);
adapter->shared = pci_alloc_consistent(adapter->pdev, adapter->shared = pci_alloc_consistent(adapter->pdev,
sizeof(struct Vmxnet3_DriverShared), sizeof(struct Vmxnet3_DriverShared),
&adapter->shared_pa); &adapter->shared_pa);
if (!adapter->shared) { if (!adapter->shared) {
printk(KERN_ERR "Failed to allocate memory for %s\n", printk(KERN_ERR "Failed to allocate memory for %s\n",
pci_name(pdev)); pci_name(pdev));
err = -ENOMEM; err = -ENOMEM;
goto err_alloc_shared; goto err_alloc_shared;
} }
@ -2964,16 +2964,16 @@ vmxnet3_probe_device(struct pci_dev *pdev,
size = sizeof(struct Vmxnet3_TxQueueDesc) * adapter->num_tx_queues; size = sizeof(struct Vmxnet3_TxQueueDesc) * adapter->num_tx_queues;
size += sizeof(struct Vmxnet3_RxQueueDesc) * adapter->num_rx_queues; size += sizeof(struct Vmxnet3_RxQueueDesc) * adapter->num_rx_queues;
adapter->tqd_start = pci_alloc_consistent(adapter->pdev, size, adapter->tqd_start = pci_alloc_consistent(adapter->pdev, size,
&adapter->queue_desc_pa); &adapter->queue_desc_pa);
if (!adapter->tqd_start) { if (!adapter->tqd_start) {
printk(KERN_ERR "Failed to allocate memory for %s\n", printk(KERN_ERR "Failed to allocate memory for %s\n",
pci_name(pdev)); pci_name(pdev));
err = -ENOMEM; err = -ENOMEM;
goto err_alloc_queue_desc; goto err_alloc_queue_desc;
} }
adapter->rqd_start = (struct Vmxnet3_RxQueueDesc *)(adapter->tqd_start + adapter->rqd_start = (struct Vmxnet3_RxQueueDesc *)(adapter->tqd_start +
adapter->num_tx_queues); adapter->num_tx_queues);
adapter->pm_conf = kmalloc(sizeof(struct Vmxnet3_PMConf), GFP_KERNEL); adapter->pm_conf = kmalloc(sizeof(struct Vmxnet3_PMConf), GFP_KERNEL);
if (adapter->pm_conf == NULL) { if (adapter->pm_conf == NULL) {
@ -3019,7 +3019,7 @@ vmxnet3_probe_device(struct pci_dev *pdev,
adapter->dev_number = atomic_read(&devices_found); adapter->dev_number = atomic_read(&devices_found);
adapter->share_intr = irq_share_mode; adapter->share_intr = irq_share_mode;
if (adapter->share_intr == VMXNET3_INTR_BUDDYSHARE && if (adapter->share_intr == VMXNET3_INTR_BUDDYSHARE &&
adapter->num_tx_queues != adapter->num_rx_queues) adapter->num_tx_queues != adapter->num_rx_queues)
adapter->share_intr = VMXNET3_INTR_DONTSHARE; adapter->share_intr = VMXNET3_INTR_DONTSHARE;
@ -3065,7 +3065,7 @@ vmxnet3_probe_device(struct pci_dev *pdev,
if (err) { if (err) {
printk(KERN_ERR "Failed to register adapter %s\n", printk(KERN_ERR "Failed to register adapter %s\n",
pci_name(pdev)); pci_name(pdev));
goto err_register; goto err_register;
} }