diff options
| author |   Nicolas Dichtel <nicolas.dichtel@6wind.com> | 2015-05-07 11:02:49 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-05-09 22:15:30 -0400 |
| commit | 7a0877d4b438886b72be61632eaa774d13262f70 (patch) | |
| tree | b8cb00423af5be00667a07302128f0fe7c4f66a0 /net/core/rtnetlink.c | |
| parent | netns: always provide the id to rtnl_net_fill() (diff) | |
| download | linux-dev-7a0877d4b438886b72be61632eaa774d13262f70.tar.xz linux-dev-7a0877d4b438886b72be61632eaa774d13262f70.zip | |
netns: rename peernet2id() to peernet2id_alloc()
In a following commit, a new function will be introduced to only lookup for
a nsid (no allocation if the nsid doesn't exist). To avoid confusion, the
existing function is renamed.
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Acked-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | net/core/rtnetlink.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index 666e0928ba40..83e08323fdcd 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -1204,7 +1204,7 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev, struct net *link_net = dev->rtnl_link_ops->get_link_net(dev); if (!net_eq(dev_net(dev), link_net)) { - int id = peernet2id(dev_net(dev), link_net); + int id = peernet2id_alloc(dev_net(dev), link_net); if (nla_put_s32(skb, IFLA_LINK_NETNSID, id)) goto nla_put_failure; |