For cut-and-paste reasons, the IPoIB driver was setting skb->dev right
before calling dev_kfree_skb_any().  Get rid of this.

Signed-off-by: Roland Dreier <[EMAIL PROTECTED]>

---

 drivers/infiniband/ulp/ipoib/ipoib_multicast.c |   17 ++++-------------
 1 files changed, 4 insertions(+), 13 deletions(-)

applies-to: 8b16a6a547ff0459044c3698ff9ac1d33c84eaf4
6277da1d7c70d2fcaeeb74c3b20fc1645da0f1fe
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c 
b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
index 8709693..c33ed87 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
@@ -120,12 +120,8 @@ static void ipoib_mcast_free(struct ipoi
        if (mcast->ah)
                ipoib_put_ah(mcast->ah);
 
-       while (!skb_queue_empty(&mcast->pkt_queue)) {
-               struct sk_buff *skb = skb_dequeue(&mcast->pkt_queue);
-
-               skb->dev = dev;
-               dev_kfree_skb_any(skb);
-       }
+       while (!skb_queue_empty(&mcast->pkt_queue))
+               dev_kfree_skb_any(skb_dequeue(&mcast->pkt_queue));
 
        kfree(mcast);
 }
@@ -317,13 +313,8 @@ ipoib_mcast_sendonly_join_complete(int s
                                        IPOIB_GID_ARG(mcast->mcmember.mgid), 
status);
 
                /* Flush out any queued packets */
-               while (!skb_queue_empty(&mcast->pkt_queue)) {
-                       struct sk_buff *skb = skb_dequeue(&mcast->pkt_queue);
-
-                       skb->dev = dev;
-
-                       dev_kfree_skb_any(skb);
-               }
+               while (!skb_queue_empty(&mcast->pkt_queue))
+                       dev_kfree_skb_any(skb_dequeue(&mcast->pkt_queue));
 
                /* Clear the busy flag so we try again */
                clear_bit(IPOIB_MCAST_FLAG_BUSY, &mcast->flags);
---
0.99.9e
_______________________________________________
openib-general mailing list
[email protected]
http://openib.org/mailman/listinfo/openib-general

To unsubscribe, please visit http://openib.org/mailman/listinfo/openib-general

Reply via email to