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

Commit 6c753c3d authored by Stefan Rompf's avatar Stefan Rompf Committed by David S. Miller
Browse files

[VLAN]: Fix link state propagation 



When the queue of the underlying device is stopped at initialization time
or the device is marked "not present", the state will be propagated to the
vlan device and never change. Based on an analysis by Patrick McHardy.

Signed-off-by: default avatarStefan Rompf <stefan@loplof.de>
ACKed-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a922ba55

net/8021q/vlan.c

+3 −5
Original line number Diff line number Diff line
@@ -67,10 +67,6 @@ static struct packet_type vlan_packet_type = { 
	.func = vlan_skb_recv, /* VLAN receive method */

};



/* Bits of netdev state that are propagated from real device to virtual */

#define VLAN_LINK_STATE_MASK \

	((1<<__LINK_STATE_PRESENT)|(1<<__LINK_STATE_NOCARRIER)|(1<<__LINK_STATE_DORMANT))



/* End of global variables definitions. */



/*
@@ -479,7 +475,9 @@ static struct net_device *register_vlan_device(const char *eth_IF_name, 
	new_dev->flags = real_dev->flags;

	new_dev->flags &= ~IFF_UP;



	new_dev->state = real_dev->state & ~(1<<__LINK_STATE_START);

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

					     (1<<__LINK_STATE_DORMANT))) |

			 (1<<__LINK_STATE_PRESENT); 



	/* need 4 bytes for extra VLAN header info,

	 * hope the underlying device can handle it.