[PATCH] mac80211: kill antenna select ioctls

Not used anywhere.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Jiri Benc <jbenc@suse.cz>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/net/mac80211/hostapd_ioctl.h b/net/mac80211/hostapd_ioctl.h
index 252204fd0abb170f0a25bc0b640ca4ba20ef1e15..230eb4400ec6bd5f4be060160e80535ab7340d45 100644 (file)
--- a/net/mac80211/hostapd_ioctl.h
+++ b/net/mac80211/hostapd_ioctl.h
@@ -26,8 +26,6 @@
  * mess shall be deleted completely. */
 enum {
        PRISM2_PARAM_IEEE_802_1X = 23,
-       PRISM2_PARAM_ANTSEL_TX = 24,
-       PRISM2_PARAM_ANTSEL_RX = 25,
 
        /* Instant802 additions */
        PRISM2_PARAM_CTS_PROTECT_ERP_FRAMES = 1001,

diff --git a/net/mac80211/ieee80211_ioctl.c b/net/mac80211/ieee80211_ioctl.c
index f404f1f4251d2233b7418475f9a8c296b380b4c2..ab09e9a90f43bdc76ff81c89b88122e40b2b5c2a 100644 (file)
--- a/net/mac80211/ieee80211_ioctl.c
+++ b/net/mac80211/ieee80211_ioctl.c
@@ -1197,18 +1197,6 @@ static int ieee80211_ioctl_prism2_param(struct net_device *dev,
                        sdata->ieee802_1x = value;
                break;
 
-       case PRISM2_PARAM_ANTSEL_TX:
-               local->hw.conf.antenna_sel_tx = value;
-               if (ieee80211_hw_config(local))
-                       ret = -EINVAL;
-               break;
-
-       case PRISM2_PARAM_ANTSEL_RX:
-               local->hw.conf.antenna_sel_rx = value;
-               if (ieee80211_hw_config(local))
-                       ret = -EINVAL;
-               break;
-
        case PRISM2_PARAM_CTS_PROTECT_ERP_FRAMES:
                local->cts_protect_erp_frames = value;
                break;
@@ -1340,14 +1328,6 @@ static int ieee80211_ioctl_get_prism2_param(struct net_device *dev,
                *param = sdata->ieee802_1x;
                break;
 
-       case PRISM2_PARAM_ANTSEL_TX:
-               *param = local->hw.conf.antenna_sel_tx;
-               break;
-
-       case PRISM2_PARAM_ANTSEL_RX:
-               *param = local->hw.conf.antenna_sel_rx;
-               break;
-
        case PRISM2_PARAM_CTS_PROTECT_ERP_FRAMES:
                *param = local->cts_protect_erp_frames;
                break;