From 0f2ddd9121c1a2bbf986afe62c5cd8e41cf550c7 Mon Sep 17 00:00:00 2001 From: Rami Rosen Date: Fri, 30 Nov 2012 01:08:47 +0000 Subject: [PATCH] --- yaml --- r: 341655 b: refs/heads/master c: c07135633bee3f01a6454d15b6411f32cfbeb2fd h: refs/heads/master i: 341653: 53d38430fa11ef28487e81c068db801bd84ff84e 341651: 76a226054091fa51981249788016a0fbf1043718 341647: 57206b928e76554f160c10a7d5f123e1e3f14048 v: v3 --- [refs] | 2 +- trunk/drivers/net/veth.c | 2 +- trunk/include/net/rtnetlink.h | 2 +- trunk/net/core/rtnetlink.c | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index f84ba647b101..7680f445f4dc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dad52fd964c54aa275ebb5c935ef8d8b0eded74d +refs/heads/master: c07135633bee3f01a6454d15b6411f32cfbeb2fd diff --git a/trunk/drivers/net/veth.c b/trunk/drivers/net/veth.c index 24f6b27e169f..95814d9747ef 100644 --- a/trunk/drivers/net/veth.c +++ b/trunk/drivers/net/veth.c @@ -340,7 +340,7 @@ static int veth_newlink(struct net *src_net, struct net_device *dev, if (IS_ERR(net)) return PTR_ERR(net); - peer = rtnl_create_link(src_net, net, ifname, &veth_link_ops, tbp); + peer = rtnl_create_link(net, ifname, &veth_link_ops, tbp); if (IS_ERR(peer)) { put_net(net); return PTR_ERR(peer); diff --git a/trunk/include/net/rtnetlink.h b/trunk/include/net/rtnetlink.h index 6b00c4fc4291..5a15fabd6a75 100644 --- a/trunk/include/net/rtnetlink.h +++ b/trunk/include/net/rtnetlink.h @@ -125,7 +125,7 @@ extern void rtnl_af_unregister(struct rtnl_af_ops *ops); extern struct net *rtnl_link_get_net(struct net *src_net, struct nlattr *tb[]); -extern struct net_device *rtnl_create_link(struct net *src_net, struct net *net, +extern struct net_device *rtnl_create_link(struct net *net, char *ifname, const struct rtnl_link_ops *ops, struct nlattr *tb[]); extern int rtnl_configure_link(struct net_device *dev, const struct ifinfomsg *ifm); diff --git a/trunk/net/core/rtnetlink.c b/trunk/net/core/rtnetlink.c index 575a6ee89944..1868625af25e 100644 --- a/trunk/net/core/rtnetlink.c +++ b/trunk/net/core/rtnetlink.c @@ -1642,7 +1642,7 @@ int rtnl_configure_link(struct net_device *dev, const struct ifinfomsg *ifm) } EXPORT_SYMBOL(rtnl_configure_link); -struct net_device *rtnl_create_link(struct net *src_net, struct net *net, +struct net_device *rtnl_create_link(struct net *net, char *ifname, const struct rtnl_link_ops *ops, struct nlattr *tb[]) { int err; @@ -1840,7 +1840,7 @@ static int rtnl_newlink(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg) if (IS_ERR(dest_net)) return PTR_ERR(dest_net); - dev = rtnl_create_link(net, dest_net, ifname, ops, tb); + dev = rtnl_create_link(dest_net, ifname, ops, tb); if (IS_ERR(dev)) { err = PTR_ERR(dev); goto out;