net: vlan: prepare for 802.1ad support

[karo-tx-linux.git] / net / 8021q / vlan_netlink.c

diff --git a/net/8021q/vlan_netlink.c b/net/8021q/vlan_netlink.c
index 1789658b7cd751bb8d9d3fb2db431defc7838321..a1a956ab39a593a0db539bbd25f96f6d126b4232 100644 (file)
--- a/net/8021q/vlan_netlink.c
+++ b/net/8021q/vlan_netlink.c
@@ -118,11 +118,12 @@ static int vlan_newlink(struct net *src_net, struct net_device *dev,
        if (!real_dev)
                return -ENODEV;
 
-       vlan->vlan_id  = nla_get_u16(data[IFLA_VLAN_ID]);
-       vlan->real_dev = real_dev;
-       vlan->flags    = VLAN_FLAG_REORDER_HDR;
+       vlan->vlan_proto = htons(ETH_P_8021Q);
+       vlan->vlan_id    = nla_get_u16(data[IFLA_VLAN_ID]);
+       vlan->real_dev   = real_dev;
+       vlan->flags      = VLAN_FLAG_REORDER_HDR;
 
-       err = vlan_check_real_dev(real_dev, vlan->vlan_id);
+       err = vlan_check_real_dev(real_dev, vlan->vlan_proto, vlan->vlan_id);
        if (err < 0)
                return err;