diff options
| -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 b6236ff3dbdd..270b39c8357f 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) | |||
| 4175 | SET_NETDEV_DEVTYPE(bond_dev, &bond_type); | 4175 | SET_NETDEV_DEVTYPE(bond_dev, &bond_type); |
| 4176 | 4176 | ||
| 4177 | /* Initialize the device options */ | 4177 | /* Initialize the device options */ |
| 4178 | bond_dev->flags |= IFF_MASTER|IFF_MULTICAST; | 4178 | bond_dev->flags |= IFF_MASTER; |
| 4179 | bond_dev->priv_flags |= IFF_BONDING | IFF_UNICAST_FLT | IFF_NO_QUEUE; | 4179 | bond_dev->priv_flags |= IFF_BONDING | IFF_UNICAST_FLT | IFF_NO_QUEUE; |
| 4180 | bond_dev->priv_flags &= ~(IFF_XMIT_DST_RELEASE | IFF_TX_SKB_SHARING); | 4180 | bond_dev->priv_flags &= ~(IFF_XMIT_DST_RELEASE | IFF_TX_SKB_SHARING); |
| 4181 | 4181 | ||
diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c index 2769835f48ca..26c64d2782fa 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) | |||
| 2082 | dev->netdev_ops = &team_netdev_ops; | 2082 | dev->netdev_ops = &team_netdev_ops; |
| 2083 | dev->ethtool_ops = &team_ethtool_ops; | 2083 | dev->ethtool_ops = &team_ethtool_ops; |
| 2084 | dev->destructor = team_destructor; | 2084 | dev->destructor = team_destructor; |
| 2085 | dev->flags |= IFF_MULTICAST; | ||
| 2086 | dev->priv_flags &= ~(IFF_XMIT_DST_RELEASE | IFF_TX_SKB_SHARING); | 2085 | dev->priv_flags &= ~(IFF_XMIT_DST_RELEASE | IFF_TX_SKB_SHARING); |
| 2087 | dev->priv_flags |= IFF_NO_QUEUE; | 2086 | dev->priv_flags |= IFF_NO_QUEUE; |
| 2088 | dev->priv_flags |= IFF_TEAM; | 2087 | dev->priv_flags |= IFF_TEAM; |
