diff options
| author | Tom Herbert <tom@herbertland.com> | 2016-01-11 19:19:10 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-01-12 05:28:44 +0100 |
| commit | b6a0e72ad3cffabaf30b856deb58fbe64a0f36a8 (patch) | |
| tree | f44da6e689cd2ddbb31a6ec29c21a918ae8bd45f | |
| parent | Merge branch 'mdio-build-failures' (diff) | |
| download | linux-b6a0e72ad3cffabaf30b856deb58fbe64a0f36a8.tar.xz linux-b6a0e72ad3cffabaf30b856deb58fbe64a0f36a8.zip | |
net: Fix typo in netdev_intersect_features
Obviously need to 'or in NETIF_F_IP_CSUM and NETIF_F_IPV6_CSUM.
Fixes: c8cd0989bd151f ("net: Eliminate NETIF_F_GEN_CSUM and NETIF_F_V[46]_CSUM")
Reported-by: Jack Morgenstein <jackm@dev.mellanox.co.il>
Signed-off-by: Tom Herbert <tom@herbertland.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/linux/netdevice.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 2285596e7045..5ac140dcb789 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -3873,9 +3873,9 @@ static inline netdev_features_t netdev_intersect_features(netdev_features_t f1, { if ((f1 ^ f2) & NETIF_F_HW_CSUM) { if (f1 & NETIF_F_HW_CSUM) - f1 |= (NETIF_F_IP_CSUM|NETIF_F_IP_CSUM); + f1 |= (NETIF_F_IP_CSUM|NETIF_F_IPV6_CSUM); else - f2 |= (NETIF_F_IP_CSUM|NETIF_F_IP_CSUM); + f2 |= (NETIF_F_IP_CSUM|NETIF_F_IPV6_CSUM); } return f1 & f2; |