Răsfoiți Sursa

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>
David S. Miller 9 ani în urmă
părinte
comite
c9d0bc5d22
2 a modificat fișierele cu 1 adăugiri și 2 ștergeri
  1. 1 1
      drivers/net/bonding/bond_main.c
  2. 0 1
      drivers/net/team/team.c

+ 1 - 1
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);
 

+ 0 - 1
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;