net: fix checksum features handling in netif_skb_features()
authorMichal Kubeček <mkubecek@suse.cz>
Mon, 25 Aug 2014 13:16:22 +0000 (15:16 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 15 Oct 2014 10:05:27 +0000 (12:05 +0200)
commitaf3e4e5dc0f46c876f99b0f8cc3987fac4741593
tree30b8c808a52b8b63ebd76bdc80477014f1139614
parentcd80ab0c938e779d923342ae99e9d6050b2fc1bc
net: fix checksum features handling in netif_skb_features()

[ Upstream commit db115037bb57cdfe97078b13da762213f7980e81 ]

This is follow-up to

  da08143b8520 ("vlan: more careful checksum features handling")

which introduced more careful feature intersection in vlan code,
taking into account that HW_CSUM should be considered superset
of IP_CSUM/IPV6_CSUM. The same is needed in netif_skb_features()
in order to avoid offloading mismatch warning when vlan is
created on top of a bond consisting of slaves supporting IP/IPv6
checksumming but not vlan Tx offloading.

Signed-off-by: Michal Kubecek <mkubecek@suse.cz>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
net/core/dev.c