lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

igb/ixgbe: remove unecessary checks for CHECKSUM_UNNECESSARY

Browse Source 
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>
This commit is contained in:
Alexander Duyck
2009-04-27 22:35:33 +00:00
committed by David S. Miller
parent 2844f79758
commit 182ff8dfdb
2 changed files with 11 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/net/igb/igb_main.c
View File

@@ -4430,20 +4430,12 @@ static void igb_receive_skb(struct igb_ring *ring, u8 status,
bool vlan_extracted = (adapter->vlgrp && (status & E1000_RXD_STAT_VP)); bool vlan_extracted = (adapter->vlgrp && (status & E1000_RXD_STAT_VP));
skb_record_rx_queue(skb, ring->queue_index); skb_record_rx_queue(skb, ring->queue_index);
if (skb->ip_summed == CHECKSUM_UNNECESSARY) { if (vlan_extracted)
if (vlan_extracted) vlan_gro_receive(&ring->napi, adapter->vlgrp,
vlan_gro_receive(&ring->napi, adapter->vlgrp, le16_to_cpu(rx_desc->wb.upper.vlan),
le16_to_cpu(rx_desc->wb.upper.vlan), skb);
skb); else
else napi_gro_receive(&ring->napi, skb);
napi_gro_receive(&ring->napi, skb);
} else {
if (vlan_extracted)
vlan_hwaccel_receive_skb(skb, adapter->vlgrp,
le16_to_cpu(rx_desc->wb.upper.vlan));
else
netif_receive_skb(skb);
}
} }
static inline void igb_rx_checksum_adv(struct igb_adapter *adapter, static inline void igb_rx_checksum_adv(struct igb_adapter *adapter,

17
drivers/net/ixgbe/ixgbe_main.c
View File

@@ -459,23 +459,16 @@ static void ixgbe_receive_skb(struct ixgbe_q_vector *q_vector,
u16 tag = le16_to_cpu(rx_desc->wb.upper.vlan); u16 tag = le16_to_cpu(rx_desc->wb.upper.vlan);
skb_record_rx_queue(skb, q_vector - &adapter->q_vector[0]); skb_record_rx_queue(skb, q_vector - &adapter->q_vector[0]);
if (skb->ip_summed == CHECKSUM_UNNECESSARY) { if (!(adapter->flags & IXGBE_FLAG_IN_NETPOLL)) {
if (adapter->vlgrp && is_vlan && (tag != 0)) if (adapter->vlgrp && is_vlan && (tag != 0))
vlan_gro_receive(napi, adapter->vlgrp, tag, skb); vlan_gro_receive(napi, adapter->vlgrp, tag, skb);
else else
napi_gro_receive(napi, skb); napi_gro_receive(napi, skb);
} else { } else {
if (!(adapter->flags & IXGBE_FLAG_IN_NETPOLL)) { if (adapter->vlgrp && is_vlan && (tag != 0))
if (adapter->vlgrp && is_vlan && (tag != 0)) vlan_hwaccel_rx(skb, adapter->vlgrp, tag);
vlan_hwaccel_receive_skb(skb, adapter->vlgrp, tag); else
else netif_rx(skb);
netif_receive_skb(skb);
} else {
if (adapter->vlgrp && is_vlan && (tag != 0))
vlan_hwaccel_rx(skb, adapter->vlgrp, tag);
else
netif_rx(skb);
}
} }
} }