netpoll: copy dev name of slaves to struct netpoll
authorWANG Cong <amwang@redhat.com>
Sun, 19 Jun 2011 23:13:01 +0000 (16:13 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sun, 19 Jun 2011 23:13:01 +0000 (16:13 -0700)
Otherwise we will not see the name of the slave dev in error
message:

[  388.469446] (null):  doesn't support polling, aborting.

Signed-off-by: WANG Cong <amwang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/bonding/bond_main.c
net/bridge/br_device.c

index 652b30e525d01d8c4b547465bb66f943929fd4ea..eafe44a528ac015c8edddec6b0650a9eb526449c 100644 (file)
@@ -1297,6 +1297,7 @@ static inline int slave_enable_netpoll(struct slave *slave)
                goto out;
 
        np->dev = slave->dev;
+       strlcpy(np->dev_name, slave->dev->name, IFNAMSIZ);
        err = __netpoll_setup(np);
        if (err) {
                kfree(np);
index a6b2f86378c75437bba1300d23acc3b9ca188a58..c188c803c09c5085014b5bb221aeb57c8fba4871 100644 (file)
@@ -243,6 +243,7 @@ int br_netpoll_enable(struct net_bridge_port *p)
                goto out;
 
        np->dev = p->dev;
+       strlcpy(np->dev_name, p->dev->name, IFNAMSIZ);
 
        err = __netpoll_setup(np);
        if (err) {