forked from Minki/linux
[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>
This commit is contained in:
parent
72ef8ab43f
commit
227d77611b
|
@ -72,6 +72,7 @@
|
||||||
#include <linux/kernel.h>
|
#include <linux/kernel.h>
|
||||||
#include <linux/module.h>
|
#include <linux/module.h>
|
||||||
#include <linux/moduleparam.h>
|
#include <linux/moduleparam.h>
|
||||||
|
#include <linux/netdevice.h>
|
||||||
#include <linux/proc_fs.h>
|
#include <linux/proc_fs.h>
|
||||||
#include <linux/sched.h>
|
#include <linux/sched.h>
|
||||||
#include <linux/signal.h>
|
#include <linux/signal.h>
|
||||||
|
@ -199,7 +200,7 @@ static inline void usbatm_pop(struct atm_vcc *vcc, struct sk_buff *skb)
|
||||||
if (vcc->pop)
|
if (vcc->pop)
|
||||||
vcc->pop(vcc, skb);
|
vcc->pop(vcc, skb);
|
||||||
else
|
else
|
||||||
dev_kfree_skb(skb);
|
dev_kfree_skb_any(skb);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -397,7 +398,7 @@ static void usbatm_extract_cells(struct usbatm_data *instance,
|
||||||
if (!atm_charge(vcc, skb->truesize)) {
|
if (!atm_charge(vcc, skb->truesize)) {
|
||||||
atm_rldbg(instance, "%s: failed atm_charge (skb->truesize: %u)!\n",
|
atm_rldbg(instance, "%s: failed atm_charge (skb->truesize: %u)!\n",
|
||||||
__func__, skb->truesize);
|
__func__, skb->truesize);
|
||||||
dev_kfree_skb(skb);
|
dev_kfree_skb_any(skb);
|
||||||
goto out; /* atm_charge increments rx_drop */
|
goto out; /* atm_charge increments rx_drop */
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user