From baldrick@free.fr Fri Jan 13 01:13:25 2006 From: Duncan Sands To: Greg KH Subject: [PATCH 08/13] USBATM: use dev_kfree_skb_any rather than dev_kfree_skb Date: Fri, 13 Jan 2006 10:13:19 +0100 Message-Id: <200601131013.19986.baldrick@free.fr> In one spot (usbatm_cancel_send) we were calling dev_kfree_skb with irqs disabled. This mistake is just too easy to make, so systematically use dev_kfree_skb_any rather than dev_kfree_skb. Signed-off-by: Duncan Sands Signed-off-by: Greg Kroah-Hartman --- drivers/usb/atm/usbatm.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- gregkh-2.6.orig/drivers/usb/atm/usbatm.c +++ gregkh-2.6/drivers/usb/atm/usbatm.c @@ -72,6 +72,7 @@ #include #include #include +#include #include #include #include @@ -199,7 +200,7 @@ static inline void usbatm_pop(struct atm if (vcc->pop) vcc->pop(vcc, skb); else - dev_kfree_skb(skb); + dev_kfree_skb_any(skb); } @@ -397,7 +398,7 @@ static void usbatm_extract_cells(struct if (!atm_charge(vcc, skb->truesize)) { atm_rldbg(instance, "%s: failed atm_charge (skb->truesize: %u)!\n", __func__, skb->truesize); - dev_kfree_skb(skb); + dev_kfree_skb_any(skb); goto out; /* atm_charge increments rx_drop */ }