mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-12 13:55:32 +00:00
Code Issues Releases Wiki Activity

Merge branch 'q-in-q-checksums'

Browse source 
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>
This commit is contained in:
David S. Miller 2017-05-24 16:27:22 -04:00
commit e6a88e4ba8
3 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/net/ethernet/emulex/benet/be_main.c
View file

@ -5078,9 +5078,11 @@ static netdev_features_t be_features_check(struct sk_buff *skb,
struct be_adapter *adapter = netdev_priv(dev); struct be_adapter *adapter = netdev_priv(dev);
u8 l4_hdr = 0; 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. * Offload features for normal (non tunnel) packets are unchanged.
*/ */
features = vlan_features_check(skb, features);
if (!skb->encapsulation || if (!skb->encapsulation ||
!(adapter->flags & BE_FLAGS_VXLAN_OFFLOADS)) !(adapter->flags & BE_FLAGS_VXLAN_OFFLOADS))
return features; return features;

1
drivers/net/virtio_net.c
View file

@ -1989,6 +1989,7 @@ static const struct net_device_ops virtnet_netdev = {
.ndo_poll_controller = virtnet_netpoll, .ndo_poll_controller = virtnet_netpoll,
#endif #endif
.ndo_xdp = virtnet_xdp, .ndo_xdp = virtnet_xdp,
.ndo_features_check = passthru_features_check,
}; };
static void virtnet_config_changed_work(struct work_struct *work) static void virtnet_config_changed_work(struct work_struct *work)

18
include/linux/if_vlan.h
View file

@ -614,14 +614,16 @@ static inline bool skb_vlan_tagged_multi(const struct sk_buff *skb)
static inline netdev_features_t vlan_features_check(const struct sk_buff *skb, static inline netdev_features_t vlan_features_check(const struct sk_buff *skb,
netdev_features_t features) netdev_features_t features)
{ {
if (skb_vlan_tagged_multi(skb)) if (skb_vlan_tagged_multi(skb)) {
features = netdev_intersect_features(features, /* In the case of multi-tagged packets, use a direct mask
NETIF_F_SG | * instead of using netdev_interesect_features(), to make
NETIF_F_HIGHDMA | * sure that only devices supporting NETIF_F_HW_CSUM will
NETIF_F_FRAGLIST | * have checksum offloading support.
NETIF_F_HW_CSUM | */
NETIF_F_HW_VLAN_CTAG_TX | features &= NETIF_F_SG | NETIF_F_HIGHDMA | NETIF_F_HW_CSUM |
NETIF_F_HW_VLAN_STAG_TX); NETIF_F_FRAGLIST | NETIF_F_HW_VLAN_CTAG_TX |
NETIF_F_HW_VLAN_STAG_TX;
}
return features; return features;
} }