Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / net / mac80211 / rate.h

diff --git a/net/mac80211/rate.h b/net/mac80211/rate.h
index eb94e584d24e866106a561cce50b5c91e0e10980..d0092f847f82775eb19c457874dfc911a12d4795 100644 (file)
--- a/net/mac80211/rate.h
+++ b/net/mac80211/rate.h
@@ -125,4 +125,18 @@ static inline void rc80211_pid_exit(void)
 }
 #endif
 
+#ifdef CONFIG_MAC80211_RC_MINSTREL
+extern int rc80211_minstrel_init(void);
+extern void rc80211_minstrel_exit(void);
+#else
+static inline int rc80211_minstrel_init(void)
+{
+       return 0;
+}
+static inline void rc80211_minstrel_exit(void)
+{
+}
+#endif
+
+
 #endif /* IEEE80211_RATE_H */