aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/igb/igb_main.c
diff options
context:
space:
mode:
authorAlexander Duyck <alexander.h.duyck@intel.com>2009-04-27 18:35:33 -0400
committerDavid S. Miller <davem@davemloft.net>2009-04-28 04:53:13 -0400
commit182ff8dfdb63e66ca81e4d3a4c746f8d578e5687 (patch)
tree8aa692b4a9576212020d61a1b2bab814aade1b9f /drivers/net/igb/igb_main.c
parent2844f7975837d47fe7f20aa96c1df3bcecf91935 (diff)
igb/ixgbe: remove unecessary checks for CHECKSUM_UNNECESSARY
Both of these drivers do a check to verify ip_summed is set to CHECKSUM_UNNECESSARY prior to passing the packet to GRO. GRO itself already does such a check so it is redundant and can be removed as this will likely cause out of order issues when receiving a packet that didn't pass checksum validation. Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/igb/igb_main.c')
-rw-r--r--drivers/net/igb/igb_main.c20
1 files changed, 6 insertions, 14 deletions
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c
index 4ecf4dfce9bd..f7f861215242 100644
--- a/drivers/net/igb/igb_main.c
+++ b/drivers/net/igb/igb_main.c
@@ -4430,20 +4430,12 @@ static void igb_receive_skb(struct igb_ring *ring, u8 status,
4430 bool vlan_extracted = (adapter->vlgrp && (status & E1000_RXD_STAT_VP)); 4430 bool vlan_extracted = (adapter->vlgrp && (status & E1000_RXD_STAT_VP));
4431 4431
4432 skb_record_rx_queue(skb, ring->queue_index); 4432 skb_record_rx_queue(skb, ring->queue_index);
4433 if (skb->ip_summed == CHECKSUM_UNNECESSARY) { 4433 if (vlan_extracted)
4434 if (vlan_extracted) 4434 vlan_gro_receive(&ring->napi, adapter->vlgrp,
4435 vlan_gro_receive(&ring->napi, adapter->vlgrp, 4435 le16_to_cpu(rx_desc->wb.upper.vlan),
4436 le16_to_cpu(rx_desc->wb.upper.vlan), 4436 skb);
4437 skb); 4437 else
4438 else 4438 napi_gro_receive(&ring->napi, skb);
4439 napi_gro_receive(&ring->napi, skb);
4440 } else {
4441 if (vlan_extracted)
4442 vlan_hwaccel_receive_skb(skb, adapter->vlgrp,
4443 le16_to_cpu(rx_desc->wb.upper.vlan));
4444 else
4445 netif_receive_skb(skb);
4446 }
4447} 4439}
4448 4440
4449static inline void igb_rx_checksum_adv(struct igb_adapter *adapter, 4441static inline void igb_rx_checksum_adv(struct igb_adapter *adapter,