tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

David S. Miller 5e4e7573 3d3be433

+8 -11
unified split
+8 -11
drivers/net/sky2.c
··· 2520 2520 } 2521 2521 } 2522 2522 2523 - static inline void sky2_skb_rx(struct napi_struct *napi, 2524 - const struct sky2_port *sky2, 2523 + static inline void sky2_skb_rx(const struct sky2_port *sky2, 2525 2524 u32 status, struct sk_buff *skb) 2526 2525 { 2527 2526 #ifdef SKY2_VLAN_TAG_USED 2527 + u16 vlan_tag = be16_to_cpu(sky2->rx_tag); 2528 2528 if (sky2->vlgrp && (status & GMR_FS_VLAN)) { 2529 - u16 vlan_tag = be16_to_cpu(sky2->rx_tag); 2530 - 2531 - if (skb->ip_summed == CHECKSUM_NONE || 2532 - sky2->netdev != napi->dev) 2529 + if (skb->ip_summed == CHECKSUM_NONE) 2533 2530 vlan_hwaccel_receive_skb(skb, sky2->vlgrp, vlan_tag); 2534 2531 else 2535 - vlan_gro_receive(napi, sky2->vlgrp, vlan_tag, skb); 2532 + vlan_gro_receive(&sky2->hw->napi, sky2->vlgrp, 2533 + vlan_tag, skb); 2536 2534 return; 2537 2535 } 2538 2536 #endif 2539 - if (skb->ip_summed == CHECKSUM_NONE || 2540 - sky2->netdev != napi->dev) 2537 + if (skb->ip_summed == CHECKSUM_NONE) 2541 2538 netif_receive_skb(skb); 2542 2539 else 2543 - napi_gro_receive(napi, skb); 2540 + napi_gro_receive(&sky2->hw->napi, skb); 2544 2541 } 2545 2542 2546 2543 static inline void sky2_rx_done(struct sky2_hw *hw, unsigned port, ··· 2638 2641 2639 2642 skb->protocol = eth_type_trans(skb, dev); 2640 2643 2641 - sky2_skb_rx(&hw->napi, sky2, status, skb); 2644 + sky2_skb_rx(sky2, status, skb); 2642 2645 2643 2646 /* Stop after net poll weight */ 2644 2647 if (++work_done >= to_do)