diff options
| author | Jiri Pirko <jiri@resnulli.us> | 2012-07-17 05:22:35 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-07-17 09:02:36 -0700 |
| commit | 30fdd8a082a00126a6feec994e43e8dc12f5bccb (patch) | |
| tree | 0b5f9589942f88bb25408e77f251334e0471c36c /net/bridge/br_device.c | |
| parent | 0c24604b68fc7810d429d6c3657b6f148270e528 (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/bridge/br_device.c')
| -rw-r--r-- | net/bridge/br_device.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c index 929e48aed44..f4be1bbfef2 100644 --- a/net/bridge/br_device.c +++ b/net/bridge/br_device.c @@ -246,10 +246,7 @@ int br_netpoll_enable(struct net_bridge_port *p) if (!np) goto out; - np->dev = p->dev; - strlcpy(np->dev_name, p->dev->name, IFNAMSIZ); - - err = __netpoll_setup(np); + err = __netpoll_setup(np, p->dev); if (err) { kfree(np); goto out; |