diff options
Diffstat (limited to 'drivers/net/ethernet/intel/e1000e/netdev.c')
-rw-r--r-- | drivers/net/ethernet/intel/e1000e/netdev.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c index e8192d3f7eb4..247f61f77e5d 100644 --- a/drivers/net/ethernet/intel/e1000e/netdev.c +++ b/drivers/net/ethernet/intel/e1000e/netdev.c | |||
@@ -1495,7 +1495,7 @@ static bool e1000_clean_jumbo_rx_irq(struct e1000_ring *rx_ring, int *work_done, | |||
1495 | unsigned int i; | 1495 | unsigned int i; |
1496 | int cleaned_count = 0; | 1496 | int cleaned_count = 0; |
1497 | bool cleaned = false; | 1497 | bool cleaned = false; |
1498 | unsigned int total_rx_bytes=0, total_rx_packets=0; | 1498 | unsigned int total_rx_bytes = 0, total_rx_packets = 0; |
1499 | 1499 | ||
1500 | i = rx_ring->next_to_clean; | 1500 | i = rx_ring->next_to_clean; |
1501 | rx_desc = E1000_RX_DESC_EXT(*rx_ring, i); | 1501 | rx_desc = E1000_RX_DESC_EXT(*rx_ring, i); |
@@ -2489,7 +2489,7 @@ static unsigned int e1000_update_itr(u16 itr_setting, int packets, int bytes) | |||
2489 | switch (itr_setting) { | 2489 | switch (itr_setting) { |
2490 | case lowest_latency: | 2490 | case lowest_latency: |
2491 | /* handle TSO and jumbo frames */ | 2491 | /* handle TSO and jumbo frames */ |
2492 | if (bytes/packets > 8000) | 2492 | if (bytes / packets > 8000) |
2493 | retval = bulk_latency; | 2493 | retval = bulk_latency; |
2494 | else if ((packets < 5) && (bytes > 512)) | 2494 | else if ((packets < 5) && (bytes > 512)) |
2495 | retval = low_latency; | 2495 | retval = low_latency; |
@@ -2497,13 +2497,13 @@ static unsigned int e1000_update_itr(u16 itr_setting, int packets, int bytes) | |||
2497 | case low_latency: /* 50 usec aka 20000 ints/s */ | 2497 | case low_latency: /* 50 usec aka 20000 ints/s */ |
2498 | if (bytes > 10000) { | 2498 | if (bytes > 10000) { |
2499 | /* this if handles the TSO accounting */ | 2499 | /* this if handles the TSO accounting */ |
2500 | if (bytes/packets > 8000) | 2500 | if (bytes / packets > 8000) |
2501 | retval = bulk_latency; | 2501 | retval = bulk_latency; |
2502 | else if ((packets < 10) || ((bytes/packets) > 1200)) | 2502 | else if ((packets < 10) || ((bytes / packets) > 1200)) |
2503 | retval = bulk_latency; | 2503 | retval = bulk_latency; |
2504 | else if ((packets > 35)) | 2504 | else if ((packets > 35)) |
2505 | retval = lowest_latency; | 2505 | retval = lowest_latency; |
2506 | } else if (bytes/packets > 2000) { | 2506 | } else if (bytes / packets > 2000) { |
2507 | retval = bulk_latency; | 2507 | retval = bulk_latency; |
2508 | } else if (packets <= 2 && bytes < 512) { | 2508 | } else if (packets <= 2 && bytes < 512) { |
2509 | retval = lowest_latency; | 2509 | retval = lowest_latency; |
@@ -5346,7 +5346,7 @@ static int e1000_transfer_dhcp_info(struct e1000_adapter *adapter, | |||
5346 | return 0; | 5346 | return 0; |
5347 | 5347 | ||
5348 | { | 5348 | { |
5349 | const struct iphdr *ip = (struct iphdr *)((u8 *)skb->data+14); | 5349 | const struct iphdr *ip = (struct iphdr *)((u8 *)skb->data + 14); |
5350 | struct udphdr *udp; | 5350 | struct udphdr *udp; |
5351 | 5351 | ||
5352 | if (ip->protocol != IPPROTO_UDP) | 5352 | if (ip->protocol != IPPROTO_UDP) |