redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

Revert "sky2: don't do GRO on second port"

Browse source 
This reverts commit de6be6c1f7.

After some discussion with Jarek Poplawski and Eric Dumazet, we've
decided that this change is incorrect.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2010-09-02 09:39:09 -07:00
parent 3d3be4333f
commit 5e4e7573e1
1 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
drivers/net/sky2.c
View file

@ -2520,27 +2520,24 @@ static inline void sky2_tx_done(struct net_device *dev, u16 last)
} }
} }
static inline void sky2_skb_rx(struct napi_struct *napi, static inline void sky2_skb_rx(const struct sky2_port *sky2,
const struct sky2_port *sky2,
u32 status, struct sk_buff *skb) u32 status, struct sk_buff *skb)
{ {
#ifdef SKY2_VLAN_TAG_USED #ifdef SKY2_VLAN_TAG_USED
u16 vlan_tag = be16_to_cpu(sky2->rx_tag);
if (sky2->vlgrp && (status & GMR_FS_VLAN)) { if (sky2->vlgrp && (status & GMR_FS_VLAN)) {
u16 vlan_tag = be16_to_cpu(sky2->rx_tag); if (skb->ip_summed == CHECKSUM_NONE)
if (skb->ip_summed == CHECKSUM_NONE ||
sky2->netdev != napi->dev)
vlan_hwaccel_receive_skb(skb, sky2->vlgrp, vlan_tag); vlan_hwaccel_receive_skb(skb, sky2->vlgrp, vlan_tag);
else else
vlan_gro_receive(napi, sky2->vlgrp, vlan_tag, skb); vlan_gro_receive(&sky2->hw->napi, sky2->vlgrp,
vlan_tag, skb);
return; return;
} }
#endif #endif
if (skb->ip_summed == CHECKSUM_NONE || if (skb->ip_summed == CHECKSUM_NONE)
sky2->netdev != napi->dev)
netif_receive_skb(skb); netif_receive_skb(skb);
else else
napi_gro_receive(napi, skb); napi_gro_receive(&sky2->hw->napi, skb);
} }
static inline void sky2_rx_done(struct sky2_hw *hw, unsigned port, static inline void sky2_rx_done(struct sky2_hw *hw, unsigned port,
@ -2641,7 +2638,7 @@ static int sky2_status_intr(struct sky2_hw *hw, int to_do, u16 idx)
skb->protocol = eth_type_trans(skb, dev); skb->protocol = eth_type_trans(skb, dev);
sky2_skb_rx(&hw->napi, sky2, status, skb); sky2_skb_rx(sky2, status, skb);
/* Stop after net poll weight */ /* Stop after net poll weight */
if (++work_done >= to_do) if (++work_done >= to_do)