---

yaml
---
r: 210271
b: refs/heads/master
c: 5e4e757
h: refs/heads/master
i:
  210269: 9f26ee4
  210267: 9fb941a
  210263: bcc3152
  210255: 62b0995
  210239: f17f6d3
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3d3be4333fdf6faa080947b331a6a19bce1a4f57
+refs/heads/master: 5e4e7573e1ec286120109e73bf54cff465488725

trunk/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)