2010-10-27 03:07:55

by Bruno Randolf

[permalink] [raw]
Subject: [PATCH v2] iw: Add ibss join parameter for beacon interval

NL80211_ATTR_BEACON_INTERVAL already exists, we just have to use it.

Signed-off-by: Bruno Randolf <[email protected]>

--
v2: rename from 'bintval' to 'beacon-interval' and use correct units (TU)
---
ibss.c | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/ibss.c b/ibss.c
index e85ef1d..1d24ad2 100644
--- a/ibss.c
+++ b/ibss.c
@@ -26,6 +26,7 @@ static int join_ibss(struct nl80211_state *state,
int n_rates = 0;
char *value = NULL, *sptr = NULL;
float rate;
+ int bintval;

if (argc < 2)
return 1;
@@ -57,6 +58,15 @@ static int join_ibss(struct nl80211_state *state,
}
}

+ if (argc > 1 && strcmp(argv[0], "beacon-interval") == 0) {
+ argv++;
+ argc--;
+ bintval = strtoul(argv[0], &end, 10);
+ NLA_PUT_U32(msg, NL80211_ATTR_BEACON_INTERVAL, bintval);
+ argv++;
+ argc--;
+ }
+
/* basic rates */
if (argc > 1 && strcmp(argv[0], "basic-rates") == 0) {
argv++;
@@ -108,11 +118,12 @@ 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> [fixed-freq] [<fixed bssid>] "
- "[basic-rates <rate in Mbps,rate2,...>] [key d:0:abcde]",
+ "<SSID> <freq in MHz> [fixed-freq] [<fixed bssid>] [beacon-interval "
+ "<TU>] [basic-rates <rate in Mbps,rate2,...>] [key d:0:abcde]",
NL80211_CMD_JOIN_IBSS, 0, CIB_NETDEV, join_ibss,
"Join the IBSS cell with the given SSID, if it doesn't exist create\n"
"it on the given frequency. When fixed frequency is requested, don't\n"
"join/create a cell on a different frequency. When a fixed BSSID is\n"
"requested use that BSSID and do not adopt another cell's BSSID even\n"
- "if it has higher TSF and the same SSID.");
+ "if it has higher TSF and the same SSID. If an IBSS is created, create\n"
+ "it with the specified basic-rates and beacon-interval (in TU).");



2010-10-27 05:14:48

by Johannes Berg

[permalink] [raw]
Subject: Re: [PATCH v2] iw: Add ibss join parameter for beacon interval

On Wed, 2010-10-27 at 12:07 +0900, Bruno Randolf wrote:

> + if (argc > 1 && strcmp(argv[0], "beacon-interval") == 0) {
> + argv++;
> + argc--;
> + bintval = strtoul(argv[0], &end, 10);

error checking would be nice, this will accept "beacon-interval 50ms"
which may not be what we want ;)

johannes