diff options
author | Duncan Sands <baldrick@free.fr> | 2006-01-13 04:13:19 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-31 20:23:40 -0500 |
commit | 227d77611b31df5d9afa572b984f73640f54d490 (patch) | |
tree | a66c12baab626a88e14705b934c239fdc00dad46 /drivers/usb/atm/usbatm.c | |
parent | 72ef8ab43f5a82e9e2dea247702bf433d6509f87 (diff) |
[PATCH] USBATM: use dev_kfree_skb_any rather than dev_kfree_skb
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 <baldrick@free.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/atm/usbatm.c')
-rw-r--r-- | drivers/usb/atm/usbatm.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c index 103764df47ea..98b74b9dcdd2 100644 --- a/drivers/usb/atm/usbatm.c +++ b/drivers/usb/atm/usbatm.c | |||
@@ -72,6 +72,7 @@ | |||
72 | #include <linux/kernel.h> | 72 | #include <linux/kernel.h> |
73 | #include <linux/module.h> | 73 | #include <linux/module.h> |
74 | #include <linux/moduleparam.h> | 74 | #include <linux/moduleparam.h> |
75 | #include <linux/netdevice.h> | ||
75 | #include <linux/proc_fs.h> | 76 | #include <linux/proc_fs.h> |
76 | #include <linux/sched.h> | 77 | #include <linux/sched.h> |
77 | #include <linux/signal.h> | 78 | #include <linux/signal.h> |
@@ -199,7 +200,7 @@ static inline void usbatm_pop(struct atm_vcc *vcc, struct sk_buff *skb) | |||
199 | if (vcc->pop) | 200 | if (vcc->pop) |
200 | vcc->pop(vcc, skb); | 201 | vcc->pop(vcc, skb); |
201 | else | 202 | else |
202 | dev_kfree_skb(skb); | 203 | dev_kfree_skb_any(skb); |
203 | } | 204 | } |
204 | 205 | ||
205 | 206 | ||
@@ -397,7 +398,7 @@ static void usbatm_extract_cells(struct usbatm_data *instance, | |||
397 | if (!atm_charge(vcc, skb->truesize)) { | 398 | if (!atm_charge(vcc, skb->truesize)) { |
398 | atm_rldbg(instance, "%s: failed atm_charge (skb->truesize: %u)!\n", | 399 | atm_rldbg(instance, "%s: failed atm_charge (skb->truesize: %u)!\n", |
399 | __func__, skb->truesize); | 400 | __func__, skb->truesize); |
400 | dev_kfree_skb(skb); | 401 | dev_kfree_skb_any(skb); |
401 | goto out; /* atm_charge increments rx_drop */ | 402 | goto out; /* atm_charge increments rx_drop */ |
402 | } | 403 | } |
403 | 404 | ||