mirror of
https://github.com/torvalds/linux.git
synced 2026-06-11 08:03:05 +02:00
Merge remote branch 'tegra/android-tegra-2.6.36' into android-tegra-moto-2.6.36
This commit is contained in:
Rebecca Schultz Zavin
commit
e25518e592
|
|
@ -7,7 +7,7 @@ DHDCFLAGS = -DLINUX -DBCMDRIVER -DBCMDONGLEHOST -DDHDTHREAD -DBCMWPA2 \
|
|||
-DDHD_USE_STATIC_BUF -DMMC_SDIO_ABORT -DDHD_DEBUG_TRAP -DSOFTAP \
|
||||
-DEMBEDDED_PLATFORM -DARP_OFFLOAD_SUPPORT -DPKT_FILTER_SUPPORT \
|
||||
-DGET_CUSTOM_MAC_ENABLE -DSET_RANDOM_MAC_SOFTAP -DCSCAN -DHW_OOB \
|
||||
-DKEEP_ALIVE \
|
||||
-DKEEP_ALIVE -DPNO_SUPPORT \
|
||||
-Idrivers/net/wireless/bcm4329 -Idrivers/net/wireless/bcm4329/include
|
||||
|
||||
DHDOFILES = dhd_linux.o linux_osl.o bcmutils.o dhd_common.o dhd_custom_gpio.o \
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
* software in any way with any other Broadcom software provided under a license
|
||||
* other than the GPL, without Broadcom's express prior written consent.
|
||||
*
|
||||
* $Id: dhd.h,v 1.32.4.7.2.4.14.49.4.7 2010/11/12 22:48:36 Exp $
|
||||
* $Id: dhd.h,v 1.32.4.7.2.4.14.49.4.9 2011/01/14 22:40:45 Exp $
|
||||
*/
|
||||
|
||||
/****************
|
||||
|
|
@ -164,7 +164,7 @@ typedef struct dhd_pub {
|
|||
char * pktfilter[100];
|
||||
int pktfilter_count;
|
||||
|
||||
uint8 country_code[WLC_CNTRY_BUF_SZ];
|
||||
wl_country_t dhd_cspec; /* Current Locale info */
|
||||
char eventmask[WL_EVENTING_MASK_LEN];
|
||||
|
||||
} dhd_pub_t;
|
||||
|
|
@ -214,6 +214,20 @@ typedef struct dhd_pub {
|
|||
|
||||
#define DHD_IF_VIF 0x01 /* Virtual IF (Hidden from user) */
|
||||
|
||||
inline static void NETIF_ADDR_LOCK(struct net_device *dev)
|
||||
{
|
||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29))
|
||||
netif_addr_lock_bh(dev);
|
||||
#endif
|
||||
}
|
||||
|
||||
inline static void NETIF_ADDR_UNLOCK(struct net_device *dev)
|
||||
{
|
||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29))
|
||||
netif_addr_unlock_bh(dev);
|
||||
#endif
|
||||
}
|
||||
|
||||
/* Wakelock Functions */
|
||||
extern int dhd_os_wake_lock(dhd_pub_t *pub);
|
||||
extern int dhd_os_wake_unlock(dhd_pub_t *pub);
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
* software in any way with any other Broadcom software provided under a license
|
||||
* other than the GPL, without Broadcom's express prior written consent.
|
||||
*
|
||||
* $Id: dhd_common.c,v 1.5.6.8.2.6.6.69.4.20 2010/12/20 23:37:28 Exp $
|
||||
* $Id: dhd_common.c,v 1.5.6.8.2.6.6.69.4.25 2011/02/11 21:16:02 Exp $
|
||||
*/
|
||||
#include <typedefs.h>
|
||||
#include <osl.h>
|
||||
|
|
@ -1287,9 +1287,10 @@ dhd_preinit_ioctls(dhd_pub_t *dhd)
|
|||
#endif /* SET_RANDOM_MAC_SOFTAP */
|
||||
|
||||
/* Set Country code */
|
||||
if (dhd->country_code[0] != 0) {
|
||||
if (dhdcdc_set_ioctl(dhd, 0, WLC_SET_COUNTRY,
|
||||
dhd->country_code, sizeof(dhd->country_code)) < 0) {
|
||||
if (dhd->dhd_cspec.ccode[0] != 0) {
|
||||
bcm_mkiovar("country", (char *)&dhd->dhd_cspec, \
|
||||
sizeof(wl_country_t), iovbuf, sizeof(iovbuf));
|
||||
if ((ret = dhdcdc_set_ioctl(dhd, 0, WLC_SET_VAR, iovbuf, sizeof(iovbuf))) < 0) {
|
||||
DHD_ERROR(("%s: country code setting failed\n", __FUNCTION__));
|
||||
}
|
||||
}
|
||||
|
|
@ -1896,6 +1897,7 @@ int dhd_pno_clean(dhd_pub_t *dhd)
|
|||
int dhd_pno_enable(dhd_pub_t *dhd, int pfn_enabled)
|
||||
{
|
||||
char iovbuf[128];
|
||||
uint8 bssid[6];
|
||||
int ret = -1;
|
||||
|
||||
if ((!dhd) && ((pfn_enabled != 0) || (pfn_enabled != 1))) {
|
||||
|
|
@ -1903,6 +1905,20 @@ int dhd_pno_enable(dhd_pub_t *dhd, int pfn_enabled)
|
|||
return ret;
|
||||
}
|
||||
|
||||
memset(iovbuf, 0, sizeof(iovbuf));
|
||||
|
||||
/* Check if disassoc to enable pno */
|
||||
if ((pfn_enabled) && \
|
||||
((ret = dhdcdc_set_ioctl(dhd, 0, WLC_GET_BSSID, \
|
||||
(char *)&bssid, ETHER_ADDR_LEN)) == BCME_NOTASSOCIATED)) {
|
||||
DHD_TRACE(("%s pno enable called in disassoc mode\n", __FUNCTION__));
|
||||
}
|
||||
else {
|
||||
DHD_ERROR(("%s pno enable called in assoc mode ret=%d\n", \
|
||||
__FUNCTION__, ret));
|
||||
return ret;
|
||||
}
|
||||
|
||||
/* Enable/disable PNO */
|
||||
if ((ret = bcm_mkiovar("pfn", (char *)&pfn_enabled, 4, iovbuf, sizeof(iovbuf))) > 0) {
|
||||
if ((ret = dhdcdc_set_ioctl(dhd, 0, WLC_SET_VAR, iovbuf, sizeof(iovbuf))) < 0) {
|
||||
|
|
@ -1921,7 +1937,8 @@ int dhd_pno_enable(dhd_pub_t *dhd, int pfn_enabled)
|
|||
|
||||
/* Function to execute combined scan */
|
||||
int
|
||||
dhd_pno_set(dhd_pub_t *dhd, wlc_ssid_t* ssids_local, int nssid, ushort scan_fr)
|
||||
dhd_pno_set(dhd_pub_t *dhd, wlc_ssid_t* ssids_local, int nssid, ushort scan_fr, \
|
||||
int pno_repeat, int pno_freq_expo_max)
|
||||
{
|
||||
int err = -1;
|
||||
char iovbuf[128];
|
||||
|
|
@ -1966,12 +1983,23 @@ dhd_pno_set(dhd_pub_t *dhd, wlc_ssid_t* ssids_local, int nssid, ushort scan_fr)
|
|||
pfn_param.version = htod32(PFN_VERSION);
|
||||
pfn_param.flags = htod16((PFN_LIST_ORDER << SORT_CRITERIA_BIT));
|
||||
|
||||
/* check and set extra pno params */
|
||||
if ((pno_repeat != 0) || (pno_freq_expo_max != 0)) {
|
||||
pfn_param.flags |= htod16(ENABLE << ENABLE_ADAPTSCAN_BIT);
|
||||
pfn_param.repeat_scan = htod32(pno_repeat);
|
||||
pfn_param.max_freq_adjust = htod32(pno_freq_expo_max);
|
||||
}
|
||||
|
||||
/* set up pno scan fr */
|
||||
if (scan_fr != 0)
|
||||
pfn_param.scan_freq = htod32(scan_fr);
|
||||
|
||||
if (pfn_param.scan_freq > PNO_SCAN_MAX_FW) {
|
||||
DHD_ERROR(("%s pno freq above %d sec\n", __FUNCTION__, PNO_SCAN_MAX_FW));
|
||||
if (pfn_param.scan_freq > PNO_SCAN_MAX_FW_SEC) {
|
||||
DHD_ERROR(("%s pno freq above %d sec\n", __FUNCTION__, PNO_SCAN_MAX_FW_SEC));
|
||||
return err;
|
||||
}
|
||||
if (pfn_param.scan_freq < PNO_SCAN_MIN_FW_SEC) {
|
||||
DHD_ERROR(("%s pno freq less %d sec\n", __FUNCTION__, PNO_SCAN_MIN_FW_SEC));
|
||||
return err;
|
||||
}
|
||||
|
||||
|
|
@ -1983,8 +2011,6 @@ dhd_pno_set(dhd_pub_t *dhd, wlc_ssid_t* ssids_local, int nssid, ushort scan_fr)
|
|||
|
||||
pfn_element.bss_type = htod32(DOT11_BSSTYPE_INFRASTRUCTURE);
|
||||
pfn_element.auth = (DOT11_OPEN_SYSTEM);
|
||||
pfn_element.wpa_auth = htod32(WPA_AUTH_PFN_ANY);
|
||||
pfn_element.wsec = htod32(0);
|
||||
pfn_element.infra = htod32(1);
|
||||
|
||||
memcpy((char *)pfn_element.ssid.SSID, ssids_local[i].SSID, ssids_local[i].SSID_len);
|
||||
|
|
@ -2000,8 +2026,9 @@ dhd_pno_set(dhd_pub_t *dhd, wlc_ssid_t* ssids_local, int nssid, ushort scan_fr)
|
|||
return err;
|
||||
}
|
||||
else
|
||||
DHD_ERROR(("%s set OK with PNO time=%d\n", __FUNCTION__, \
|
||||
pfn_param.scan_freq));
|
||||
DHD_ERROR(("%s set OK with PNO time=%d repeat=%d max_adjust=%d\n", \
|
||||
__FUNCTION__, pfn_param.scan_freq, \
|
||||
pfn_param.repeat_scan, pfn_param.max_freq_adjust));
|
||||
}
|
||||
else DHD_ERROR(("%s failed err=%d\n", __FUNCTION__, err));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
* software in any way with any other Broadcom software provided under a license
|
||||
* other than the GPL, without Broadcom's express prior written consent.
|
||||
*
|
||||
* $Id: dhd_custom_gpio.c,v 1.1.4.8.4.1 2010/09/02 23:13:16 Exp $
|
||||
* $Id: dhd_custom_gpio.c,v 1.1.4.8.4.4 2011/01/20 20:23:09 Exp $
|
||||
*/
|
||||
|
||||
|
||||
|
|
@ -177,3 +177,50 @@ dhd_custom_get_mac_address(unsigned char *buf)
|
|||
return ret;
|
||||
}
|
||||
#endif /* GET_CUSTOM_MAC_ENABLE */
|
||||
|
||||
#define EXAMPLE_TABLE
|
||||
/* Customized Locale table : OPTIONAL feature */
|
||||
const struct cntry_locales_custom translate_custom_table[] = {
|
||||
/* Table should be filled out based on custom platform regulatory requirement */
|
||||
#ifdef EXAMPLE_TABLE
|
||||
{"US", "US", 69}, /* input ISO "US" to : US regrev 69 */
|
||||
{"CA", "US", 69}, /* input ISO "CA" to : US regrev 69 */
|
||||
{"EU", "EU", 05}, /* input ISO "EU" to : EU regrev 05 */
|
||||
{"FR", "EU", 05},
|
||||
{"DE", "EU", 05},
|
||||
{"IR", "EU", 05},
|
||||
{"UK", "EU", 05}, /* input ISO "UK" to : EU regrev 05 */
|
||||
{"KR", "XY", 03},
|
||||
{"AU", "XY", 03},
|
||||
{"CN", "XY", 03}, /* input ISO "CN" to : XY regrev 03 */
|
||||
{"TW", "XY", 03},
|
||||
{"AR", "XY", 03}
|
||||
#endif /* EXAMPLE_TABLE */
|
||||
};
|
||||
|
||||
|
||||
/* Customized Locale convertor
|
||||
* input : ISO 3166-1 country abbreviation
|
||||
* output: customized cspec
|
||||
*/
|
||||
void get_customized_country_code(char *country_iso_code, wl_country_t *cspec)
|
||||
{
|
||||
int size, i;
|
||||
|
||||
size = ARRAYSIZE(translate_custom_table);
|
||||
|
||||
if (cspec == 0)
|
||||
return;
|
||||
|
||||
if (size == 0)
|
||||
return;
|
||||
|
||||
for (i = 0; i < size; i++) {
|
||||
if (strcmp(country_iso_code, translate_custom_table[i].iso_abbrev) == 0) {
|
||||
memcpy(cspec->ccode, translate_custom_table[i].custom_locale, WLC_CNTRY_BUF_SZ);
|
||||
cspec->rev = translate_custom_table[i].custom_locale_rev;
|
||||
break;
|
||||
}
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
* software in any way with any other Broadcom software provided under a license
|
||||
* other than the GPL, without Broadcom's express prior written consent.
|
||||
*
|
||||
* $Id: dhd_linux.c,v 1.65.4.9.2.12.2.104.4.35 2010/11/17 03:13:21 Exp $
|
||||
* $Id: dhd_linux.c,v 1.65.4.9.2.12.2.104.4.40 2011/02/03 19:55:18 Exp $
|
||||
*/
|
||||
|
||||
#ifdef CONFIG_WIFI_CONTROL_FUNC
|
||||
|
|
@ -763,13 +763,13 @@ _dhd_set_multicast_list(dhd_info_t *dhd, int ifidx)
|
|||
ASSERT(dhd && dhd->iflist[ifidx]);
|
||||
dev = dhd->iflist[ifidx]->net;
|
||||
|
||||
netif_addr_lock_bh(dev);
|
||||
NETIF_ADDR_LOCK(dev);
|
||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)
|
||||
cnt = netdev_mc_count(dev);
|
||||
#else
|
||||
cnt = dev->mc_count;
|
||||
#endif
|
||||
netif_addr_unlock_bh(dev);
|
||||
NETIF_ADDR_UNLOCK(dev);
|
||||
|
||||
/* Determine initial value of allmulti flag */
|
||||
allmulti = (dev->flags & IFF_ALLMULTI) ? TRUE : FALSE;
|
||||
|
|
@ -789,7 +789,7 @@ _dhd_set_multicast_list(dhd_info_t *dhd, int ifidx)
|
|||
memcpy(bufp, &cnt, sizeof(cnt));
|
||||
bufp += sizeof(cnt);
|
||||
|
||||
netif_addr_lock_bh(dev);
|
||||
NETIF_ADDR_LOCK(dev);
|
||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)
|
||||
netdev_for_each_mc_addr(ha, dev) {
|
||||
if (!cnt)
|
||||
|
|
@ -799,12 +799,12 @@ _dhd_set_multicast_list(dhd_info_t *dhd, int ifidx)
|
|||
cnt--;
|
||||
}
|
||||
#else
|
||||
for (mclist = dev->mc_list;(mclist && (cnt > 0)); cnt--, mclist = mclist->next) {
|
||||
for (mclist = dev->mc_list; (mclist && (cnt > 0)); cnt--, mclist = mclist->next) {
|
||||
memcpy(bufp, (void *)mclist->dmi_addr, ETHER_ADDR_LEN);
|
||||
bufp += ETHER_ADDR_LEN;
|
||||
}
|
||||
#endif
|
||||
netif_addr_unlock_bh(dev);
|
||||
NETIF_ADDR_UNLOCK(dev);
|
||||
|
||||
memset(&ioc, 0, sizeof(ioc));
|
||||
ioc.cmd = WLC_SET_VAR;
|
||||
|
|
@ -3045,11 +3045,12 @@ dhd_dev_pno_enable(struct net_device *dev, int pfn_enabled)
|
|||
|
||||
/* Linux wrapper to call common dhd_pno_set */
|
||||
int
|
||||
dhd_dev_pno_set(struct net_device *dev, wlc_ssid_t* ssids_local, int nssid, ushort scan_fr)
|
||||
dhd_dev_pno_set(struct net_device *dev, wlc_ssid_t* ssids_local, int nssid,
|
||||
ushort scan_fr, int pno_repeat, int pno_freq_expo_max)
|
||||
{
|
||||
dhd_info_t *dhd = *(dhd_info_t **)netdev_priv(dev);
|
||||
|
||||
return (dhd_pno_set(&dhd->pub, ssids_local, nssid, scan_fr));
|
||||
return (dhd_pno_set(&dhd->pub, ssids_local, nssid, scan_fr, pno_repeat, pno_freq_expo_max));
|
||||
}
|
||||
|
||||
/* Linux wrapper to get pno status */
|
||||
|
|
@ -3077,20 +3078,20 @@ int net_os_send_hang_message(struct net_device *dev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
void dhd_bus_country_set(struct net_device *dev, char *country_code)
|
||||
void dhd_bus_country_set(struct net_device *dev, wl_country_t *cspec)
|
||||
{
|
||||
dhd_info_t *dhd = *(dhd_info_t **)netdev_priv(dev);
|
||||
|
||||
if (dhd && dhd->pub.up)
|
||||
strncpy(dhd->pub.country_code, country_code, WLC_CNTRY_BUF_SZ);
|
||||
memcpy(&dhd->pub.dhd_cspec, cspec, sizeof(wl_country_t));
|
||||
}
|
||||
|
||||
char *dhd_bus_country_get(struct net_device *dev)
|
||||
{
|
||||
dhd_info_t *dhd = *(dhd_info_t **)netdev_priv(dev);
|
||||
|
||||
if (dhd && (dhd->pub.country_code[0] != 0))
|
||||
return dhd->pub.country_code;
|
||||
if (dhd && (dhd->pub.dhd_cspec.ccode[0] != 0))
|
||||
return dhd->pub.dhd_cspec.ccode;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -33,16 +33,16 @@
|
|||
|
||||
#define EPI_RC_NUMBER 248
|
||||
|
||||
#define EPI_INCREMENTAL_NUMBER 20
|
||||
#define EPI_INCREMENTAL_NUMBER 23
|
||||
|
||||
#define EPI_BUILD_NUMBER 0
|
||||
|
||||
#define EPI_VERSION 4, 218, 248, 20
|
||||
#define EPI_VERSION 4, 218, 248, 23
|
||||
|
||||
#define EPI_VERSION_NUM 0x04daf814
|
||||
#define EPI_VERSION_NUM 0x04daf817
|
||||
|
||||
|
||||
#define EPI_VERSION_STR "4.218.248.20"
|
||||
#define EPI_ROUTER_VERSION_STR "4.219.248.20"
|
||||
#define EPI_VERSION_STR "4.218.248.23"
|
||||
#define EPI_ROUTER_VERSION_STR "4.219.248.23"
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
* software in any way with any other Broadcom software provided under a license
|
||||
* other than the GPL, without Broadcom's express prior written consent.
|
||||
*
|
||||
* $Id: wlioctl.h,v 1.601.4.15.2.14.2.62.4.1 2010/11/17 03:09:28 Exp $
|
||||
* $Id: wlioctl.h,v 1.601.4.15.2.14.2.62.4.3 2011/02/09 23:31:02 Exp $
|
||||
*/
|
||||
|
||||
|
||||
|
|
@ -254,6 +254,11 @@ typedef struct wl_join_params {
|
|||
|
||||
#define WLC_CNTRY_BUF_SZ 4
|
||||
|
||||
typedef struct wl_country {
|
||||
char country_abbrev[WLC_CNTRY_BUF_SZ];
|
||||
int32 rev;
|
||||
char ccode[WLC_CNTRY_BUF_SZ];
|
||||
} wl_country_t;
|
||||
|
||||
typedef enum sup_auth_status {
|
||||
|
||||
|
|
@ -1309,12 +1314,16 @@ enum {
|
|||
#define ENABLE_BKGRD_SCAN_BIT 2
|
||||
#define IMMEDIATE_SCAN_BIT 3
|
||||
#define AUTO_CONNECT_BIT 4
|
||||
#define ENABLE_BD_SCAN_BIT 5
|
||||
#define ENABLE_ADAPTSCAN_BIT 6
|
||||
|
||||
#define SORT_CRITERIA_MASK 0x01
|
||||
#define AUTO_NET_SWITCH_MASK 0x02
|
||||
#define ENABLE_BKGRD_SCAN_MASK 0x04
|
||||
#define IMMEDIATE_SCAN_MASK 0x08
|
||||
#define AUTO_CONNECT_MASK 0x10
|
||||
#define ENABLE_BD_SCAN_MASK 0x20
|
||||
#define ENABLE_ADAPTSCAN_MASK 0x40
|
||||
|
||||
#define PFN_VERSION 1
|
||||
|
||||
|
|
@ -1327,6 +1336,8 @@ typedef struct wl_pfn_param {
|
|||
int32 lost_network_timeout;
|
||||
int16 flags;
|
||||
int16 rssi_margin;
|
||||
int32 repeat_scan;
|
||||
int32 max_freq_adjust;
|
||||
} wl_pfn_param_t;
|
||||
|
||||
typedef struct wl_pfn {
|
||||
|
|
@ -1336,14 +1347,12 @@ typedef struct wl_pfn {
|
|||
int32 auth;
|
||||
uint32 wpa_auth;
|
||||
int32 wsec;
|
||||
#ifdef WLPFN_AUTO_CONNECT
|
||||
union {
|
||||
wl_wsec_key_t sec_key;
|
||||
wsec_pmk_t wpa_sec_key;
|
||||
} pfn_security;
|
||||
#endif
|
||||
} wl_pfn_t;
|
||||
|
||||
#define PNO_SCAN_MAX_FW 508*1000
|
||||
#define PNO_SCAN_MAX_FW_SEC PNO_SCAN_MAX_FW/1000
|
||||
#define PNO_SCAN_MIN_FW_SEC 10
|
||||
|
||||
|
||||
#define TOE_TX_CSUM_OL 0x00000001
|
||||
#define TOE_RX_CSUM_OL 0x00000002
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
* software in any way with any other Broadcom software provided under a license
|
||||
* other than the GPL, without Broadcom's express prior written consent.
|
||||
*
|
||||
* $Id: wl_iw.c,v 1.51.4.9.2.6.4.142.4.69 2010/12/21 03:00:08 Exp $
|
||||
* $Id: wl_iw.c,v 1.51.4.9.2.6.4.142.4.78 2011/02/11 21:27:52 Exp $
|
||||
*/
|
||||
|
||||
|
||||
|
|
@ -54,6 +54,7 @@ typedef const struct si_pub si_t;
|
|||
#define WL_INFORM(x)
|
||||
#define WL_WSEC(x)
|
||||
#define WL_SCAN(x)
|
||||
#define WL_PNO(x)
|
||||
#define WL_TRACE_COEX(x)
|
||||
|
||||
#include <wl_iw.h>
|
||||
|
|
@ -115,10 +116,6 @@ static int g_onoff = G_WLAN_SET_ON;
|
|||
wl_iw_extra_params_t g_wl_iw_params;
|
||||
static struct mutex wl_cache_lock;
|
||||
|
||||
#ifdef CONFIG_US_NON_DFS_CHANNELS_ONLY
|
||||
static bool use_non_dfs_channels = true;
|
||||
#endif
|
||||
|
||||
extern bool wl_iw_conn_status_str(uint32 event_type, uint32 status,
|
||||
uint32 reason, char* stringBuf, uint buflen);
|
||||
#include <bcmsdbus.h>
|
||||
|
|
@ -161,12 +158,13 @@ extern int dhd_wait_pend8021x(struct net_device *dev);
|
|||
#endif
|
||||
|
||||
static void *g_scan = NULL;
|
||||
static volatile uint g_scan_specified_ssid;
|
||||
static wlc_ssid_t g_specific_ssid;
|
||||
static volatile uint g_scan_specified_ssid;
|
||||
static wlc_ssid_t g_specific_ssid;
|
||||
|
||||
static wlc_ssid_t g_ssid;
|
||||
|
||||
static wl_iw_ss_cache_ctrl_t g_ss_cache_ctrl;
|
||||
bool btcoex_is_sco_active(struct net_device *dev);
|
||||
static wl_iw_ss_cache_ctrl_t g_ss_cache_ctrl;
|
||||
#if defined(CONFIG_FIRST_SCAN)
|
||||
static volatile uint g_first_broadcast_scan;
|
||||
static volatile uint g_first_counter_scans;
|
||||
|
|
@ -594,6 +592,36 @@ wl_iw_set_passive_scan(
|
|||
return error;
|
||||
}
|
||||
|
||||
|
||||
static int
|
||||
wl_iw_set_txpower(
|
||||
struct net_device *dev,
|
||||
struct iw_request_info *info,
|
||||
union iwreq_data *wrqu,
|
||||
char *extra
|
||||
)
|
||||
{
|
||||
int error = 0;
|
||||
char *p = extra;
|
||||
int txpower = -1;
|
||||
|
||||
txpower = bcm_atoi(extra + strlen(TXPOWER_SET_CMD) + 1);
|
||||
if ((txpower >= 0) && (txpower <= 127)) {
|
||||
txpower |= WL_TXPWR_OVERRIDE;
|
||||
txpower = htod32(txpower);
|
||||
|
||||
error = dev_wlc_intvar_set(dev, "qtxpower", txpower);
|
||||
p += snprintf(p, MAX_WX_STRING, "OK");
|
||||
WL_TRACE(("%s: set TXpower 0x%X is OK\n", __FUNCTION__, txpower));
|
||||
} else {
|
||||
WL_ERROR(("%s: set tx power failed\n", __FUNCTION__));
|
||||
p += snprintf(p, MAX_WX_STRING, "FAIL");
|
||||
}
|
||||
|
||||
wrqu->data.length = p - extra + 1;
|
||||
return error;
|
||||
}
|
||||
|
||||
static int
|
||||
wl_iw_get_macaddr(
|
||||
struct net_device *dev,
|
||||
|
|
@ -619,31 +647,6 @@ wl_iw_get_macaddr(
|
|||
return error;
|
||||
}
|
||||
|
||||
static int
|
||||
wl_iw_set_country_code(struct net_device *dev, char *ccode)
|
||||
{
|
||||
char country_code[WLC_CNTRY_BUF_SZ];
|
||||
int ret = -1;
|
||||
|
||||
WL_TRACE(("%s\n", __FUNCTION__));
|
||||
if (!ccode)
|
||||
ccode = dhd_bus_country_get(dev);
|
||||
strncpy(country_code, ccode, sizeof(country_code));
|
||||
if (ccode && (country_code[0] != 0)) {
|
||||
#ifdef CONFIG_US_NON_DFS_CHANNELS_ONLY
|
||||
if (use_non_dfs_channels && !strncmp(country_code, "US", 2))
|
||||
strncpy(country_code, "Q2", WLC_CNTRY_BUF_SZ);
|
||||
if (!use_non_dfs_channels && !strncmp(country_code, "Q2", 2))
|
||||
strncpy(country_code, "US", WLC_CNTRY_BUF_SZ);
|
||||
#endif
|
||||
ret = dev_wlc_ioctl(dev, WLC_SET_COUNTRY, &country_code, sizeof(country_code));
|
||||
if (ret >= 0) {
|
||||
WL_TRACE(("%s: set country %s OK\n", __FUNCTION__, country_code));
|
||||
dhd_bus_country_set(dev, &country_code[0]);
|
||||
}
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int
|
||||
wl_iw_set_country(
|
||||
|
|
@ -658,25 +661,39 @@ wl_iw_set_country(
|
|||
char *p = extra;
|
||||
int country_offset;
|
||||
int country_code_size;
|
||||
wl_country_t cspec = {{0}, 0, {0}};
|
||||
char smbuf[WLC_IOCTL_SMLEN];
|
||||
|
||||
WL_TRACE(("%s\n", __FUNCTION__));
|
||||
cspec.rev = -1;
|
||||
memset(country_code, 0, sizeof(country_code));
|
||||
memset(smbuf, 0, sizeof(smbuf));
|
||||
|
||||
country_offset = strcspn(extra, " ");
|
||||
country_code_size = strlen(extra) - country_offset;
|
||||
|
||||
if (country_offset != 0) {
|
||||
strncpy(country_code, extra + country_offset + 1,
|
||||
strncpy(country_code, extra + country_offset +1,
|
||||
MIN(country_code_size, sizeof(country_code)));
|
||||
error = wl_iw_set_country_code(dev, country_code);
|
||||
if (error >= 0) {
|
||||
|
||||
|
||||
memcpy(cspec.country_abbrev, country_code, WLC_CNTRY_BUF_SZ);
|
||||
memcpy(cspec.ccode, country_code, WLC_CNTRY_BUF_SZ);
|
||||
|
||||
get_customized_country_code((char *)&cspec.country_abbrev, &cspec);
|
||||
|
||||
if ((error = dev_iw_iovar_setbuf(dev, "country", &cspec, \
|
||||
sizeof(cspec), smbuf, sizeof(smbuf))) >= 0) {
|
||||
p += snprintf(p, MAX_WX_STRING, "OK");
|
||||
WL_TRACE(("%s: set country %s OK\n", __FUNCTION__, country_code));
|
||||
WL_ERROR(("%s: set country for %s as %s rev %d is OK\n", \
|
||||
__FUNCTION__, country_code, cspec.ccode, cspec.rev));
|
||||
dhd_bus_country_set(dev, &cspec);
|
||||
goto exit;
|
||||
}
|
||||
}
|
||||
|
||||
WL_ERROR(("%s: set country %s failed code %d\n", __FUNCTION__, country_code, error));
|
||||
WL_ERROR(("%s: set country for %s as %s rev %d failed\n", \
|
||||
__FUNCTION__, country_code, cspec.ccode, cspec.rev));
|
||||
|
||||
p += snprintf(p, MAX_WX_STRING, "FAIL");
|
||||
|
||||
exit:
|
||||
|
|
@ -738,26 +755,40 @@ wl_iw_set_power_mode(
|
|||
#endif
|
||||
|
||||
|
||||
static bool btcoex_is_sco_active(struct net_device *dev)
|
||||
bool btcoex_is_sco_active(struct net_device *dev)
|
||||
{
|
||||
int ioc_res = 0;
|
||||
bool res = false;
|
||||
int temp = 0;
|
||||
int sco_id_cnt = 0;
|
||||
int param27;
|
||||
int i;
|
||||
|
||||
ioc_res = dev_wlc_intvar_get_reg(dev, "btc_params", 4, &temp);
|
||||
for (i = 0; i < 12; i++) {
|
||||
|
||||
if (ioc_res == 0) {
|
||||
WL_TRACE_COEX(("%s: read btc_params[4] = %x\n", __FUNCTION__, temp));
|
||||
ioc_res = dev_wlc_intvar_get_reg(dev, "btc_params", 27, ¶m27);
|
||||
|
||||
if ((temp > 0xea0) && (temp < 0xed8)) {
|
||||
WL_TRACE_COEX(("%s: BT SCO/eSCO is ACTIVE\n", __FUNCTION__));
|
||||
res = true;
|
||||
} else {
|
||||
WL_TRACE_COEX(("%s: BT SCO/eSCO is NOT detected\n", __FUNCTION__));
|
||||
WL_TRACE_COEX(("%s, sample[%d], btc params: 27:%x\n",
|
||||
__FUNCTION__, i, param27));
|
||||
|
||||
if (ioc_res < 0) {
|
||||
WL_ERROR(("%s ioc read btc params error\n", __FUNCTION__));
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
WL_ERROR(("%s ioc read btc params error\n", __FUNCTION__));
|
||||
|
||||
if ((param27 & 0x6) == 2) {
|
||||
sco_id_cnt++;
|
||||
}
|
||||
|
||||
if (sco_id_cnt > 2) {
|
||||
WL_TRACE_COEX(("%s, sco/esco detected, pkt id_cnt:%d samples:%d\n",
|
||||
__FUNCTION__, sco_id_cnt, i));
|
||||
res = true;
|
||||
break;
|
||||
}
|
||||
|
||||
msleep(5);
|
||||
}
|
||||
|
||||
return res;
|
||||
}
|
||||
|
||||
|
|
@ -1043,21 +1074,6 @@ wl_iw_set_suspend(
|
|||
return ret;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_US_NON_DFS_CHANNELS_ONLY
|
||||
static int
|
||||
wl_iw_set_dfs_channels(
|
||||
struct net_device *dev,
|
||||
struct iw_request_info *info,
|
||||
union iwreq_data *wrqu,
|
||||
char *extra
|
||||
)
|
||||
{
|
||||
use_non_dfs_channels = *(extra + strlen(SETDFSCHANNELS_CMD) + 1) - '0';
|
||||
use_non_dfs_channels = (use_non_dfs_channels != 0) ? false : true;
|
||||
wl_iw_set_country_code(dev, NULL);
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
int
|
||||
wl_format_ssid(char* ssid_buf, uint8* ssid, int ssid_len)
|
||||
|
|
@ -1343,9 +1359,10 @@ wl_iw_set_pno_set(
|
|||
int nssid = 0;
|
||||
cmd_tlv_t *cmd_tlv_temp;
|
||||
char *str_ptr;
|
||||
char *str_ptr_end;
|
||||
int tlv_size_left;
|
||||
int pno_time;
|
||||
int pno_repeat;
|
||||
int pno_freq_expo_max;
|
||||
|
||||
#ifdef PNO_SET_DEBUG
|
||||
int i;
|
||||
|
|
@ -1359,6 +1376,10 @@ wl_iw_set_pno_set(
|
|||
'G', 'O', 'O', 'G',
|
||||
'T',
|
||||
'1','E',
|
||||
'R',
|
||||
'2',
|
||||
'M',
|
||||
'2',
|
||||
0x00
|
||||
};
|
||||
#endif
|
||||
|
|
@ -1402,6 +1423,7 @@ wl_iw_set_pno_set(
|
|||
|
||||
cmd_tlv_temp = (cmd_tlv_t *)str_ptr;
|
||||
memset(ssids_local, 0, sizeof(ssids_local));
|
||||
pno_repeat = pno_freq_expo_max = 0;
|
||||
|
||||
if ((cmd_tlv_temp->prefix == PNO_TLV_PREFIX) && \
|
||||
(cmd_tlv_temp->version == PNO_TLV_VERSION) && \
|
||||
|
|
@ -1422,9 +1444,28 @@ wl_iw_set_pno_set(
|
|||
goto exit_proc;
|
||||
}
|
||||
str_ptr++;
|
||||
pno_time = simple_strtoul(str_ptr, &str_ptr_end, 16);
|
||||
WL_ERROR((" got %d bytes left pno_time %d or %#x\n", \
|
||||
tlv_size_left, pno_time, pno_time));
|
||||
pno_time = simple_strtoul(str_ptr, &str_ptr, 16);
|
||||
WL_PNO(("%s: pno_time=%d\n", __FUNCTION__, pno_time));
|
||||
|
||||
if (str_ptr[0] != 0) {
|
||||
if ((str_ptr[0] != PNO_TLV_FREQ_REPEAT)) {
|
||||
WL_ERROR(("%s pno repeat : corrupted field\n", \
|
||||
__FUNCTION__));
|
||||
goto exit_proc;
|
||||
}
|
||||
str_ptr++;
|
||||
pno_repeat = simple_strtoul(str_ptr, &str_ptr, 16);
|
||||
WL_PNO(("%s :got pno_repeat=%d\n", __FUNCTION__, pno_repeat));
|
||||
if (str_ptr[0] != PNO_TLV_FREQ_EXPO_MAX) {
|
||||
WL_ERROR(("%s FREQ_EXPO_MAX corrupted field size\n", \
|
||||
__FUNCTION__));
|
||||
goto exit_proc;
|
||||
}
|
||||
str_ptr++;
|
||||
pno_freq_expo_max = simple_strtoul(str_ptr, &str_ptr, 16);
|
||||
WL_PNO(("%s: pno_freq_expo_max=%d\n", \
|
||||
__FUNCTION__, pno_freq_expo_max));
|
||||
}
|
||||
}
|
||||
}
|
||||
else {
|
||||
|
|
@ -1432,7 +1473,7 @@ wl_iw_set_pno_set(
|
|||
goto exit_proc;
|
||||
}
|
||||
|
||||
res = dhd_dev_pno_set(dev, ssids_local, nssid, pno_time);
|
||||
res = dhd_dev_pno_set(dev, ssids_local, nssid, pno_time, pno_repeat, pno_freq_expo_max);
|
||||
|
||||
exit_proc:
|
||||
net_os_wake_unlock(dev);
|
||||
|
|
@ -1719,6 +1760,79 @@ int hstr_2_buf(const char *txt, u8 *buf, int len)
|
|||
return 0;
|
||||
}
|
||||
|
||||
#if defined(SOFTAP) && defined(SOFTAP_TLV_CFG)
|
||||
|
||||
static int wl_iw_softap_cfg_tlv(
|
||||
struct net_device *dev,
|
||||
struct iw_request_info *info,
|
||||
union iwreq_data *wrqu,
|
||||
char *extra
|
||||
)
|
||||
{
|
||||
int res = -1;
|
||||
char *str_ptr;
|
||||
int tlv_size_left;
|
||||
|
||||
|
||||
#define SOFTAP_TLV_DEBUG 1
|
||||
#ifdef SOFTAP_TLV_DEBUG
|
||||
char softap_cmd_example[] = {
|
||||
|
||||
'S', 'O', 'F', 'T', 'A', 'P', 'S', 'E', 'T', ' ',
|
||||
|
||||
SOFTAP_TLV_PREFIX, SOFTAP_TLV_VERSION,
|
||||
SOFTAP_TLV_SUBVERSION, SOFTAP_TLV_RESERVED,
|
||||
|
||||
TLV_TYPE_SSID, 9, 'B', 'R', 'C', 'M', ',', 'G', 'O', 'O', 'G',
|
||||
|
||||
TLV_TYPE_SECUR, 4, 'O', 'P', 'E', 'N',
|
||||
|
||||
TLV_TYPE_KEY, 4, 0x31, 0x32, 0x33, 0x34,
|
||||
|
||||
TLV_TYPE_CHANNEL, 4, 0x06, 0x00, 0x00, 0x00
|
||||
};
|
||||
#endif
|
||||
|
||||
|
||||
#ifdef SOFTAP_TLV_DEBUG
|
||||
{
|
||||
int i;
|
||||
if (!(extra = kmalloc(sizeof(softap_cmd_example) +10, GFP_KERNEL)))
|
||||
return -ENOMEM;
|
||||
memcpy(extra, softap_cmd_example, sizeof(softap_cmd_example));
|
||||
wrqu->data.length = sizeof(softap_cmd_example);
|
||||
print_buf(extra, wrqu->data.length, 16);
|
||||
for (i = 0; i < wrqu->data.length; i++)
|
||||
printf("%c ", extra[i]);
|
||||
printf("\n");
|
||||
}
|
||||
#endif
|
||||
|
||||
WL_ERROR(("\n### %s: info->cmd:%x, info->flags:%x, u.data=0x%p, u.len=%d\n",
|
||||
__FUNCTION__, info->cmd, info->flags,
|
||||
wrqu->data.pointer, wrqu->data.length));
|
||||
|
||||
if (g_onoff == G_WLAN_SET_OFF) {
|
||||
WL_TRACE(("%s: driver is not up yet after START\n", __FUNCTION__));
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (wrqu->data.length < (strlen(SOFTAP_SET_CMD) + sizeof(cmd_tlv_t))) {
|
||||
WL_ERROR(("%s argument=%d less %d\n", __FUNCTION__,
|
||||
wrqu->data.length, strlen(SOFTAP_SET_CMD) + sizeof(cmd_tlv_t)));
|
||||
return -1;
|
||||
}
|
||||
|
||||
str_ptr = extra + strlen(SOFTAP_SET_CMD)+1;
|
||||
tlv_size_left = wrqu->data.length - (strlen(SOFTAP_SET_CMD)+1);
|
||||
|
||||
memset(&my_ap, 0, sizeof(my_ap));
|
||||
|
||||
return res;
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
#ifdef SOFTAP
|
||||
int init_ap_profile_from_string(char *param_str, struct ap_profile *ap_cfg)
|
||||
{
|
||||
|
|
@ -5728,7 +5842,7 @@ wl_iw_combined_scan_set(struct net_device *dev, wlc_ssid_t* ssids_local, int nss
|
|||
WL_SCAN(("scan_type=%d\n", iscan->iscan_ex_params_p->params.scan_type));
|
||||
WL_SCAN(("\n###################\n"));
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
|
||||
if (params_size > WLC_IOCTL_MEDLEN) {
|
||||
WL_ERROR(("Set ISCAN for %s due to params_size=%d \n", \
|
||||
|
|
@ -5768,6 +5882,11 @@ static int iwpriv_set_cscan(struct net_device *dev, struct iw_request_info *info
|
|||
return -1;
|
||||
}
|
||||
|
||||
#ifdef PNO_SET_DEBUG
|
||||
wl_iw_set_pno_set(dev, info, wrqu, extra);
|
||||
return 0;
|
||||
#endif
|
||||
|
||||
if (wrqu->data.length != 0) {
|
||||
|
||||
char *str_ptr;
|
||||
|
|
@ -6295,16 +6414,8 @@ static int set_ap_cfg(struct net_device *dev, struct ap_profile *ap)
|
|||
}
|
||||
|
||||
if (strlen(ap->country_code)) {
|
||||
int error = 0;
|
||||
if ((error = dev_wlc_ioctl(dev, WLC_SET_COUNTRY,
|
||||
ap->country_code, sizeof(ap->country_code))) >= 0) {
|
||||
WL_SOFTAP(("%s: set country %s OK\n",
|
||||
__FUNCTION__, ap->country_code));
|
||||
dhd_bus_country_set(dev, &ap->country_code[0]);
|
||||
} else {
|
||||
WL_ERROR(("%s: ERROR:%d setting country %s\n",
|
||||
__FUNCTION__, error, ap->country_code));
|
||||
}
|
||||
WL_ERROR(("%s: Igonored: Country MUST be specified \
|
||||
COUNTRY command with \n", __FUNCTION__));
|
||||
} else {
|
||||
WL_SOFTAP(("%s: Country code is not specified,"
|
||||
" will use Radio's default\n",
|
||||
|
|
@ -7114,10 +7225,8 @@ static int wl_iw_set_priv(
|
|||
ret = wl_iw_set_dtim_skip(dev, info, (union iwreq_data *)dwrq, extra);
|
||||
else if (strnicmp(extra, SETSUSPEND_CMD, strlen(SETSUSPEND_CMD)) == 0)
|
||||
ret = wl_iw_set_suspend(dev, info, (union iwreq_data *)dwrq, extra);
|
||||
#ifdef CONFIG_US_NON_DFS_CHANNELS_ONLY
|
||||
else if (strnicmp(extra, SETDFSCHANNELS_CMD, strlen(SETDFSCHANNELS_CMD)) == 0)
|
||||
ret = wl_iw_set_dfs_channels(dev, info, (union iwreq_data *)dwrq, extra);
|
||||
#endif
|
||||
else if (strnicmp(extra, TXPOWER_SET_CMD, strlen(TXPOWER_SET_CMD)) == 0)
|
||||
ret = wl_iw_set_txpower(dev, info, (union iwreq_data *)dwrq, extra);
|
||||
#if defined(PNO_SUPPORT)
|
||||
else if (strnicmp(extra, PNOSSIDCLR_SET_CMD, strlen(PNOSSIDCLR_SET_CMD)) == 0)
|
||||
ret = wl_iw_set_pno_reset(dev, info, (union iwreq_data *)dwrq, extra);
|
||||
|
|
@ -7133,8 +7242,10 @@ static int wl_iw_set_priv(
|
|||
#ifdef CUSTOMER_HW2
|
||||
else if (strnicmp(extra, "POWERMODE", strlen("POWERMODE")) == 0)
|
||||
ret = wl_iw_set_power_mode(dev, info, (union iwreq_data *)dwrq, extra);
|
||||
else if (strnicmp(extra, "BTCOEXMODE", strlen("BTCOEXMODE")) == 0)
|
||||
else if (strnicmp(extra, "BTCOEXMODE", strlen("BTCOEXMODE")) == 0) {
|
||||
WL_TRACE_COEX(("%s:got Framwrork cmd: 'BTCOEXMODE'\n", __FUNCTION__));
|
||||
ret = wl_iw_set_btcoex_dhcp(dev, info, (union iwreq_data *)dwrq, extra);
|
||||
}
|
||||
#else
|
||||
else if (strnicmp(extra, "POWERMODE", strlen("POWERMODE")) == 0)
|
||||
ret = wl_iw_set_btcoex_dhcp(dev, info, (union iwreq_data *)dwrq, extra);
|
||||
|
|
@ -7142,6 +7253,11 @@ static int wl_iw_set_priv(
|
|||
else if (strnicmp(extra, "GETPOWER", strlen("GETPOWER")) == 0)
|
||||
ret = wl_iw_get_power_mode(dev, info, (union iwreq_data *)dwrq, extra);
|
||||
#ifdef SOFTAP
|
||||
#ifdef SOFTAP_TLV_CFG
|
||||
else if (strnicmp(extra, SOFTAP_SET_CMD, strlen(SOFTAP_SET_CMD)) == 0) {
|
||||
wl_iw_softap_cfg_tlv(dev, info, (union iwreq_data *)dwrq, extra);
|
||||
}
|
||||
#endif
|
||||
else if (strnicmp(extra, "ASCII_CMD", strlen("ASCII_CMD")) == 0) {
|
||||
wl_iw_process_private_ascii_cmd(dev, info, (union iwreq_data *)dwrq, extra);
|
||||
} else if (strnicmp(extra, "AP_MAC_LIST_SET", strlen("AP_MAC_LIST_SET")) == 0) {
|
||||
|
|
@ -7662,9 +7778,10 @@ wl_iw_event(struct net_device *dev, wl_event_msg_t *e, void* data)
|
|||
uint32 datalen = ntoh32(e->datalen);
|
||||
uint32 status = ntoh32(e->status);
|
||||
uint32 toto;
|
||||
#if defined(ROAM_NOT_USED)
|
||||
static uint32 roam_no_success = 0;
|
||||
static bool roam_no_success_send = FALSE;
|
||||
|
||||
#endif
|
||||
memset(&wrqu, 0, sizeof(wrqu));
|
||||
memset(extra, 0, sizeof(extra));
|
||||
|
||||
|
|
@ -7739,6 +7856,7 @@ wl_iw_event(struct net_device *dev, wl_event_msg_t *e, void* data)
|
|||
wrqu.addr.sa_family = ARPHRD_ETHER;
|
||||
cmd = SIOCGIWAP;
|
||||
}
|
||||
#if defined(ROAM_NOT_USED)
|
||||
else if (status == WLC_E_STATUS_NO_NETWORKS) {
|
||||
roam_no_success++;
|
||||
if ((roam_no_success == 5) && (roam_no_success_send == FALSE)) {
|
||||
|
|
@ -7753,6 +7871,7 @@ wl_iw_event(struct net_device *dev, wl_event_msg_t *e, void* data)
|
|||
goto wl_iw_event_end;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
break;
|
||||
case WLC_E_DEAUTH_IND:
|
||||
case WLC_E_DISASSOC_IND:
|
||||
|
|
@ -7808,8 +7927,10 @@ wl_iw_event(struct net_device *dev, wl_event_msg_t *e, void* data)
|
|||
wl_iw_send_priv_event(priv_dev, "AP_UP");
|
||||
} else {
|
||||
WL_TRACE(("STA_LINK_UP\n"));
|
||||
#if defined(ROAM_NOT_USED)
|
||||
roam_no_success_send = FALSE;
|
||||
roam_no_success = 0;
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
WL_TRACE(("Link UP\n"));
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
* software in any way with any other Broadcom software provided under a license
|
||||
* other than the GPL, without Broadcom's express prior written consent.
|
||||
*
|
||||
* $Id: wl_iw.h,v 1.5.34.1.6.36.4.15 2010/11/17 03:13:51 Exp $
|
||||
* $Id: wl_iw.h,v 1.5.34.1.6.36.4.18 2011/02/10 19:33:12 Exp $
|
||||
*/
|
||||
|
||||
|
||||
|
|
@ -52,7 +52,7 @@
|
|||
#define PNOSETUP_SET_CMD "PNOSETUP "
|
||||
#define PNOENABLE_SET_CMD "PNOFORCE"
|
||||
#define PNODEBUG_SET_CMD "PNODEBUG"
|
||||
#define SETDFSCHANNELS_CMD "SETDFSCHANNELS"
|
||||
#define TXPOWER_SET_CMD "TXPOWER"
|
||||
|
||||
#define MAC2STR(a) (a)[0], (a)[1], (a)[2], (a)[3], (a)[4], (a)[5]
|
||||
#define MACSTR "%02x:%02x:%02x:%02x:%02x:%02x"
|
||||
|
|
@ -62,6 +62,12 @@ typedef struct wl_iw_extra_params {
|
|||
int target_channel;
|
||||
} wl_iw_extra_params_t;
|
||||
|
||||
struct cntry_locales_custom {
|
||||
char iso_abbrev[WLC_CNTRY_BUF_SZ];
|
||||
char custom_locale[WLC_CNTRY_BUF_SZ];
|
||||
int32 custom_locale_rev;
|
||||
};
|
||||
|
||||
#define WL_IW_RSSI_MINVAL -200
|
||||
#define WL_IW_RSSI_NO_SIGNAL -91
|
||||
#define WL_IW_RSSI_VERY_LOW -80
|
||||
|
|
@ -133,13 +139,13 @@ typedef struct wl_iw_ss_cache {
|
|||
} wl_iw_ss_cache_t;
|
||||
|
||||
typedef struct wl_iw_ss_cache_ctrl {
|
||||
wl_iw_ss_cache_t *m_cache_head;
|
||||
int m_link_down;
|
||||
int m_timer_expired;
|
||||
char m_active_bssid[ETHER_ADDR_LEN];
|
||||
uint m_prev_scan_mode;
|
||||
uint m_cons_br_scan_cnt;
|
||||
struct timer_list *m_timer;
|
||||
wl_iw_ss_cache_t *m_cache_head;
|
||||
int m_link_down;
|
||||
int m_timer_expired;
|
||||
char m_active_bssid[ETHER_ADDR_LEN];
|
||||
uint m_prev_scan_mode;
|
||||
uint m_cons_br_scan_cnt;
|
||||
struct timer_list *m_timer;
|
||||
} wl_iw_ss_cache_ctrl_t;
|
||||
|
||||
typedef enum broadcast_first_scan {
|
||||
|
|
@ -165,7 +171,7 @@ struct ap_profile {
|
|||
};
|
||||
|
||||
|
||||
#define MACLIST_MODE_DISABLED 0
|
||||
#define MACLIST_MODE_DISABLED 0
|
||||
#define MACLIST_MODE_DENY 1
|
||||
#define MACLIST_MODE_ALLOW 2
|
||||
struct mflist {
|
||||
|
|
@ -199,7 +205,7 @@ extern int net_os_set_suspend_disable(struct net_device *dev, int val);
|
|||
extern int net_os_set_suspend(struct net_device *dev, int val);
|
||||
extern int net_os_set_dtim_skip(struct net_device *dev, int val);
|
||||
extern int net_os_set_packet_filter(struct net_device *dev, int val);
|
||||
extern void dhd_bus_country_set(struct net_device *dev, char *country_code);
|
||||
extern void get_customized_country_code(char *country_iso_code, wl_country_t *cspec);
|
||||
extern char *dhd_bus_country_get(struct net_device *dev);
|
||||
extern int dhd_get_dtim_skip(dhd_pub_t *dhd);
|
||||
|
||||
|
|
@ -221,13 +227,15 @@ extern int dhd_get_dtim_skip(dhd_pub_t *dhd);
|
|||
|
||||
extern int dhd_pno_enable(dhd_pub_t *dhd, int pfn_enabled);
|
||||
extern int dhd_pno_clean(dhd_pub_t *dhd);
|
||||
extern int dhd_pno_set(dhd_pub_t *dhd, wlc_ssid_t* ssids_local, int nssid, ushort scan_fr);
|
||||
extern int dhd_pno_set(dhd_pub_t *dhd, wlc_ssid_t* ssids_local, int nssid, \
|
||||
ushort scan_fr, int pno_repeat, int pno_freq_expo_max);
|
||||
extern int dhd_pno_get_status(dhd_pub_t *dhd);
|
||||
extern int dhd_dev_pno_reset(struct net_device *dev);
|
||||
extern int dhd_dev_pno_set(struct net_device *dev, wlc_ssid_t* ssids_local, \
|
||||
int nssid, ushort scan_fr);
|
||||
int nssid, ushort scan_fr, int pno_repeat, int pno_freq_expo_max);
|
||||
extern int dhd_dev_pno_enable(struct net_device *dev, int pfn_enabled);
|
||||
extern int dhd_dev_get_pno_status(struct net_device *dev);
|
||||
extern void dhd_bus_country_set(struct net_device *dev, wl_country_t *cspec);
|
||||
|
||||
#define PNO_TLV_PREFIX 'S'
|
||||
#define PNO_TLV_VERSION '1'
|
||||
|
|
@ -235,8 +243,9 @@ extern int dhd_dev_get_pno_status(struct net_device *dev);
|
|||
#define PNO_TLV_RESERVED '0'
|
||||
#define PNO_TLV_TYPE_SSID_IE 'S'
|
||||
#define PNO_TLV_TYPE_TIME 'T'
|
||||
#define PNO_EVENT_UP "PNO_EVENT"
|
||||
#define PNO_SCAN_MAX_FW 508
|
||||
#define PNO_TLV_FREQ_REPEAT 'R'
|
||||
#define PNO_TLV_FREQ_EXPO_MAX 'M'
|
||||
#define PNO_EVENT_UP "PNO_EVENT"
|
||||
|
||||
typedef struct cmd_tlv {
|
||||
char prefix;
|
||||
|
|
@ -245,6 +254,19 @@ typedef struct cmd_tlv {
|
|||
char reserved;
|
||||
} cmd_tlv_t;
|
||||
|
||||
#ifdef SOFTAP_TLV_CFG
|
||||
#define SOFTAP_SET_CMD "SOFTAPSET "
|
||||
#define SOFTAP_TLV_PREFIX 'A'
|
||||
#define SOFTAP_TLV_VERSION '1'
|
||||
#define SOFTAP_TLV_SUBVERSION '0'
|
||||
#define SOFTAP_TLV_RESERVED '0'
|
||||
|
||||
#define TLV_TYPE_SSID 'S'
|
||||
#define TLV_TYPE_SECUR 'E'
|
||||
#define TLV_TYPE_KEY 'K'
|
||||
#define TLV_TYPE_CHANNEL 'C'
|
||||
#endif
|
||||
|
||||
#if defined(CSCAN)
|
||||
|
||||
typedef struct cscan_tlv {
|
||||
|
|
@ -279,6 +301,6 @@ extern int wl_iw_parse_ssid_list(char** list_str, wlc_ssid_t* ssid, int idx, int
|
|||
|
||||
extern int wl_iw_parse_channel_list(char** list_str, uint16* channel_list, int channel_num);
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user