diff mbox

[RFC] iw: add support for retry limit

Message ID 1389273736-9486-1-git-send-email-royujjal@gmail.com (mailing list archive)
State Not Applicable, archived
Headers show

Commit Message

Roy, UjjaL Jan. 9, 2014, 1:22 p.m. UTC
Show the retry limit in phy details and also configure the
retry limit.

Signed-off-by: Ujjal Roy <royujjal@gmail.com>
---
 info.c | 16 ++++++++++++++++
 phy.c  | 39 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+)

Comments

Johannes Berg Jan. 24, 2014, 3 p.m. UTC | #1
On Thu, 2014-01-09 at 18:52 +0530, Ujjal Roy wrote:

Sorry for the late reply.

> @@ -232,6 +232,45 @@ COMMAND(set, rts, "<rts threshold|off>",
>  	NL80211_CMD_SET_WIPHY, 0, CIB_PHY, handle_rts,
>  	"Set rts threshold.");
>  
> +static int handle_retry(struct nl80211_state *state,
> +		      struct nl_cb *cb, struct nl_msg *msg,
> +		      int argc, char **argv,
> +		      enum id_input id)

indentation is a bit off

> +COMMAND(set, retry, "<short limit> [<long limit>]",
> +	NL80211_CMD_SET_WIPHY, 0, CIB_PHY, handle_retry,
> +	"Set retry limit.");

This seems odd to me, why would you want to allow setting the short
limit while not changing the long one, but not the other way around?

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/info.c b/info.c
index a696503..08b3292 100644
--- a/info.c
+++ b/info.c
@@ -246,6 +246,22 @@  next:
 			printf("\tRTS threshold: %d\n", rts);
 	}
 
+	if (tb_msg[NL80211_ATTR_WIPHY_RETRY_SHORT] ||
+	    tb_msg[NL80211_ATTR_WIPHY_RETRY_LONG]) {
+		unsigned char retry_s = 0, retry_l = 0;
+
+		if (tb_msg[NL80211_ATTR_WIPHY_RETRY_SHORT])
+			retry_s = nla_get_u8(tb_msg[NL80211_ATTR_WIPHY_RETRY_SHORT]);
+		if (tb_msg[NL80211_ATTR_WIPHY_RETRY_LONG])
+			retry_l = nla_get_u8(tb_msg[NL80211_ATTR_WIPHY_RETRY_LONG]);
+		if (retry_s == retry_l) {
+			printf("\tRetry short long limit: %d\n", retry_s);
+		} else {
+			printf("\tRetry short limit: %d\n", retry_s);
+			printf("\tRetry long limit: %d\n", retry_l);
+		}
+	}
+
 	if (tb_msg[NL80211_ATTR_WIPHY_COVERAGE_CLASS]) {
 		unsigned char coverage;
 
diff --git a/phy.c b/phy.c
index 68f40f6..da05103 100644
--- a/phy.c
+++ b/phy.c
@@ -232,6 +232,45 @@  COMMAND(set, rts, "<rts threshold|off>",
 	NL80211_CMD_SET_WIPHY, 0, CIB_PHY, handle_rts,
 	"Set rts threshold.");
 
+static int handle_retry(struct nl80211_state *state,
+		      struct nl_cb *cb, struct nl_msg *msg,
+		      int argc, char **argv,
+		      enum id_input id)
+{
+	unsigned int retry_short = 0, retry_long = 0;
+	char *end;
+
+	if (!argc || argc > 2)
+		return 1;
+
+	if (!*argv[0])
+		return 1;
+	retry_short = strtoul(argv[0], &end, 10);
+	if (*end != '\0')
+		return 1;
+	if (!retry_short || retry_short > 255)
+		return -EINVAL;
+	NLA_PUT_U8(msg, NL80211_ATTR_WIPHY_RETRY_SHORT, retry_short);
+
+	if (argc == 2) {
+		if (!*argv[1])
+			return 1;
+		retry_long = strtoul(argv[1], &end, 10);
+		if (*end != '\0')
+			return 1;
+		if (!retry_long || retry_long > 255)
+			return -EINVAL;
+		NLA_PUT_U8(msg, NL80211_ATTR_WIPHY_RETRY_LONG, retry_long);
+	}
+
+	return 0;
+ nla_put_failure:
+	return -ENOBUFS;
+}
+COMMAND(set, retry, "<short limit> [<long limit>]",
+	NL80211_CMD_SET_WIPHY, 0, CIB_PHY, handle_retry,
+	"Set retry limit.");
+
 static int handle_netns(struct nl80211_state *state,
 			struct nl_cb *cb,
 			struct nl_msg *msg,