diff options
| author | David S. Miller <davem@davemloft.net> | 2016-03-19 02:14:53 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-03-19 02:14:53 (GMT) |
| commit | c9d0bc5d225b026797c05f19a4871e96e2ef9f1c (patch) | |
| tree | 42f37799dd2d9872898a5aa12b7311d1aaa81dd4 | |
| parent | 93e68cd6115f67d8363c94dae8206af36f6d3b00 (diff) | |
| parent | bc0df13887b1147f4e63390d7d6767f7fa64b91b (diff) | |
| download | linux-c9d0bc5d225b026797c05f19a4871e96e2ef9f1c.tar.xz | |
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: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/bonding/bond_main.c | 2 | ||||
| -rw-r--r-- | drivers/net/team/team.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index b6236ff..270b39c 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -4175,7 +4175,7 @@ void bond_setup(struct net_device *bond_dev) SET_NETDEV_DEVTYPE(bond_dev, &bond_type); /* 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_XMIT_DST_RELEASE | IFF_TX_SKB_SHARING); diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c index 2769835..26c64d2 100644 --- a/drivers/net/team/team.c +++ b/drivers/net/team/team.c @@ -2082,7 +2082,6 @@ static void team_setup(struct net_device *dev) dev->netdev_ops = &team_netdev_ops; dev->ethtool_ops = &team_ethtool_ops; dev->destructor = team_destructor; - dev->flags |= IFF_MULTICAST; dev->priv_flags &= ~(IFF_XMIT_DST_RELEASE | IFF_TX_SKB_SHARING); dev->priv_flags |= IFF_NO_QUEUE; dev->priv_flags |= IFF_TEAM; |