[PATCH] hostap update

Added support for setting channel mask for scan requests
('iwpriv wlan0 scan_channels 0x00ff' masks scans to use channels 1-8).

Signed-off-by: Jouni Malinen <jkmaline@cc.hut.fi>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

diff --git a/drivers/net/wireless/hostap/hostap_common.h b/drivers/net/wireless/hostap/hostap_common.h
index 1a9610add6958b1f10ecf7b37a88b09c2efe035a..feec70e68d4e86f47a3ccec6e0280734f0f0b291 100644 (file)
--- a/drivers/net/wireless/hostap/hostap_common.h
+++ b/drivers/net/wireless/hostap/hostap_common.h
@@ -423,6 +423,7 @@ enum {
        PRISM2_PARAM_PRIVACY_INVOKED = 37,
        PRISM2_PARAM_TKIP_COUNTERMEASURES = 38,
        PRISM2_PARAM_DROP_UNENCRYPTED = 39,
+       PRISM2_PARAM_SCAN_CHANNEL_MASK = 40,
 };
 
 enum { HOSTAP_ANTSEL_DO_NOT_TOUCH = 0, HOSTAP_ANTSEL_DIVERSITY = 1,

diff --git a/drivers/net/wireless/hostap/hostap_hw.c b/drivers/net/wireless/hostap/hostap_hw.c
index 7572050db32da0970122733036b6d70b88fdbcd2..b4f7feb669efa0eac029d64382ae87dad7788fa3 100644 (file)
--- a/drivers/net/wireless/hostap/hostap_hw.c
+++ b/drivers/net/wireless/hostap/hostap_hw.c
@@ -3374,6 +3374,7 @@ prism2_init_local_data(struct prism2_helper_functions *funcs, int card_idx,
                                   * cnfDbmAdjust, if available */
        local->auth_algs = PRISM2_AUTH_OPEN | PRISM2_AUTH_SHARED_KEY;
        local->sram_type = -1;
+       local->scan_channel_mask = 0xffff;
 #if defined(PRISM2_PCI) && defined(PRISM2_BUS_MASTER)
        local->bus_master_threshold_rx = GET_INT_PARM(bus_master_threshold_rx,
                                                      card_idx);

diff --git a/drivers/net/wireless/hostap/hostap_ioctl.c b/drivers/net/wireless/hostap/hostap_ioctl.c
index e545ac9c1b1023921d1c80fd13025a4726fa1c96..4c236e7903f5f538565a7d407129fd870ed1fabc 100644 (file)
--- a/drivers/net/wireless/hostap/hostap_ioctl.c
+++ b/drivers/net/wireless/hostap/hostap_ioctl.c
@@ -1664,7 +1664,8 @@ static int prism2_request_hostscan(struct net_device *dev,
        local = iface->local;
 
        memset(&scan_req, 0, sizeof(scan_req));
-       scan_req.channel_list = __constant_cpu_to_le16(local->channel_mask);
+       scan_req.channel_list = cpu_to_le16(local->channel_mask &
+                                           local->scan_channel_mask);
        scan_req.txrate = __constant_cpu_to_le16(HFA384X_RATES_1MBPS);
        if (ssid) {
                if (ssid_len > 32)
@@ -1693,7 +1694,8 @@ static int prism2_request_scan(struct net_device *dev)
        local = iface->local;
 
        memset(&scan_req, 0, sizeof(scan_req));
-       scan_req.channel_list = __constant_cpu_to_le16(local->channel_mask);
+       scan_req.channel_list = cpu_to_le16(local->channel_mask &
+                                           local->scan_channel_mask);
        scan_req.txrate = __constant_cpu_to_le16(HFA384X_RATES_1MBPS);
 
        /* FIX:
@@ -2338,6 +2340,10 @@ static const struct iw_priv_args prism2_priv[] = {
          IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "drop_unencrypte" },
        { PRISM2_PARAM_DROP_UNENCRYPTED,
          0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "getdrop_unencry" },
+       { PRISM2_PARAM_SCAN_CHANNEL_MASK,
+         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "scan_channels" },
+       { PRISM2_PARAM_SCAN_CHANNEL_MASK,
+         0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "getscan_channel" },
 };
 
 
@@ -2699,6 +2705,10 @@ static int prism2_ioctl_priv_prism2_param(struct net_device *dev,
                local->drop_unencrypted = value;
                break;
 
+       case PRISM2_PARAM_SCAN_CHANNEL_MASK:
+               local->scan_channel_mask = value;
+               break;
+
        default:
                printk(KERN_DEBUG "%s: prism2_param: unknown param %d\n",
                       dev->name, param);
@@ -2890,6 +2900,10 @@ static int prism2_ioctl_priv_get_prism2_param(struct net_device *dev,
                *param = local->drop_unencrypted;
                break;
 
+       case PRISM2_PARAM_SCAN_CHANNEL_MASK:
+               *param = local->scan_channel_mask;
+               break;
+
        default:
                printk(KERN_DEBUG "%s: get_prism2_param: unknown param %d\n",
                       dev->name, *param);

diff --git a/drivers/net/wireless/hostap/hostap_wlan.h b/drivers/net/wireless/hostap/hostap_wlan.h
index 4b32e2e887ba638ec3382a27e4f402bf45a9dd63..91beee50c9c914fb7b8a692bf5ee0e9cbf57415e 100644 (file)
--- a/drivers/net/wireless/hostap/hostap_wlan.h
+++ b/drivers/net/wireless/hostap/hostap_wlan.h
@@ -680,7 +680,8 @@ struct local_info {
        char essid[MAX_SSID_LEN + 1];
        char name[MAX_NAME_LEN + 1];
        int name_set;
-       u16 channel_mask;
+       u16 channel_mask; /* mask of allowed channels */
+       u16 scan_channel_mask; /* mask of channels to be scanned */
        struct comm_tallies_sums comm_tallies;
        struct net_device_stats stats;
        struct proc_dir_entry *proc;