bond: service netpoll arp queue on master device

Neil pointed out that we can't send ARP reply on behalf of slaves,
we need to move the arp queue to their bond device.

Signed-off-by: WANG Cong <amwang@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 11 insertions, 0 deletions

diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index f68e6949294e..06be2431753e 100644
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -193,6 +193,17 @@ void netpoll_poll_dev(struct net_device *dev)
 
         poll_napi(dev);
 
+        if (dev->priv_flags & IFF_SLAVE) {
+                if (dev->npinfo) {
+                        struct net_device *bond_dev = dev->master;
+                        struct sk_buff *skb;
+                        while ((skb = skb_dequeue(&dev->npinfo->arp_tx))) {
+                                skb->dev = bond_dev;
+                                skb_queue_tail(&bond_dev->npinfo->arp_tx, skb);
+                        }
+                }
+        }
+
         service_arp_queue(dev->npinfo);
 
         zap_completion_queue();