aboutsummaryrefslogtreecommitdiffstats
path: root/net/wireless
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2009-12-09 16:43:52 -0500
committerJohn W. Linville <linville@tuxdriver.com>2009-12-21 11:27:31 -0500
commit254416aae70ab2e6b57fd79782c8a67196234d02 (patch)
treee28d54d1514634b591b54296b35bb9029e7b5a9c /net/wireless
parenta252e749f1ae17e43ccc5824f7b1b5854417c98b (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')
-rw-r--r--net/wireless/core.h2
-rw-r--r--net/wireless/nl80211.c37
-rw-r--r--net/wireless/util.c33
-rw-r--r--net/wireless/wext-compat.c5
4 files changed, 38 insertions, 39 deletions
diff --git a/net/wireless/core.h b/net/wireless/core.h
index 4ef3efc94106..35b712127143 100644
--- a/net/wireless/core.h
+++ b/net/wireless/core.h
@@ -378,6 +378,8 @@ int rdev_set_freq(struct cfg80211_registered_device *rdev,
378 struct wireless_dev *for_wdev, 378 struct wireless_dev *for_wdev,
379 int freq, enum nl80211_channel_type channel_type); 379 int freq, enum nl80211_channel_type channel_type);
380 380
381u16 cfg80211_calculate_bitrate(struct rate_info *rate);
382
381#ifdef CONFIG_CFG80211_DEVELOPER_WARNINGS 383#ifdef CONFIG_CFG80211_DEVELOPER_WARNINGS
382#define CFG80211_DEV_WARN_ON(cond) WARN_ON(cond) 384#define CFG80211_DEV_WARN_ON(cond) WARN_ON(cond)
383#else 385#else
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index a6028433e3a0..7cb0d647fc34 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -1637,39 +1637,6 @@ static int parse_station_flags(struct genl_info *info,
1637 return 0; 1637 return 0;
1638} 1638}
1639 1639
1640static u16 nl80211_calculate_bitrate(struct rate_info *rate)
1641{
1642 int modulation, streams, bitrate;
1643
1644 if (!(rate->flags & RATE_INFO_FLAGS_MCS))
1645 return rate->legacy;
1646
1647 /* the formula below does only work for MCS values smaller than 32 */
1648 if (rate->mcs >= 32)
1649 return 0;
1650
1651 modulation = rate->mcs & 7;
1652 streams = (rate->mcs >> 3) + 1;
1653
1654 bitrate = (rate->flags & RATE_INFO_FLAGS_40_MHZ_WIDTH) ?
1655 13500000 : 6500000;
1656
1657 if (modulation < 4)
1658 bitrate *= (modulation + 1);
1659 else if (modulation == 4)
1660 bitrate *= (modulation + 2);
1661 else
1662 bitrate *= (modulation + 3);
1663
1664 bitrate *= streams;
1665
1666 if (rate->flags & RATE_INFO_FLAGS_SHORT_GI)
1667 bitrate = (bitrate / 9) * 10;
1668
1669 /* do NOT round down here */
1670 return (bitrate + 50000) / 100000;
1671}
1672
1673static int nl80211_send_station(struct sk_buff *msg, u32 pid, u32 seq, 1640static int nl80211_send_station(struct sk_buff *msg, u32 pid, u32 seq,
1674 int flags, struct net_device *dev, 1641 int flags, struct net_device *dev,
1675 u8 *mac_addr, struct station_info *sinfo) 1642 u8 *mac_addr, struct station_info *sinfo)
@@ -1716,8 +1683,8 @@ static int nl80211_send_station(struct sk_buff *msg, u32 pid, u32 seq,
1716 if (!txrate) 1683 if (!txrate)
1717 goto nla_put_failure; 1684 goto nla_put_failure;
1718 1685
1719 /* nl80211_calculate_bitrate will return 0 for mcs >= 32 */ 1686 /* cfg80211_calculate_bitrate will return 0 for mcs >= 32 */
1720 bitrate = nl80211_calculate_bitrate(&sinfo->txrate); 1687 bitrate = cfg80211_calculate_bitrate(&sinfo->txrate);
1721 if (bitrate > 0) 1688 if (bitrate > 0)
1722 NLA_PUT_U16(msg, NL80211_RATE_INFO_BITRATE, bitrate); 1689 NLA_PUT_U16(msg, NL80211_RATE_INFO_BITRATE, bitrate);
1723 1690
diff --git a/net/wireless/util.c b/net/wireless/util.c
index 59361fdcb5d0..a3c841a255db 100644
--- a/net/wireless/util.c
+++ b/net/wireless/util.c
@@ -720,3 +720,36 @@ int cfg80211_change_iface(struct cfg80211_registered_device *rdev,
720 720
721 return err; 721 return err;
722} 722}
723
724u16 cfg80211_calculate_bitrate(struct rate_info *rate)
725{
726 int modulation, streams, bitrate;
727
728 if (!(rate->flags & RATE_INFO_FLAGS_MCS))
729 return rate->legacy;
730
731 /* the formula below does only work for MCS values smaller than 32 */
732 if (rate->mcs >= 32)
733 return 0;
734
735 modulation = rate->mcs & 7;
736 streams = (rate->mcs >> 3) + 1;
737
738 bitrate = (rate->flags & RATE_INFO_FLAGS_40_MHZ_WIDTH) ?
739 13500000 : 6500000;
740
741 if (modulation < 4)
742 bitrate *= (modulation + 1);
743 else if (modulation == 4)
744 bitrate *= (modulation + 2);
745 else
746 bitrate *= (modulation + 3);
747
748 bitrate *= streams;
749
750 if (rate->flags & RATE_INFO_FLAGS_SHORT_GI)
751 bitrate = (bitrate / 9) * 10;
752
753 /* do NOT round down here */
754 return (bitrate + 50000) / 100000;
755}
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}