Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[karo-tx-linux.git] / net / mac80211 / chan.c

diff --git a/net/mac80211/chan.c b/net/mac80211/chan.c
index e00ce8c3e28e431c4232a1441ee2b0b2eeb3d480..c76cf7230c7db06c646c4b13b14b46bf670a0afa 100644 (file)
--- a/net/mac80211/chan.c
+++ b/net/mac80211/chan.c
@@ -135,29 +135,3 @@ bool ieee80211_set_channel_type(struct ieee80211_local *local,
 
        return result;
 }
-
-/*
- * ieee80211_get_tx_channel_type returns the channel type we should
- * use for packet transmission, given the channel capability and
- * whatever regulatory flags we have been given.
- */
-enum nl80211_channel_type ieee80211_get_tx_channel_type(
-                               struct ieee80211_local *local,
-                               enum nl80211_channel_type channel_type)
-{
-       switch (channel_type) {
-       case NL80211_CHAN_HT40PLUS:
-               if (local->hw.conf.channel->flags &
-                               IEEE80211_CHAN_NO_HT40PLUS)
-                       return NL80211_CHAN_HT20;
-               break;
-       case NL80211_CHAN_HT40MINUS:
-               if (local->hw.conf.channel->flags &
-                               IEEE80211_CHAN_NO_HT40MINUS)
-                       return NL80211_CHAN_HT20;
-               break;
-       default:
-               break;
-       }
-       return channel_type;
-}