Merge refs/heads/ieee80211-wifi from master.kernel.org:/pub/scm/linux/kernel/git...

[linux-2.6-omap-h63xx.git] / drivers / net / wireless / hostap / hostap_ioctl.c

diff --git a/drivers/net/wireless/hostap/hostap_ioctl.c b/drivers/net/wireless/hostap/hostap_ioctl.c
index f892aa87b13e0deb9482daddbf94389685c3e07f..e720369a3515595b1a35129b92be19f0a578325c 100644 (file)
--- a/drivers/net/wireless/hostap/hostap_ioctl.c
+++ b/drivers/net/wireless/hostap/hostap_ioctl.c
@@ -335,7 +335,7 @@ static int hostap_set_rate(struct net_device *dev)
               hostap_set_word(dev, HFA384X_RID_CNFSUPPORTEDRATES,
                               local->tx_rate_control) ||
               local->func->reset_port(dev));
-               
+
        if (ret) {
                printk(KERN_WARNING "%s: TXRateControl/cnfSupportedRates "
                       "setting to 0x%x failed\n",
@@ -2239,14 +2239,6 @@ static const struct iw_priv_args prism2_priv[] = {
          IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "host_decrypt" },
        { PRISM2_PARAM_HOST_DECRYPT,
          0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "gethost_decrypt" },
-       { PRISM2_PARAM_BUS_MASTER_THRESHOLD_RX,
-         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "busmaster_rx" },
-       { PRISM2_PARAM_BUS_MASTER_THRESHOLD_RX,
-         0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "getbusmaster_rx" },
-       { PRISM2_PARAM_BUS_MASTER_THRESHOLD_TX,
-         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "busmaster_tx" },
-       { PRISM2_PARAM_BUS_MASTER_THRESHOLD_TX,
-         0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "getbusmaster_tx" },
 #ifndef PRISM2_NO_STATION_MODES
        { PRISM2_PARAM_HOST_ROAMING,
          IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "host_roaming" },
@@ -2495,14 +2487,6 @@ static int prism2_ioctl_priv_prism2_param(struct net_device *dev,
                        ret = -EINVAL;
                break;
 
-       case PRISM2_PARAM_BUS_MASTER_THRESHOLD_RX:
-               local->bus_master_threshold_rx = value;
-               break;
-
-       case PRISM2_PARAM_BUS_MASTER_THRESHOLD_TX:
-               local->bus_master_threshold_tx = value;
-               break;
-
 #ifndef PRISM2_NO_STATION_MODES
        case PRISM2_PARAM_HOST_ROAMING:
                if (value < 0 || value > 2) {
@@ -2799,14 +2783,6 @@ static int prism2_ioctl_priv_get_prism2_param(struct net_device *dev,
                *param = local->host_decrypt;
                break;
 
-       case PRISM2_PARAM_BUS_MASTER_THRESHOLD_RX:
-               *param = local->bus_master_threshold_rx;
-               break;
-
-       case PRISM2_PARAM_BUS_MASTER_THRESHOLD_TX:
-               *param = local->bus_master_threshold_tx;
-               break;
-
        case PRISM2_PARAM_HOST_ROAMING:
                *param = local->host_roaming;
                break;
@@ -3808,11 +3784,11 @@ static int prism2_ioctl_siwmlme(struct net_device *dev,
        switch (mlme->cmd) {
        case IW_MLME_DEAUTH:
                return prism2_sta_send_mgmt(local, mlme->addr.sa_data,
-                                           WLAN_FC_STYPE_DEAUTH,
+                                           IEEE80211_STYPE_DEAUTH,
                                            (u8 *) &reason, 2);
        case IW_MLME_DISASSOC:
                return prism2_sta_send_mgmt(local, mlme->addr.sa_data,
-                                           WLAN_FC_STYPE_DISASSOC,
+                                           IEEE80211_STYPE_DISASSOC,
                                            (u8 *) &reason, 2);
        default:
                return -EOPNOTSUPP;
@@ -3829,11 +3805,11 @@ static int prism2_ioctl_mlme(local_info_t *local,
        switch (param->u.mlme.cmd) {
        case MLME_STA_DEAUTH:
                return prism2_sta_send_mgmt(local, param->sta_addr,
-                                           WLAN_FC_STYPE_DEAUTH,
+                                           IEEE80211_STYPE_DEAUTH,
                                            (u8 *) &reason, 2);
        case MLME_STA_DISASSOC:
                return prism2_sta_send_mgmt(local, param->sta_addr,
-                                           WLAN_FC_STYPE_DISASSOC,
+                                           IEEE80211_STYPE_DISASSOC,
                                            (u8 *) &reason, 2);
        default:
                return -EOPNOTSUPP;