---

yaml --- r: 237482 b: refs/heads/master c: 5a698af h: refs/heads/master v: v3
git-mirror · Feb 28, 2011 · 43a5f9a · 43a5f9a
1 parent b09f91e
commit 43a5f9a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 080e4130b1fb6a02e75149a1cccc8192e734713d
+refs/heads/master: 5a698af53fb85b92d6462939a2c75ec4c7233bb9
diff --git a/trunk/net/core/netpoll.c b/trunk/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();