diff options
| author | Stephen Hemminger <shemminger@vyatta.com> | 2009-06-17 07:30:39 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-06-17 18:49:47 -0700 |
| commit | 37e5a2439b43bb90655e17f00c9db5759909a712 (patch) | |
| tree | 386ec6f2f8ed5475362166cfcd565eb03cc0ef11 /drivers/net | |
| parent | bd1c6869f14f88aa82587ff51303e72dc7eec30e (diff) | |
| download | blackbird-op-linux-37e5a2439b43bb90655e17f00c9db5759909a712.tar.gz blackbird-op-linux-37e5a2439b43bb90655e17f00c9db5759909a712.zip | |
sky2: add GRO support
Add support for generic receive offload.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/sky2.c | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index 4f2afc770f8f..d2112e6258e6 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c @@ -2373,6 +2373,26 @@ static inline void sky2_tx_done(struct net_device *dev, u16 last) } } +static inline void sky2_skb_rx(const struct sky2_port *sky2, + u32 status, struct sk_buff *skb) +{ +#ifdef SKY2_VLAN_TAG_USED + u16 vlan_tag = be16_to_cpu(sky2->rx_tag); + if (sky2->vlgrp && (status & GMR_FS_VLAN)) { + if (skb->ip_summed == CHECKSUM_NONE) + vlan_hwaccel_receive_skb(skb, sky2->vlgrp, vlan_tag); + else + vlan_gro_receive(&sky2->hw->napi, sky2->vlgrp, + vlan_tag, skb); + return; + } +#endif + if (skb->ip_summed == CHECKSUM_NONE) + netif_receive_skb(skb); + else + napi_gro_receive(&sky2->hw->napi, skb); +} + static inline void sky2_rx_done(struct sky2_hw *hw, unsigned port, unsigned packets, unsigned bytes) { @@ -2438,14 +2458,7 @@ static int sky2_status_intr(struct sky2_hw *hw, int to_do, u16 idx) skb->protocol = eth_type_trans(skb, dev); -#ifdef SKY2_VLAN_TAG_USED - if (sky2->vlgrp && (status & GMR_FS_VLAN)) { - vlan_hwaccel_receive_skb(skb, - sky2->vlgrp, - be16_to_cpu(sky2->rx_tag)); - } else -#endif - netif_receive_skb(skb); + sky2_skb_rx(sky2, status, skb); /* Stop after net poll weight */ if (++work_done >= to_do) |
