diff options
| author | David S. Miller <davem@davemloft.net> | 2017-05-24 22:27:22 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-05-24 22:27:22 +0200 |
| commit | e6a88e4ba88f3dd9d772f0ff7a88837939264883 (patch) | |
| tree | 2b342f50dd0d585ce34c08e68cd6d1fcd4ddae40 /drivers | |
| parent | net: phy: marvell: Limit errata to 88m1101 (diff) | |
| parent | virtio-net: enable TSO/checksum offloads for Q-in-Q vlans (diff) | |
| download | linux-e6a88e4ba88f3dd9d772f0ff7a88837939264883.tar.xz linux-e6a88e4ba88f3dd9d772f0ff7a88837939264883.zip | |
Merge branch 'q-in-q-checksums'
Daniel Borkmann says:
====================
BPF pruning follow-up
Follow-up to fix incorrect pruning when alignment tracking is
in use and to properly clear regs after call to not leave stale
data behind. For details, please see individual patches.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/ethernet/emulex/benet/be_main.c | 4 | ||||
| -rw-r--r-- | drivers/net/virtio_net.c | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c index f3a09ab55900..4eee18ce9be4 100644 --- a/drivers/net/ethernet/emulex/benet/be_main.c +++ b/drivers/net/ethernet/emulex/benet/be_main.c @@ -5078,9 +5078,11 @@ static netdev_features_t be_features_check(struct sk_buff *skb, struct be_adapter *adapter = netdev_priv(dev); u8 l4_hdr = 0; - /* The code below restricts offload features for some tunneled packets. + /* The code below restricts offload features for some tunneled and + * Q-in-Q packets. * Offload features for normal (non tunnel) packets are unchanged. */ + features = vlan_features_check(skb, features); if (!skb->encapsulation || !(adapter->flags & BE_FLAGS_VXLAN_OFFLOADS)) return features; diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 9320d96a1632..3e9246cc49c3 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -1989,6 +1989,7 @@ static const struct net_device_ops virtnet_netdev = { .ndo_poll_controller = virtnet_netpoll, #endif .ndo_xdp = virtnet_xdp, + .ndo_features_check = passthru_features_check, }; static void virtnet_config_changed_work(struct work_struct *work) |