summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRémi Denis-Courmont <remi.denis-courmont@nokia.com>2009-06-01 03:18:55 +0200
committerDavid S. Miller <davem@davemloft.net>2009-06-02 09:17:44 +0200
commitfa202592796499dade5b3854643eaf0eed4d34ba (patch)
tree6064c17ffcc6e74ddd5f7db586226b16821d49f7
parentPhonet: fix accounting race between gprs_writeable() and gprs_xmit() (diff)
downloadlinux-fa202592796499dade5b3854643eaf0eed4d34ba.tar.xz
linux-fa202592796499dade5b3854643eaf0eed4d34ba.zip
f_phonet: dev_kfree_skb instead of dev_kfree_skb_any in TX callback
Network device TX is never run in IRQ context, and skb is freed outside of the IRQ-disabling spin lock. So checking for IRQ was a waste of time here. Signed-off-by: Rémi Denis-Courmont <remi.denis-courmont@nokia.com> Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/usb/gadget/f_phonet.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/f_phonet.c b/drivers/usb/gadget/f_phonet.c
index c1abeb89b413..54451ee02298 100644
--- a/drivers/usb/gadget/f_phonet.c
+++ b/drivers/usb/gadget/f_phonet.c
@@ -255,7 +255,7 @@ out_unlock:
spin_unlock_irqrestore(&port->lock, flags);
out:
if (unlikely(skb)) {
- dev_kfree_skb_any(skb);
+ dev_kfree_skb(skb);
dev->stats.tx_dropped++;
}
return 0;