diff options
| author | David S. Miller <davem@davemloft.net> | 2009-12-25 19:34:56 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-25 19:34:56 -0500 |
| commit | d346f49d0badd80aa9fc699fa9c6d5b23e778eb6 (patch) | |
| tree | 9e9698ffe7966fbe7ce924a30843f87cdfa2646e /net/wireless/wext-compat.c | |
| parent | d87fd25d5ac4cd044e21b749a8f6cac90f093c71 (diff) | |
| parent | b6ce5c33001b1dc83e6a1a6f30c5dccccea651b6 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
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 54face3d4424..4198243a3dff 100644 --- a/net/wireless/wext-compat.c +++ b/net/wireless/wext-compat.c | |||
| @@ -1257,10 +1257,7 @@ int cfg80211_wext_giwrate(struct net_device *dev, | |||
| 1257 | if (!(sinfo.filled & STATION_INFO_TX_BITRATE)) | 1257 | if (!(sinfo.filled & STATION_INFO_TX_BITRATE)) |
| 1258 | return -EOPNOTSUPP; | 1258 | return -EOPNOTSUPP; |
| 1259 | 1259 | ||
| 1260 | rate->value = 0; | 1260 | rate->value = 100000 * cfg80211_calculate_bitrate(&sinfo.txrate); |
| 1261 | |||
| 1262 | if (!(sinfo.txrate.flags & RATE_INFO_FLAGS_MCS)) | ||
| 1263 | rate->value = 100000 * sinfo.txrate.legacy; | ||
| 1264 | 1261 | ||
| 1265 | return 0; | 1262 | return 0; |
| 1266 | } | 1263 | } |