projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[firefly-linux-kernel-4.4.55.git]
/
net
/
8021q
/
vlan_netlink.c
diff --git
a/net/8021q/vlan_netlink.c
b/net/8021q/vlan_netlink.c
index 8ac8a5cc214331253e591fe26f6c3b39a00d5023..c92b52f37d38de143022f172881dd03f076b0194 100644
(file)
--- a/
net/8021q/vlan_netlink.c
+++ b/
net/8021q/vlan_netlink.c
@@
-238,6
+238,13
@@
nla_put_failure:
return -EMSGSIZE;
}
return -EMSGSIZE;
}
+static struct net *vlan_get_link_net(const struct net_device *dev)
+{
+ struct net_device *real_dev = vlan_dev_priv(dev)->real_dev;
+
+ return dev_net(real_dev);
+}
+
struct rtnl_link_ops vlan_link_ops __read_mostly = {
.kind = "vlan",
.maxtype = IFLA_VLAN_MAX,
struct rtnl_link_ops vlan_link_ops __read_mostly = {
.kind = "vlan",
.maxtype = IFLA_VLAN_MAX,
@@
-250,6
+257,7
@@
struct rtnl_link_ops vlan_link_ops __read_mostly = {
.dellink = unregister_vlan_dev,
.get_size = vlan_get_size,
.fill_info = vlan_fill_info,
.dellink = unregister_vlan_dev,
.get_size = vlan_get_size,
.fill_info = vlan_fill_info,
+ .get_link_net = vlan_get_link_net,
};
int __init vlan_netlink_init(void)
};
int __init vlan_netlink_init(void)