Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[pandora-kernel.git] / drivers / staging / wlags49_h2 / wl_netdev.c

diff --git a/drivers/staging/wlags49_h2/wl_netdev.c b/drivers/staging/wlags49_h2/wl_netdev.c
index 77e4be2..a10d014 100644 (file)
--- a/drivers/staging/wlags49_h2/wl_netdev.c
+++ b/drivers/staging/wlags49_h2/wl_netdev.c
@@ -695,7 +695,7 @@ int wl_send(struct wl_private *lp)
 
                /* Free the skb and perform queue cleanup, as the buffer was
                   transmitted successfully */
-               dev_kfree_skb(lp->txF.skb);
+               dev_consume_skb_any( lp->txF.skb );
 
                lp->txF.skb = NULL;
                lp->txF.port = 0;
@@ -1750,7 +1750,7 @@ int wl_send_dma(struct wl_private *lp, struct sk_buff *skb, int port)
                        WL_WDS_NETIF_STOP_QUEUE(lp);
                        lp->netif_queue_on = FALSE;
 
-                       dev_kfree_skb(skb);
+                       dev_kfree_skb_any( skb );
                        return 0;
                }
        }
@@ -1775,7 +1775,7 @@ int wl_send_dma(struct wl_private *lp, struct sk_buff *skb, int port)
 
        /* Free the skb and perform queue cleanup, as the buffer was
           transmitted successfully */
-       dev_kfree_skb(skb);
+       dev_consume_skb_any( skb );
 
        return TRUE;
 }                              /* wl_send_dma */