Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 194dbcc8 authored by John Fastabend's avatar John Fastabend Committed by David S. Miller
Browse files

net: init_vlan should not copy slave or master flags 



The vlan device should not copy the slave or master flags from
the real device. It is not in the bond until added nor is it
a master.

Signed-off-by: default avatarJohn Fastabend <john.r.fastabend@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 08f382eb

net/8021q/vlan_dev.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -708,7 +708,8 @@ static int vlan_dev_init(struct net_device *dev) 
	netif_carrier_off(dev);

	netif_carrier_off(dev);





	/* IFF_BROADCAST|IFF_MULTICAST; ??? */

	/* IFF_BROADCAST|IFF_MULTICAST; ??? */

	dev->flags  = real_dev->flags & ~(IFF_UP | IFF_PROMISC | IFF_ALLMULTI);

	dev->flags  = real_dev->flags & ~(IFF_UP | IFF_PROMISC | IFF_ALLMULTI |

					  IFF_MASTER | IFF_SLAVE);

	dev->iflink = real_dev->ifindex;

	dev->iflink = real_dev->ifindex;

	dev->state  = (real_dev->state & ((1<<__LINK_STATE_NOCARRIER) |

	dev->state  = (real_dev->state & ((1<<__LINK_STATE_NOCARRIER) |

					  (1<<__LINK_STATE_DORMANT))) |

					  (1<<__LINK_STATE_DORMANT))) |