diff options
-rw-r--r-- | drivers/net/ixgb/ixgb_ee.c | 2 | ||||
-rw-r--r-- | drivers/net/ixgb/ixgb_main.c | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/ixgb/ixgb_ee.c b/drivers/net/ixgb/ixgb_ee.c index ba41d2a54c81..8bc9716b6ce0 100644 --- a/drivers/net/ixgb/ixgb_ee.c +++ b/drivers/net/ixgb/ixgb_ee.c | |||
@@ -120,7 +120,7 @@ ixgb_shift_out_bits(struct ixgb_hw *hw, | |||
120 | 120 | ||
121 | mask = mask >> 1; | 121 | mask = mask >> 1; |
122 | 122 | ||
123 | } while(mask); | 123 | } while (mask); |
124 | 124 | ||
125 | /* We leave the "DI" bit set to "0" when we leave this routine. */ | 125 | /* We leave the "DI" bit set to "0" when we leave this routine. */ |
126 | eecd_reg &= ~IXGB_EECD_DI; | 126 | eecd_reg &= ~IXGB_EECD_DI; |
diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c index f7dda049dd86..dffb853111b7 100644 --- a/drivers/net/ixgb/ixgb_main.c +++ b/drivers/net/ixgb/ixgb_main.c | |||
@@ -1274,7 +1274,7 @@ ixgb_tx_map(struct ixgb_adapter *adapter, struct sk_buff *skb, | |||
1274 | 1274 | ||
1275 | i = tx_ring->next_to_use; | 1275 | i = tx_ring->next_to_use; |
1276 | 1276 | ||
1277 | while(len) { | 1277 | while (len) { |
1278 | buffer_info = &tx_ring->buffer_info[i]; | 1278 | buffer_info = &tx_ring->buffer_info[i]; |
1279 | size = min(len, IXGB_MAX_DATA_PER_TXD); | 1279 | size = min(len, IXGB_MAX_DATA_PER_TXD); |
1280 | /* Workaround for premature desc write-backs | 1280 | /* Workaround for premature desc write-backs |
@@ -1305,7 +1305,7 @@ ixgb_tx_map(struct ixgb_adapter *adapter, struct sk_buff *skb, | |||
1305 | len = frag->size; | 1305 | len = frag->size; |
1306 | offset = 0; | 1306 | offset = 0; |
1307 | 1307 | ||
1308 | while(len) { | 1308 | while (len) { |
1309 | buffer_info = &tx_ring->buffer_info[i]; | 1309 | buffer_info = &tx_ring->buffer_info[i]; |
1310 | size = min(len, IXGB_MAX_DATA_PER_TXD); | 1310 | size = min(len, IXGB_MAX_DATA_PER_TXD); |
1311 | 1311 | ||
@@ -1362,7 +1362,7 @@ ixgb_tx_queue(struct ixgb_adapter *adapter, int count, int vlan_id,int tx_flags) | |||
1362 | 1362 | ||
1363 | i = tx_ring->next_to_use; | 1363 | i = tx_ring->next_to_use; |
1364 | 1364 | ||
1365 | while(count--) { | 1365 | while (count--) { |
1366 | buffer_info = &tx_ring->buffer_info[i]; | 1366 | buffer_info = &tx_ring->buffer_info[i]; |
1367 | tx_desc = IXGB_TX_DESC(*tx_ring, i); | 1367 | tx_desc = IXGB_TX_DESC(*tx_ring, i); |
1368 | tx_desc->buff_addr = cpu_to_le64(buffer_info->dma); | 1368 | tx_desc->buff_addr = cpu_to_le64(buffer_info->dma); |
@@ -1781,7 +1781,7 @@ ixgb_clean_tx_irq(struct ixgb_adapter *adapter) | |||
1781 | eop = tx_ring->buffer_info[i].next_to_watch; | 1781 | eop = tx_ring->buffer_info[i].next_to_watch; |
1782 | eop_desc = IXGB_TX_DESC(*tx_ring, eop); | 1782 | eop_desc = IXGB_TX_DESC(*tx_ring, eop); |
1783 | 1783 | ||
1784 | while(eop_desc->status & IXGB_TX_DESC_STATUS_DD) { | 1784 | while (eop_desc->status & IXGB_TX_DESC_STATUS_DD) { |
1785 | 1785 | ||
1786 | for (cleaned = false; !cleaned; ) { | 1786 | for (cleaned = false; !cleaned; ) { |
1787 | tx_desc = IXGB_TX_DESC(*tx_ring, i); | 1787 | tx_desc = IXGB_TX_DESC(*tx_ring, i); |
@@ -1912,7 +1912,7 @@ ixgb_clean_rx_irq(struct ixgb_adapter *adapter) | |||
1912 | rx_desc = IXGB_RX_DESC(*rx_ring, i); | 1912 | rx_desc = IXGB_RX_DESC(*rx_ring, i); |
1913 | buffer_info = &rx_ring->buffer_info[i]; | 1913 | buffer_info = &rx_ring->buffer_info[i]; |
1914 | 1914 | ||
1915 | while(rx_desc->status & IXGB_RX_DESC_STATUS_DD) { | 1915 | while (rx_desc->status & IXGB_RX_DESC_STATUS_DD) { |
1916 | struct sk_buff *skb, *next_skb; | 1916 | struct sk_buff *skb, *next_skb; |
1917 | u8 status; | 1917 | u8 status; |
1918 | 1918 | ||
@@ -2053,7 +2053,7 @@ ixgb_alloc_rx_buffers(struct ixgb_adapter *adapter) | |||
2053 | 2053 | ||
2054 | 2054 | ||
2055 | /* leave three descriptors unused */ | 2055 | /* leave three descriptors unused */ |
2056 | while(--cleancount > 2) { | 2056 | while (--cleancount > 2) { |
2057 | /* recycle! its good for you */ | 2057 | /* recycle! its good for you */ |
2058 | skb = buffer_info->skb; | 2058 | skb = buffer_info->skb; |
2059 | if (skb) { | 2059 | if (skb) { |