stmmac: Add vlan rx for better GRO performance.
authorVince Bridgers <vbridgers2013@gmail.com>
Tue, 14 Jan 2014 19:42:05 +0000 (13:42 -0600)
committerDavid S. Miller <davem@davemloft.net>
Wed, 15 Jan 2014 23:13:08 +0000 (15:13 -0800)
GRO requires VLANs to be removed before aggregation can occur.
The Synopsys EMAC does not strip VLAN tags so this must be
done by the driver.

Signed-off-by: Vince Bridgers <vbridgers2013@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c

index b8e3a4ce24b0469118b55590d93efec228374937..ecdc8ab50425d60214cae1829efdb6b09ca9bfe1 100644 (file)
@@ -1951,6 +1951,23 @@ static netdev_tx_t stmmac_xmit(struct sk_buff *skb, struct net_device *dev)
        return NETDEV_TX_OK;
 }
 
+static void stmmac_rx_vlan(struct net_device *dev, struct sk_buff *skb)
+{
+       struct ethhdr *ehdr;
+       u16 vlanid;
+
+       if ((dev->features & NETIF_F_HW_VLAN_CTAG_RX) ==
+           NETIF_F_HW_VLAN_CTAG_RX &&
+           !__vlan_get_tag(skb, &vlanid)) {
+               /* pop the vlan tag */
+               ehdr = (struct ethhdr *)skb->data;
+               memmove(skb->data + VLAN_HLEN, ehdr, ETH_ALEN * 2);
+               skb_pull(skb, VLAN_HLEN);
+               __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vlanid);
+       }
+}
+
+
 /**
  * stmmac_rx_refill: refill used skb preallocated buffers
  * @priv: driver private structure
@@ -2102,6 +2119,8 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit)
                                print_pkt(skb->data, frame_len);
                        }
 
+                       stmmac_rx_vlan(priv->dev, skb);
+
                        skb->protocol = eth_type_trans(skb, priv->dev);
 
                        if (unlikely(!coe))