diff options
| author | Jiri Pirko | 2012-07-17 07:22:35 +0200 |
|---|---|---|
| committer | David S. Miller | 2012-07-17 18:02:36 +0200 |
| commit | 30fdd8a082a00126a6feec994e43e8dc12f5bccb (patch) | |
| tree | 0b5f9589942f88bb25408e77f251334e0471c36c /drivers/net/bonding/bond_main.c | |
| parent | tcp: implement RFC 5961 4.2 (diff) | |
| download | kernel-qcow2-linux-30fdd8a082a00126a6feec994e43e8dc12f5bccb.tar.gz kernel-qcow2-linux-30fdd8a082a00126a6feec994e43e8dc12f5bccb.tar.xz kernel-qcow2-linux-30fdd8a082a00126a6feec994e43e8dc12f5bccb.zip | |
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/net/bonding/bond_main.c')
| -rw-r--r-- | drivers/net/bonding/bond_main.c | 4 |
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) if (!np) goto out; - np->dev = slave->dev; - strlcpy(np->dev_name, slave->dev->name, IFNAMSIZ); - err = __netpoll_setup(np); + err = __netpoll_setup(np, slave->dev); if (err) { kfree(np); goto out; |