Commit c9d0bc5d authored by David S. Miller's avatar David S. Miller

Merge branch 'IFF_MULTICAST-dup-sets'

Zhang Shengju says:

====================
remove duplicate set of flag IFF_MULTICAST

This patch series remove duplicate set of flag IFF_MULTICAST.
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 93e68cd6 bc0df138
...@@ -4175,7 +4175,7 @@ void bond_setup(struct net_device *bond_dev) ...@@ -4175,7 +4175,7 @@ void bond_setup(struct net_device *bond_dev)
SET_NETDEV_DEVTYPE(bond_dev, &bond_type); SET_NETDEV_DEVTYPE(bond_dev, &bond_type);
/* Initialize the device options */ /* Initialize the device options */
bond_dev->flags |= IFF_MASTER|IFF_MULTICAST; bond_dev->flags |= IFF_MASTER;
bond_dev->priv_flags |= IFF_BONDING | IFF_UNICAST_FLT | IFF_NO_QUEUE; bond_dev->priv_flags |= IFF_BONDING | IFF_UNICAST_FLT | IFF_NO_QUEUE;
bond_dev->priv_flags &= ~(IFF_XMIT_DST_RELEASE | IFF_TX_SKB_SHARING); bond_dev->priv_flags &= ~(IFF_XMIT_DST_RELEASE | IFF_TX_SKB_SHARING);
......
...@@ -2082,7 +2082,6 @@ static void team_setup(struct net_device *dev) ...@@ -2082,7 +2082,6 @@ static void team_setup(struct net_device *dev)
dev->netdev_ops = &team_netdev_ops; dev->netdev_ops = &team_netdev_ops;
dev->ethtool_ops = &team_ethtool_ops; dev->ethtool_ops = &team_ethtool_ops;
dev->destructor = team_destructor; dev->destructor = team_destructor;
dev->flags |= IFF_MULTICAST;
dev->priv_flags &= ~(IFF_XMIT_DST_RELEASE | IFF_TX_SKB_SHARING); dev->priv_flags &= ~(IFF_XMIT_DST_RELEASE | IFF_TX_SKB_SHARING);
dev->priv_flags |= IFF_NO_QUEUE; dev->priv_flags |= IFF_NO_QUEUE;
dev->priv_flags |= IFF_TEAM; dev->priv_flags |= IFF_TEAM;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment