diff options
Diffstat (limited to 'drivers/net/ixgb/ixgb_main.c')
-rw-r--r-- | drivers/net/ixgb/ixgb_main.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c index 796f01109d74..c1dde795a837 100644 --- a/drivers/net/ixgb/ixgb_main.c +++ b/drivers/net/ixgb/ixgb_main.c | |||
@@ -398,7 +398,7 @@ ixgb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
398 | goto err_ioremap; | 398 | goto err_ioremap; |
399 | } | 399 | } |
400 | 400 | ||
401 | for(i = BAR_1; i <= BAR_5; i++) { | 401 | for (i = BAR_1; i <= BAR_5; i++) { |
402 | if (pci_resource_len(pdev, i) == 0) | 402 | if (pci_resource_len(pdev, i) == 0) |
403 | continue; | 403 | continue; |
404 | if (pci_resource_flags(pdev, i) & IORESOURCE_IO) { | 404 | if (pci_resource_flags(pdev, i) & IORESOURCE_IO) { |
@@ -923,7 +923,7 @@ ixgb_clean_tx_ring(struct ixgb_adapter *adapter) | |||
923 | 923 | ||
924 | /* Free all the Tx ring sk_buffs */ | 924 | /* Free all the Tx ring sk_buffs */ |
925 | 925 | ||
926 | for(i = 0; i < tx_ring->count; i++) { | 926 | for (i = 0; i < tx_ring->count; i++) { |
927 | buffer_info = &tx_ring->buffer_info[i]; | 927 | buffer_info = &tx_ring->buffer_info[i]; |
928 | ixgb_unmap_and_free_tx_resource(adapter, buffer_info); | 928 | ixgb_unmap_and_free_tx_resource(adapter, buffer_info); |
929 | } | 929 | } |
@@ -981,7 +981,7 @@ ixgb_clean_rx_ring(struct ixgb_adapter *adapter) | |||
981 | 981 | ||
982 | /* Free all the Rx ring sk_buffs */ | 982 | /* Free all the Rx ring sk_buffs */ |
983 | 983 | ||
984 | for(i = 0; i < rx_ring->count; i++) { | 984 | for (i = 0; i < rx_ring->count; i++) { |
985 | buffer_info = &rx_ring->buffer_info[i]; | 985 | buffer_info = &rx_ring->buffer_info[i]; |
986 | if (buffer_info->skb) { | 986 | if (buffer_info->skb) { |
987 | 987 | ||
@@ -1298,7 +1298,7 @@ ixgb_tx_map(struct ixgb_adapter *adapter, struct sk_buff *skb, | |||
1298 | if (++i == tx_ring->count) i = 0; | 1298 | if (++i == tx_ring->count) i = 0; |
1299 | } | 1299 | } |
1300 | 1300 | ||
1301 | for(f = 0; f < nr_frags; f++) { | 1301 | for (f = 0; f < nr_frags; f++) { |
1302 | struct skb_frag_struct *frag; | 1302 | struct skb_frag_struct *frag; |
1303 | 1303 | ||
1304 | frag = &skb_shinfo(skb)->frags[f]; | 1304 | frag = &skb_shinfo(skb)->frags[f]; |
@@ -1727,7 +1727,7 @@ ixgb_intr(int irq, void *data) | |||
1727 | * every pass through this for loop checks both receive and | 1727 | * every pass through this for loop checks both receive and |
1728 | * transmit queues for completed descriptors, intended to | 1728 | * transmit queues for completed descriptors, intended to |
1729 | * avoid starvation issues and assist tx/rx fairness. */ | 1729 | * avoid starvation issues and assist tx/rx fairness. */ |
1730 | for(i = 0; i < IXGB_MAX_INTR; i++) | 1730 | for (i = 0; i < IXGB_MAX_INTR; i++) |
1731 | if (!ixgb_clean_rx_irq(adapter) & | 1731 | if (!ixgb_clean_rx_irq(adapter) & |
1732 | !ixgb_clean_tx_irq(adapter)) | 1732 | !ixgb_clean_tx_irq(adapter)) |
1733 | break; | 1733 | break; |
@@ -2196,7 +2196,7 @@ ixgb_restore_vlan(struct ixgb_adapter *adapter) | |||
2196 | 2196 | ||
2197 | if (adapter->vlgrp) { | 2197 | if (adapter->vlgrp) { |
2198 | u16 vid; | 2198 | u16 vid; |
2199 | for(vid = 0; vid < VLAN_GROUP_ARRAY_LEN; vid++) { | 2199 | for (vid = 0; vid < VLAN_GROUP_ARRAY_LEN; vid++) { |
2200 | if (!vlan_group_get_device(adapter->vlgrp, vid)) | 2200 | if (!vlan_group_get_device(adapter->vlgrp, vid)) |
2201 | continue; | 2201 | continue; |
2202 | ixgb_vlan_rx_add_vid(adapter->netdev, vid); | 2202 | ixgb_vlan_rx_add_vid(adapter->netdev, vid); |