diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-05-16 14:11:11 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-05-16 14:11:11 +1000 |
commit | cbf1b7179993f82a0eca78d39e6c58b4e270d9b7 (patch) | |
tree | 8d690b307897e7f03613c5b64f3a69eeabb6614c /drivers/staging/ath6kl/wlan/src | |
parent | 2ff53ee5e0f91fa522e1aaa8bc3851bba24716ec (diff) | |
parent | 64a47c5072a6d702349dba30ea8b0e69be4d9778 (diff) |
Merge remote-tracking branch 'staging/staging-next'
Conflicts:
drivers/staging/intel_sst/intelmid.c
drivers/staging/rt2860/common/cmm_data_pci.c
drivers/staging/rt2860/common/cmm_data_usb.c
drivers/staging/usbip/vhci_sysfs.c
Diffstat (limited to 'drivers/staging/ath6kl/wlan/src')
-rw-r--r-- | drivers/staging/ath6kl/wlan/src/wlan_node.c | 11 | ||||
-rw-r--r-- | drivers/staging/ath6kl/wlan/src/wlan_recv_beacon.c | 1 | ||||
-rw-r--r-- | drivers/staging/ath6kl/wlan/src/wlan_utils.c | 1 |
3 files changed, 5 insertions, 8 deletions
diff --git a/drivers/staging/ath6kl/wlan/src/wlan_node.c b/drivers/staging/ath6kl/wlan/src/wlan_node.c index 1a3ac7dd5e34..0fe5f4b1346c 100644 --- a/drivers/staging/ath6kl/wlan/src/wlan_node.c +++ b/drivers/staging/ath6kl/wlan/src/wlan_node.c @@ -24,7 +24,6 @@ //============================================================================== #include <a_config.h> #include <athdefs.h> -#include <a_types.h> #include <a_osapi.h> #define ATH_MODULE_NAME wlan #include <a_debug.h> @@ -54,7 +53,7 @@ ATH_DEBUG_INSTANTIATE_MODULE_VAR(wlan, #endif #ifdef THREAD_X -static void wlan_node_timeout(A_ATH_TIMER arg); +static void wlan_node_timeout(unsigned long arg); #endif static bss_t * _ieee80211_find_node (struct ieee80211_node_table *nt, @@ -72,7 +71,7 @@ wlan_node_alloc(struct ieee80211_node_table *nt, int wh_size) { ni->ni_buf = A_MALLOC_NOWAIT(wh_size); if (ni->ni_buf == NULL) { - A_FREE(ni); + kfree(ni); ni = NULL; return ni; } @@ -104,9 +103,9 @@ void wlan_node_free(bss_t *ni) { if (ni->ni_buf != NULL) { - A_FREE(ni->ni_buf); + kfree(ni->ni_buf); } - A_FREE(ni); + kfree(ni); } void @@ -375,7 +374,7 @@ wlan_refresh_inactive_nodes (struct ieee80211_node_table *nt) #ifdef THREAD_X static void -wlan_node_timeout (A_ATH_TIMER arg) +wlan_node_timeout (unsigned long arg) { struct ieee80211_node_table *nt = (struct ieee80211_node_table *)arg; bss_t *bss, *nextBss; diff --git a/drivers/staging/ath6kl/wlan/src/wlan_recv_beacon.c b/drivers/staging/ath6kl/wlan/src/wlan_recv_beacon.c index 9ebfecff54f9..07b8313b16e8 100644 --- a/drivers/staging/ath6kl/wlan/src/wlan_recv_beacon.c +++ b/drivers/staging/ath6kl/wlan/src/wlan_recv_beacon.c @@ -25,7 +25,6 @@ #include "a_config.h" #include "athdefs.h" -#include "a_types.h" #include "a_osapi.h" #include <wmi.h> #include <ieee80211.h> diff --git a/drivers/staging/ath6kl/wlan/src/wlan_utils.c b/drivers/staging/ath6kl/wlan/src/wlan_utils.c index fd05e39f4118..bc91599d9bf6 100644 --- a/drivers/staging/ath6kl/wlan/src/wlan_utils.c +++ b/drivers/staging/ath6kl/wlan/src/wlan_utils.c @@ -24,7 +24,6 @@ //============================================================================== #include <a_config.h> #include <athdefs.h> -#include <a_types.h> #include <a_osapi.h> /* |