Commit daf6928b authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by Jeff Garzik

[PATCH] amd8111e: Fix identation of amd8111e_rx_poll()

This patch does an indentation fix to amd8111e_rx_poll() which was
incorrectly shifting left in the middle of a while() loop, thus
rendering the function difficult to read. There is no actual code
change.
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarJeff Garzik <jgarzik@pobox.com>
parent 2a282f2e
...@@ -756,7 +756,6 @@ static int amd8111e_rx_poll(struct net_device *dev, int * budget) ...@@ -756,7 +756,6 @@ static int amd8111e_rx_poll(struct net_device *dev, int * budget)
/* reseting flags */ /* reseting flags */
lp->rx_ring[rx_index].rx_flags &=RESET_RX_FLAGS; lp->rx_ring[rx_index].rx_flags &=RESET_RX_FLAGS;
goto err_next_pkt; goto err_next_pkt;
} }
/* check for STP and ENP */ /* check for STP and ENP */
status = le16_to_cpu(lp->rx_ring[rx_index].rx_flags); status = le16_to_cpu(lp->rx_ring[rx_index].rx_flags);
...@@ -800,19 +799,19 @@ static int amd8111e_rx_poll(struct net_device *dev, int * budget) ...@@ -800,19 +799,19 @@ static int amd8111e_rx_poll(struct net_device *dev, int * budget)
lp->rx_skbuff[rx_index] = new_skb; lp->rx_skbuff[rx_index] = new_skb;
new_skb->dev = dev; new_skb->dev = dev;
lp->rx_dma_addr[rx_index] = pci_map_single(lp->pci_dev, lp->rx_dma_addr[rx_index] = pci_map_single(lp->pci_dev,
new_skb->data, lp->rx_buff_len-2,PCI_DMA_FROMDEVICE); new_skb->data,
lp->rx_buff_len-2,
PCI_DMA_FROMDEVICE);
skb->protocol = eth_type_trans(skb, dev); skb->protocol = eth_type_trans(skb, dev);
#if AMD8111E_VLAN_TAG_USED #if AMD8111E_VLAN_TAG_USED
vtag = lp->rx_ring[rx_index].rx_flags & TT_MASK; vtag = lp->rx_ring[rx_index].rx_flags & TT_MASK;
if(lp->vlgrp != NULL && (vtag == TT_VLAN_TAGGED)){ if(lp->vlgrp != NULL && (vtag == TT_VLAN_TAGGED)){
amd8111e_vlan_rx(lp, skb, amd8111e_vlan_rx(lp, skb,
lp->rx_ring[rx_index].tag_ctrl_info); lp->rx_ring[rx_index].tag_ctrl_info);
} else } else
#endif #endif
netif_receive_skb(skb); netif_receive_skb(skb);
/*COAL update rx coalescing parameters*/ /*COAL update rx coalescing parameters*/
lp->coal_conf.rx_packets++; lp->coal_conf.rx_packets++;
...@@ -820,7 +819,7 @@ static int amd8111e_rx_poll(struct net_device *dev, int * budget) ...@@ -820,7 +819,7 @@ static int amd8111e_rx_poll(struct net_device *dev, int * budget)
num_rx_pkt++; num_rx_pkt++;
dev->last_rx = jiffies; dev->last_rx = jiffies;
err_next_pkt: err_next_pkt:
lp->rx_ring[rx_index].buff_phy_addr lp->rx_ring[rx_index].buff_phy_addr
= cpu_to_le32(lp->rx_dma_addr[rx_index]); = cpu_to_le32(lp->rx_dma_addr[rx_index]);
lp->rx_ring[rx_index].buff_count = lp->rx_ring[rx_index].buff_count =
...@@ -835,7 +834,7 @@ static int amd8111e_rx_poll(struct net_device *dev, int * budget) ...@@ -835,7 +834,7 @@ static int amd8111e_rx_poll(struct net_device *dev, int * budget)
/*Ack receive packets */ /*Ack receive packets */
writel(intr0 & RINT0,mmio + INT0); writel(intr0 & RINT0,mmio + INT0);
}while(intr0 & RINT0); } while(intr0 & RINT0);
/* Receive descriptor is empty now */ /* Receive descriptor is empty now */
dev->quota -= num_rx_pkt; dev->quota -= num_rx_pkt;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment