From 2667f8cefaeb80937e6be05895ea5fee0a8a1edb Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Fri, 28 Sep 2012 18:29:16 +0000
Subject: iw: update to 3.6 and add support for configuring antenna gain

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33586 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/iw/patches/100-rx_rate.patch | 34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

(limited to 'package/iw/patches/100-rx_rate.patch')

diff --git a/package/iw/patches/100-rx_rate.patch b/package/iw/patches/100-rx_rate.patch
index 780a7d439..642b9f357 100644
--- a/package/iw/patches/100-rx_rate.patch
+++ b/package/iw/patches/100-rx_rate.patch
@@ -1,6 +1,6 @@
 --- a/station.c
 +++ b/station.c
-@@ -29,13 +29,43 @@ enum plink_actions {
+@@ -29,13 +29,47 @@ enum plink_actions {
  	PLINK_ACTION_BLOCK,
  };
  
@@ -10,6 +10,7 @@
 +
 +	static struct nla_policy rate_policy[NL80211_RATE_INFO_MAX + 1] = {
 +		[NL80211_RATE_INFO_BITRATE] = { .type = NLA_U16 },
++		[NL80211_RATE_INFO_BITRATE32] = { .type = NLA_U32 },
 +		[NL80211_RATE_INFO_MCS] = { .type = NLA_U8 },
 +		[NL80211_RATE_INFO_40_MHZ_WIDTH] = { .type = NLA_FLAG },
 +		[NL80211_RATE_INFO_SHORT_GI] = { .type = NLA_FLAG },
@@ -21,11 +22,14 @@
 +	if (nla_parse_nested(rinfo, NL80211_RATE_INFO_MAX, nla, rate_policy)) {
 +		fprintf(stderr, "failed to parse nested rate attributes!\n");
 +	} else {
++		int rate = 0;
 +		printf("\n\t%s:\t", name);
-+		if (rinfo[NL80211_RATE_INFO_BITRATE]) {
-+			int rate = nla_get_u16(rinfo[NL80211_RATE_INFO_BITRATE]);
++		if (rinfo[NL80211_RATE_INFO_BITRATE32])
++			rate = nla_get_u32(rinfo[NL80211_RATE_INFO_BITRATE32]);
++		else if (rinfo[NL80211_RATE_INFO_BITRATE])
++			rate = nla_get_u16(rinfo[NL80211_RATE_INFO_BITRATE]);
++		if (rate > 0)
 +			printf("%d.%d MBit/s", rate / 10, rate % 10);
-+		}
 +
 +		if (rinfo[NL80211_RATE_INFO_MCS])
 +			printf(" MCS %d", nla_get_u8(rinfo[NL80211_RATE_INFO_MCS]));
@@ -45,20 +49,21 @@
  	char mac_addr[20], state_name[10], dev[20];
  	struct nl80211_sta_flag_update *sta_flags;
  	static struct nla_policy stats_policy[NL80211_STA_INFO_MAX + 1] = {
-@@ -46,6 +76,7 @@ static int print_sta_handler(struct nl_m
- 		[NL80211_STA_INFO_TX_PACKETS] = { .type = NLA_U32 },
+@@ -47,6 +81,7 @@ static int print_sta_handler(struct nl_m
  		[NL80211_STA_INFO_SIGNAL] = { .type = NLA_U8 },
+ 		[NL80211_STA_INFO_T_OFFSET] = { .type = NLA_U64 },
  		[NL80211_STA_INFO_TX_BITRATE] = { .type = NLA_NESTED },
 +		[NL80211_STA_INFO_RX_BITRATE] = { .type = NLA_NESTED },
  		[NL80211_STA_INFO_LLID] = { .type = NLA_U16 },
  		[NL80211_STA_INFO_PLID] = { .type = NLA_U16 },
  		[NL80211_STA_INFO_PLINK_STATE] = { .type = NLA_U8 },
-@@ -55,13 +86,6 @@ static int print_sta_handler(struct nl_m
+@@ -56,14 +91,6 @@ static int print_sta_handler(struct nl_m
  			{ .minlen = sizeof(struct nl80211_sta_flag_update) },
  	};
  
 -	static struct nla_policy rate_policy[NL80211_RATE_INFO_MAX + 1] = {
 -		[NL80211_RATE_INFO_BITRATE] = { .type = NLA_U16 },
+-		[NL80211_RATE_INFO_BITRATE32] = { .type = NLA_U32 },
 -		[NL80211_RATE_INFO_MCS] = { .type = NLA_U8 },
 -		[NL80211_RATE_INFO_40_MHZ_WIDTH] = { .type = NLA_FLAG },
 -		[NL80211_RATE_INFO_SHORT_GI] = { .type = NLA_FLAG },
@@ -67,20 +72,23 @@
  	nla_parse(tb, NL80211_ATTR_MAX, genlmsg_attrdata(gnlh, 0),
  		  genlmsg_attrlen(gnlh, 0), NULL);
  
-@@ -114,25 +138,8 @@ static int print_sta_handler(struct nl_m
- 		printf("\n\tsignal avg:\t%d dBm",
- 			(int8_t)nla_get_u8(sinfo[NL80211_STA_INFO_SIGNAL_AVG]));
+@@ -119,28 +146,8 @@ static int print_sta_handler(struct nl_m
+ 		printf("\n\tToffset:\t%lld us",
+ 			(unsigned long long)nla_get_u64(sinfo[NL80211_STA_INFO_T_OFFSET]));
  
 -	if (sinfo[NL80211_STA_INFO_TX_BITRATE]) {
 -		if (nla_parse_nested(rinfo, NL80211_RATE_INFO_MAX,
 -				     sinfo[NL80211_STA_INFO_TX_BITRATE], rate_policy)) {
 -			fprintf(stderr, "failed to parse nested rate attributes!\n");
 -		} else {
+-			int rate = 0;
 -			printf("\n\ttx bitrate:\t");
--			if (rinfo[NL80211_RATE_INFO_BITRATE]) {
--				int rate = nla_get_u16(rinfo[NL80211_RATE_INFO_BITRATE]);
+-			if (rinfo[NL80211_RATE_INFO_BITRATE32])
+-				rate = nla_get_u32(rinfo[NL80211_RATE_INFO_BITRATE32]);
+-			else if (rinfo[NL80211_RATE_INFO_BITRATE])
+-				rate = nla_get_u16(rinfo[NL80211_RATE_INFO_BITRATE]);
+-			if (rate > 0)
 -				printf("%d.%d MBit/s", rate / 10, rate % 10);
--			}
 -
 -			if (rinfo[NL80211_RATE_INFO_MCS])
 -				printf(" MCS %d", nla_get_u8(rinfo[NL80211_RATE_INFO_MCS]));
-- 
cgit v1.2.3