diff options
author | John W. Linville <linville@tuxdriver.com> | 2009-12-09 16:43:52 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-12-21 11:27:31 -0500 |
commit | 254416aae70ab2e6b57fd79782c8a67196234d02 (patch) | |
tree | e28d54d1514634b591b54296b35bb9029e7b5a9c /net/wireless/wext-compat.c | |
parent | a252e749f1ae17e43ccc5824f7b1b5854417c98b (diff) |
wireless: report reasonable bitrate for MCS rates through wext
Previously, cfg80211 had reported "0" for MCS (i.e. 802.11n) bitrates
through the wireless extensions interface. However, nl80211 was
converting MCS rates into a reasonable bitrate number. This patch moves
the nl80211 code to cfg80211 where it is now shared between both the
nl80211 interface and the wireless extensions interface.
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/wireless/wext-compat.c')
-rw-r--r-- | net/wireless/wext-compat.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/wireless/wext-compat.c b/net/wireless/wext-compat.c index 584eb4826e02..2fa8de1140e9 100644 --- a/net/wireless/wext-compat.c +++ b/net/wireless/wext-compat.c | |||
@@ -1256,10 +1256,7 @@ int cfg80211_wext_giwrate(struct net_device *dev, | |||
1256 | if (!(sinfo.filled & STATION_INFO_TX_BITRATE)) | 1256 | if (!(sinfo.filled & STATION_INFO_TX_BITRATE)) |
1257 | return -EOPNOTSUPP; | 1257 | return -EOPNOTSUPP; |
1258 | 1258 | ||
1259 | rate->value = 0; | 1259 | rate->value = 100000 * cfg80211_calculate_bitrate(&sinfo.txrate); |
1260 | |||
1261 | if (!(sinfo.txrate.flags & RATE_INFO_FLAGS_MCS)) | ||
1262 | rate->value = 100000 * sinfo.txrate.legacy; | ||
1263 | 1260 | ||
1264 | return 0; | 1261 | return 0; |
1265 | } | 1262 | } |