diff options
| author | Howard M. Harte <hharte@broadcom.com> | 2011-06-15 18:52:15 -0700 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2011-06-17 10:42:54 -0700 |
| commit | 0d9f3c2791c1e19796d3a41d8ec45093583817e7 (patch) | |
| tree | e39143aca1da3943af7945677dd79f1ae6811ebf /drivers/net/wireless/bcmdhd/wl_iw.c | |
| parent | 097d39641dc94f9e5891481e066ef14b12cca408 (diff) | |
net: wireless: bcmdhd: Combined patch from 4.218.248-31
bcmdhd: Allocate skb with GFP_KERNEL flag if possible: fix for older kernels.
bcmdhd: Fix race conditions for sysioc_thread
* Fix up formatting and #ifdefs.
net: wireless: bcmdhd: Fix get_customized_country_code() for older kernels.
net: wireless: bcmdhd: Move PNO function prototypes to dhd.h.
Add private command support.
net: wireless: bcmdhd: Set proper read barrier
net: wireless: bcmdhd: Fix memory leak in case of dhd_bus_init() failure
net: wireless: bcmdhd: Fix wake_lock symmetry
net: wireless: bcmdhd: Ignore error if scan results are empty
net: wireless: bcmdhd: Add sdlock to firmware loading
net: wireless: bcmdhd: Fix watchdog syncronization during start/stop
net: wireless: bcmdhd: Fix Makefile to allow WEXT compilation
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'drivers/net/wireless/bcmdhd/wl_iw.c')
| -rw-r--r-- | drivers/net/wireless/bcmdhd/wl_iw.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/drivers/net/wireless/bcmdhd/wl_iw.c b/drivers/net/wireless/bcmdhd/wl_iw.c index 0af60732dca..a438cf6f1e7 100644 --- a/drivers/net/wireless/bcmdhd/wl_iw.c +++ b/drivers/net/wireless/bcmdhd/wl_iw.c @@ -1631,8 +1631,8 @@ wl_iw_send_priv_event( int wl_control_wl_start(struct net_device *dev) { - int ret = 0; wl_iw_t *iw; + int ret = 0; WL_TRACE(("Enter %s \n", __FUNCTION__)); @@ -1680,8 +1680,8 @@ wl_iw_control_wl_off( struct iw_request_info *info ) { - int ret = 0; wl_iw_t *iw; + int ret = 0; WL_TRACE(("Enter %s\n", __FUNCTION__)); @@ -1769,7 +1769,7 @@ wl_iw_control_wl_on( wl_iw_iscan_set_scan_broadcast_prep(dev, 0); #endif - WL_TRACE(("Exited %s \n", __FUNCTION__)); + WL_TRACE(("Exited %s\n", __FUNCTION__)); return ret; } @@ -1788,8 +1788,6 @@ static int set_ap_mac_list(struct net_device *dev, void *buf); static int get_parameter_from_string( char **str_ptr, const char *token, int param_type, void *dst, int param_max_len); -#endif - static int hex2num(char c) { @@ -1826,7 +1824,6 @@ hstr_2_buf(const char *txt, u8 *buf, int len) -#ifdef SOFTAP static int init_ap_profile_from_string(char *param_str, struct ap_profile *ap_cfg) { @@ -4323,10 +4320,6 @@ wl_iw_iscan_get_scan( WL_TRACE(("%s return to WE %d bytes APs=%d\n", __FUNCTION__, dwrq->length, counter)); - - if (!dwrq->length) - return -EAGAIN; - return 0; } #endif |