net: vlan: prepare for 802.1ad support

Make the encapsulation protocol value a property of VLAN devices and change
the device lookup functions to take the protocol value into account.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
index e88e01312c67..d132765f92af 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
@@ -3346,7 +3346,7 @@ void qlcnic_restore_indev_addr(struct net_device *netdev, unsigned long event)
 
         rcu_read_lock();
         for_each_set_bit(vid, adapter->vlans, VLAN_N_VID) {
-                dev = __vlan_find_dev_deep(netdev, vid);
+                dev = __vlan_find_dev_deep(netdev, htons(ETH_P_8021Q), vid);
                 if (!dev)
                         continue;
                 qlcnic_config_indev_addr(adapter, dev, event);