summaryrefslogtreecommitdiffstats
path: root/net-mac80211-Make-the-softirq_count-warning-nonrt.patch
blob: 3038b87d53b21d867b5725a028267b70cdfec2a1 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
From 7098e81d766194597f8ec4e71596be9a0ddbf5f1 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Mon, 22 Feb 2010 16:53:27 +0100
Subject: [PATCH] net: mac80211: Make the softirq_count warning nonrt

commit c6dafd2110e83a8e34aefcbb7b1cb764f3e9d436 in tip.

ieee80211_rx() warns about softirq_count() == 0, which is always the
case on RT enabled kernels. Make the warning nonrt only.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
 net/mac80211/rx.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 04ea07f..47d36b0 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -2493,7 +2493,7 @@ void ieee80211_rx(struct ieee80211_hw *hw, struct sk_buff *skb)
 	struct ieee80211_supported_band *sband;
 	struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb);
 
-	WARN_ON_ONCE(softirq_count() == 0);
+	WARN_ON_ONCE_NONRT(softirq_count() == 0);
 
 	if (WARN_ON(status->band < 0 ||
 		    status->band >= IEEE80211_NUM_BANDS))
-- 
1.7.0.4