From 6c6238517aad0fae8083e2b0dd3eb3c8e1f8257f Mon Sep 17 00:00:00 2001 From: Matti Linnanvuori Date: Fri, 28 Mar 2008 16:33:00 -0700 Subject: [PATCH] --- yaml --- r: 88016 b: refs/heads/master c: 0ef4730927c54cac5006759fa0cf50fbeff9d191 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/netdevice.h | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f91059dbb131..41f6d99d479e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a5a04819c5740cb1aa217af2cc8f5ef26f33d744 +refs/heads/master: 0ef4730927c54cac5006759fa0cf50fbeff9d191 diff --git a/trunk/include/linux/netdevice.h b/trunk/include/linux/netdevice.h index fae6a7ececdb..ee81906b5164 100644 --- a/trunk/include/linux/netdevice.h +++ b/trunk/include/linux/netdevice.h @@ -1074,12 +1074,14 @@ static inline int netif_is_multiqueue(const struct net_device *dev) } /* Use this variant when it is known for sure that it - * is executing from interrupt context. + * is executing from hardware interrupt context or with hardware interrupts + * disabled. */ extern void dev_kfree_skb_irq(struct sk_buff *skb); /* Use this variant in places where it could be invoked - * either from interrupt or non-interrupt context. + * from either hardware interrupt or other context, with hardware interrupts + * either disabled or enabled. */ extern void dev_kfree_skb_any(struct sk_buff *skb);