summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2018-06-04 17:46:01 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-06-13 16:15:29 +0200
commitd3078b97f653097d33fabae24ba4d457a288e007 (patch)
treea867840eae20bbb618c9f8aef72415266786cbef
parentd22856ee8fd3f5ee81054f125d24582af6331d9d (diff)
downloadlinux-stable-d3078b97f653097d33fabae24ba4d457a288e007.tar.gz
linux-stable-d3078b97f653097d33fabae24ba4d457a288e007.tar.bz2
linux-stable-d3078b97f653097d33fabae24ba4d457a288e007.zip
team: use netdev_features_t instead of u32
[ Upstream commit 25ea66544bfd1d9df1b7e1502f8717e85fa1e6e6 ] This code was introduced in 2011 around the same time that we made netdev_features_t a u64 type. These days a u32 is not big enough to hold all the potential features. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Acked-by: Jiri Pirko <jiri@mellanox.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/net/team/team.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
index e74709e4b5dd..49174837c2ba 100644
--- a/drivers/net/team/team.c
+++ b/drivers/net/team/team.c
@@ -983,7 +983,8 @@ static void team_port_disable(struct team *team,
static void ___team_compute_features(struct team *team)
{
struct team_port *port;
- u32 vlan_features = TEAM_VLAN_FEATURES & NETIF_F_ALL_FOR_ALL;
+ netdev_features_t vlan_features = TEAM_VLAN_FEATURES &
+ NETIF_F_ALL_FOR_ALL;
unsigned short max_hard_header_len = ETH_HLEN;
unsigned int dst_release_flag = IFF_XMIT_DST_RELEASE |
IFF_XMIT_DST_RELEASE_PERM;