aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
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 /drivers
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 'drivers')
-rw-r--r--drivers/net/bonding/bond_main.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 4ddcc3e41dab..1eb3979d0af5 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -1240,9 +1240,7 @@ static inline int slave_enable_netpoll(struct slave *slave)
1240 if (!np) 1240 if (!np)
1241 goto out; 1241 goto out;
1242 1242
1243 np->dev = slave->dev; 1243 err = __netpoll_setup(np, slave->dev);
1244 strlcpy(np->dev_name, slave->dev->name, IFNAMSIZ);
1245 err = __netpoll_setup(np);
1246 if (err) { 1244 if (err) {
1247 kfree(np); 1245 kfree(np);
1248 goto out; 1246 goto out;