summaryrefslogtreecommitdiffstats
path: root/net/bluetooth
diff options
context:
space:
mode:
authorAlexander Aring <alex.aring@gmail.com>2015-10-27 08:35:24 +0100
committerMarcel Holtmann <marcel@holtmann.org>2015-10-27 09:53:36 +0100
commit324e786ee39c70ffbdc280c34b7d2b6da5c87879 (patch)
treed6e4b63f01c5290aea27d1014bcbc0215e0fa563 /net/bluetooth
parent2c501cdd6823a644cf35ac594c635310bf077125 (diff)
downloadlinux-stable-324e786ee39c70ffbdc280c34b7d2b6da5c87879.tar.gz
linux-stable-324e786ee39c70ffbdc280c34b7d2b6da5c87879.tar.bz2
linux-stable-324e786ee39c70ffbdc280c34b7d2b6da5c87879.zip
bluetooth: 6lowpan: fix NOHZ: local_softirq_pending
Jukka reported about the following warning: "NOHZ: local_softirq_pending 08" I remember this warning and we had a similar issue when using workqueues and calling netif_rx. See commit 5ff3fec ("mac802154: fix NOHZ local_softirq_pending 08 warning"). This warning occurs when calling "netif_rx" inside the wrong context (non softirq context). The net core api offers "netif_rx_ni" to call netif_rx inside the correct softirq context. Reported-by: Jukka Rissanen <jukka.rissanen@linux.intel.com> Signed-off-by: Alexander Aring <alex.aring@gmail.com> Acked-by: Jukka Rissanen <jukka.rissanen@linux.intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth')
-rw-r--r--net/bluetooth/6lowpan.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/6lowpan.c b/net/bluetooth/6lowpan.c
index d85af2385486..9e9cca3689a0 100644
--- a/net/bluetooth/6lowpan.c
+++ b/net/bluetooth/6lowpan.c
@@ -263,7 +263,7 @@ static int give_skb_to_upper(struct sk_buff *skb, struct net_device *dev)
if (!skb_cp)
return NET_RX_DROP;
- return netif_rx(skb_cp);
+ return netif_rx_ni(skb_cp);
}
static int iphc_decompress(struct sk_buff *skb, struct net_device *netdev,