diff mbox

ibss: add VHT80 support for IBSS

Message ID 1441879453-6391-1-git-send-email-janusz.dziedzic@tieto.com (mailing list archive)
State Accepted
Delegated to: Johannes Berg
Headers show

Commit Message

Janusz.Dziedzic@tieto.com Sept. 10, 2015, 10:04 a.m. UTC 
Add VHT80 support for IBSS.

eg. iw wlan0 ibss join 5180 80MHZ
    iw wlan0 ibbs join 5220 80MHZ

Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
---
 ibss.c | 48 ++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 40 insertions(+), 8 deletions(-)

Comments

Johannes Berg Sept. 18, 2015, 9:12 a.m. UTC | #1 
On Thu, 2015-09-10 at 12:04 +0200, Janusz Dziedzic wrote:
> Add VHT80 support for IBSS.
> 
> eg. iw wlan0 ibss join 5180 80MHZ
>     iw wlan0 ibbs join 5220 80MHZ
> 
Applied, with the obvious code style issue fixed.

johannes
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/ibss.c b/ibss.c
index 7a0b707..460f549 100644
--- a/ibss.c
+++ b/ibss.c
@@ -16,6 +16,38 @@ 
 
 SECTION(ibss);
 
+struct chanmode {
+	const char *name;
+	unsigned int width;
+	int freq1_diff;
+	int chantype; /* for older kernel */
+};
+
+static int get_cf1(const struct chanmode *chanmode, unsigned long freq) {
+	int cf1 = freq, j;
+	int vht80[] = { 5180, 5260, 5500, 5580, 5660, 5745 };
+
+	switch (chanmode->width) {
+	case NL80211_CHAN_WIDTH_80:
+	        /* setup center_freq1 */
+		for (j = 0; j < ARRAY_SIZE(vht80); j++) {
+			if (freq >= vht80[j] && freq < vht80[j] + 80)
+				break;
+		}
+
+		if (j == ARRAY_SIZE(vht80))
+			break;
+
+		cf1 = vht80[j] + 30;
+		break;
+	default:
+		cf1 = freq + chanmode->freq1_diff;
+		break;
+	}
+
+	return cf1;
+}
+
 static int join_ibss(struct nl80211_state *state,
 		     struct nl_msg *msg,
 		     int argc, char **argv,
@@ -30,12 +62,8 @@  static int join_ibss(struct nl80211_state *state,
 	int bintval;
 	int i;
 	unsigned long freq;
-	static const struct {
-		const char *name;
-		unsigned int width;
-		int freq1_diff;
-		int chantype; /* for older kernel */
-	} *chanmode_selected = NULL, chanmode[] = {
+	const struct chanmode *chanmode_selected = NULL;
+	static const struct chanmode chanmode[] = {
 		{ .name = "HT20",
 		  .width = NL80211_CHAN_WIDTH_20,
 		  .freq1_diff = 0,
@@ -60,6 +88,10 @@  static int join_ibss(struct nl80211_state *state,
 		  .width = NL80211_CHAN_WIDTH_10,
 		  .freq1_diff = 0,
 		  .chantype = -1 },
+		{ .name = "80MHZ",
+		  .width = NL80211_CHAN_WIDTH_80,
+		  .freq1_diff = 0,
+		  .chantype = -1 },
 	};
 
 	if (argc < 2)
@@ -90,7 +122,7 @@  static int join_ibss(struct nl80211_state *state,
 			NLA_PUT_U32(msg, NL80211_ATTR_CHANNEL_WIDTH,
 				    chanmode_selected->width);
 			NLA_PUT_U32(msg, NL80211_ATTR_CENTER_FREQ1,
-				    freq + chanmode_selected->freq1_diff);
+				    get_cf1(chanmode_selected, freq));
 			if (chanmode_selected->chantype != -1)
 				NLA_PUT_U32(msg,
 					    NL80211_ATTR_WIPHY_CHANNEL_TYPE,
@@ -192,7 +224,7 @@  COMMAND(ibss, leave, NULL,
 	NL80211_CMD_LEAVE_IBSS, 0, CIB_NETDEV, leave_ibss,
 	"Leave the current IBSS cell.");
 COMMAND(ibss, join,
-	"<SSID> <freq in MHz> [HT20|HT40+|HT40-|NOHT|5MHZ|10MHZ] [fixed-freq] [<fixed bssid>] [beacon-interval <TU>]"
+	"<SSID> <freq in MHz> [HT20|HT40+|HT40-|NOHT|5MHZ|10MHZ|80MHZ] [fixed-freq] [<fixed bssid>] [beacon-interval <TU>]"
 	" [basic-rates <rate in Mbps,rate2,...>] [mcast-rate <rate in Mbps>] "
 	"[key d:0:abcde]",
 	NL80211_CMD_JOIN_IBSS, 0, CIB_NETDEV, join_ibss,