netpoll: remove usage of dev->master

Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index 3151acf5ec13afb34480a28a3f4a73deae69990a..d2bda8eb08ecb12095e571faba5b68e689ffb224 100644 (file)
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -210,9 +210,12 @@ static void netpoll_poll_dev(struct net_device *dev)
 
        if (dev->flags & IFF_SLAVE) {
                if (ni) {
-                       struct net_device *bond_dev = dev->master;
+                       struct net_device *bond_dev;
                        struct sk_buff *skb;
-                       struct netpoll_info *bond_ni = rcu_dereference_bh(bond_dev->npinfo);
+                       struct netpoll_info *bond_ni;
+
+                       bond_dev = netdev_master_upper_dev_get_rcu(dev);
+                       bond_ni = rcu_dereference_bh(bond_dev->npinfo);
                        while ((skb = skb_dequeue(&ni->arp_tx))) {
                                skb->dev = bond_dev;
                                skb_queue_tail(&bond_ni->arp_tx, skb);
@@ -815,7 +818,7 @@ int netpoll_setup(struct netpoll *np)
                return -ENODEV;
        }
 
-       if (ndev->master) {
+       if (netdev_master_upper_dev_get(ndev)) {
                np_err(np, "%s is a slave device, aborting\n", np->dev_name);
                err = -EBUSY;
                goto put;