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

This reverts commit de6be6c1f77798c4da38301693d33aff1cd76e84.

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>

1 files changed, 8 insertions, 11 deletions

diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index a6ff113d34bb..194e5cf8c763 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -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,
-                               const struct sky2_port *sky2,
+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)) {
-                u16 vlan_tag = be16_to_cpu(sky2->rx_tag);
-
-                if (skb->ip_summed == CHECKSUM_NONE ||
-                    sky2->netdev != napi->dev)
+                if (skb->ip_summed == CHECKSUM_NONE)
                         vlan_hwaccel_receive_skb(skb, sky2->vlgrp, vlan_tag);
                 else
-                        vlan_gro_receive(napi, sky2->vlgrp, vlan_tag, skb);
+                        vlan_gro_receive(&sky2->hw->napi, sky2->vlgrp,
+                                         vlan_tag, skb);
                 return;
         }
 #endif
-        if (skb->ip_summed == CHECKSUM_NONE ||
-            sky2->netdev != napi->dev)
+        if (skb->ip_summed == CHECKSUM_NONE)
                 netif_receive_skb(skb);
         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,
@@ -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);
 
-                        sky2_skb_rx(&hw->napi, sky2, status, skb);
+                        sky2_skb_rx(sky2, status, skb);
 
                         /* Stop after net poll weight */
                         if (++work_done >= to_do)