diff options
author | David S. Miller <davem@davemloft.net> | 2011-01-31 16:13:24 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-01-31 16:13:24 -0500 |
commit | 5403c8a29521a6eb02f9283dbbe0184527f8f42b (patch) | |
tree | 4f1ca17feda4dfa88f53eceeaa39583ec840d27e /net/core/rtnetlink.c | |
parent | c79b9e4936142d5ed26073d58bdd4a5a0ac62f32 (diff) | |
parent | c4c93106741bbf61ecd05a2a835af8e3bf31c1bd (diff) |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/core/rtnetlink.c')
-rw-r--r-- | net/core/rtnetlink.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index b706271ccb18..da0fe457c858 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c | |||
@@ -1704,6 +1704,9 @@ replay: | |||
1704 | snprintf(ifname, IFNAMSIZ, "%s%%d", ops->kind); | 1704 | snprintf(ifname, IFNAMSIZ, "%s%%d", ops->kind); |
1705 | 1705 | ||
1706 | dest_net = rtnl_link_get_net(net, tb); | 1706 | dest_net = rtnl_link_get_net(net, tb); |
1707 | if (IS_ERR(dest_net)) | ||
1708 | return PTR_ERR(dest_net); | ||
1709 | |||
1707 | dev = rtnl_create_link(net, dest_net, ifname, ops, tb); | 1710 | dev = rtnl_create_link(net, dest_net, ifname, ops, tb); |
1708 | 1711 | ||
1709 | if (IS_ERR(dev)) | 1712 | if (IS_ERR(dev)) |