2013-04-03 16:32:49

by Zefir Kurtisi

[permalink] [raw]
Subject: [TESTING-QH 0/2] mac80211: tweaks for DFS testing

For DFS testing only.

Simon Wunderlich (2):
REMOVEME: shorten time for NOP and CAC
REMOVEME: remove NO_IBSS and PASSIVE_SCAN from reg_can_beacon()

include/net/cfg80211.h | 4 ++--
net/wireless/chan.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)

--
1.7.4.1



2013-04-03 16:32:49

by Zefir Kurtisi

[permalink] [raw]
Subject: [TESTING-QH 2/2] REMOVEME: remove NO_IBSS and PASSIVE_SCAN from reg_can_beacon()

From: Simon Wunderlich <[email protected]>

The concept of clearing a DFS channel with a CAC and open it for transmission
is not yet supported by the channel framework. This patch is required to
temporary remove the additional consideration of the flags that are anyhow
superposed by the DFS flag.

Signed-off-by: Simon Wunderlich <[email protected]>
Signed-off-by: Zefir Kurtisi <[email protected]>
---
net/wireless/chan.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/wireless/chan.c b/net/wireless/chan.c
index fd556ac..16d0ee7 100644
--- a/net/wireless/chan.c
+++ b/net/wireless/chan.c
@@ -425,8 +425,8 @@ bool cfg80211_reg_can_beacon(struct wiphy *wiphy,

res = cfg80211_chandef_usable(wiphy, chandef,
IEEE80211_CHAN_DISABLED |
- IEEE80211_CHAN_PASSIVE_SCAN |
- IEEE80211_CHAN_NO_IBSS |
+// IEEE80211_CHAN_PASSIVE_SCAN |
+// IEEE80211_CHAN_NO_IBSS |
IEEE80211_CHAN_RADAR);

trace_cfg80211_return_bool(res);
--
1.7.4.1


2013-04-03 16:32:49

by Zefir Kurtisi

[permalink] [raw]
Subject: [TESTING-QH 1/2] REMOVEME: shorten time for NOP and CAC

From: Simon Wunderlich <[email protected]>

This is for testing only and to save you from waiting half an hour for a NOP.

Signed-off-by: Simon Wunderlich <[email protected]>
Signed-off-by: Zefir Kurtisi <[email protected]>
---
include/net/cfg80211.h | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index bdba9b6..6046cf3 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -126,8 +126,8 @@ enum ieee80211_channel_flags {
#define IEEE80211_CHAN_NO_HT40 \
(IEEE80211_CHAN_NO_HT40PLUS | IEEE80211_CHAN_NO_HT40MINUS)

-#define IEEE80211_DFS_MIN_CAC_TIME_MS 60000
-#define IEEE80211_DFS_MIN_NOP_TIME_MS (30 * 60 * 1000)
+#define IEEE80211_DFS_MIN_CAC_TIME_MS 4000
+#define IEEE80211_DFS_MIN_NOP_TIME_MS (6000)

/**
* struct ieee80211_channel - channel definition
--
1.7.4.1