aboutsummaryrefslogtreecommitdiffstats
path: root/net/8021q/vlan_dev.c
diff options
context:
space:
mode:
authorJiri Pirko <jiri@resnulli.us>2012-07-17 01:22:35 -0400
committerDavid S. Miller <davem@davemloft.net>2012-07-17 12:02:36 -0400
commit30fdd8a082a00126a6feec994e43e8dc12f5bccb (patch)
tree0b5f9589942f88bb25408e77f251334e0471c36c /net/8021q/vlan_dev.c
parent0c24604b68fc7810d429d6c3657b6f148270e528 (diff)
netpoll: move np->dev and np->dev_name init into __netpoll_setup()
Signed-off-by: Jiri Pirko <jiri@resnulli.us> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/8021q/vlan_dev.c')
-rw-r--r--net/8021q/vlan_dev.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
index da1bc9c3cf38..73a2a83ee2da 100644
--- a/net/8021q/vlan_dev.c
+++ b/net/8021q/vlan_dev.c
@@ -681,10 +681,7 @@ static int vlan_dev_netpoll_setup(struct net_device *dev, struct netpoll_info *n
681 if (!netpoll) 681 if (!netpoll)
682 goto out; 682 goto out;
683 683
684 netpoll->dev = real_dev; 684 err = __netpoll_setup(netpoll, real_dev);
685 strlcpy(netpoll->dev_name, real_dev->name, IFNAMSIZ);
686
687 err = __netpoll_setup(netpoll);
688 if (err) { 685 if (err) {
689 kfree(netpoll); 686 kfree(netpoll);
690 goto out; 687 goto out;