From 431b4e8e1df2122916455486bbb7507d183efe64 Mon Sep 17 00:00:00 2001
From: Thomas Pedersen <thomas@cozybit.com>
Date: Mon, 5 Mar 2012 15:31:47 -0800
Subject: [PATCH] --- yaml --- r: 291200 b: refs/heads/master c:
 8097e1494459a4f9cdbaba7440334d9bd11a39f0 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/include/net/cfg80211.h | 8 ++++++++
 trunk/net/wireless/util.c    | 1 +
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 07690e00bf9b..c19bd384a3d5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2e7eb117586198386e5a06d0bc4279a9d7cbaeb6
+refs/heads/master: 8097e1494459a4f9cdbaba7440334d9bd11a39f0
diff --git a/trunk/include/net/cfg80211.h b/trunk/include/net/cfg80211.h
index 4682c35a92c4..57c9fddc2acf 100644
--- a/trunk/include/net/cfg80211.h
+++ b/trunk/include/net/cfg80211.h
@@ -3337,6 +3337,14 @@ int cfg80211_can_beacon_sec_chan(struct wiphy *wiphy,
 				 struct ieee80211_channel *chan,
 				 enum nl80211_channel_type channel_type);
 
+/*
+ * cfg80211_calculate_bitrate - calculate actual bitrate (in 100Kbps units)
+ * @rate: given rate_info to calculate bitrate from
+ *
+ * return 0 if MCS index >= 32
+ */
+u16 cfg80211_calculate_bitrate(struct rate_info *rate);
+
 /* Logging, debugging and troubleshooting/diagnostic helpers. */
 
 /* wiphy_printk helpers, similar to dev_printk */
diff --git a/trunk/net/wireless/util.c b/trunk/net/wireless/util.c
index 9aa9db6c8141..1b7a08df933c 100644
--- a/trunk/net/wireless/util.c
+++ b/trunk/net/wireless/util.c
@@ -904,6 +904,7 @@ u16 cfg80211_calculate_bitrate(struct rate_info *rate)
 	/* do NOT round down here */
 	return (bitrate + 50000) / 100000;
 }
+EXPORT_SYMBOL(cfg80211_calculate_bitrate);
 
 int cfg80211_validate_beacon_int(struct cfg80211_registered_device *rdev,
 				 u32 beacon_int)