]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ifb: support more features
authorEric Dumazet <edumazet@google.com>
Sat, 7 May 2016 01:19:59 +0000 (18:19 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 9 May 2016 04:00:28 +0000 (00:00 -0400)
When using ifb+netem on ingress on SIT/IPIP/GRE traffic,
GRO packets are not properly processed.

Segmentation should not be forced, since ifb is already adding
quite a performance hit.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ifb.c

index cc56fac3c3f83ef51e4f42f67f9e1c4e549f7725..66c0eeafcb5d7c66d7f7d88614a2e5393cf48f7b 100644 (file)
@@ -196,6 +196,7 @@ static const struct net_device_ops ifb_netdev_ops = {
 
 #define IFB_FEATURES (NETIF_F_HW_CSUM | NETIF_F_SG  | NETIF_F_FRAGLIST | \
                      NETIF_F_TSO_ECN | NETIF_F_TSO | NETIF_F_TSO6      | \
+                     NETIF_F_GSO_ENCAP_ALL                             | \
                      NETIF_F_HIGHDMA | NETIF_F_HW_VLAN_CTAG_TX         | \
                      NETIF_F_HW_VLAN_STAG_TX)
 
@@ -224,6 +225,8 @@ static void ifb_setup(struct net_device *dev)
        dev->tx_queue_len = TX_Q_LIMIT;
 
        dev->features |= IFB_FEATURES;
+       dev->hw_features |= dev->features;
+       dev->hw_enc_features |= dev->features;
        dev->vlan_features |= IFB_FEATURES & ~(NETIF_F_HW_VLAN_CTAG_TX |
                                               NETIF_F_HW_VLAN_STAG_TX);