diff --git a/[refs] b/[refs] index b3ff972c54df..abb9a3eb4bb5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 46ff8d5978b7796e3757b9ad908361beb8fb160b +refs/heads/master: 9d0c6bcf46c3df4a5d011749c94d4f85dd98931d diff --git a/trunk/drivers/net/wireless/ath/ath6kl/common.h b/trunk/drivers/net/wireless/ath/ath6kl/common.h index cc8b04097739..e37ae9bafc0d 100644 --- a/trunk/drivers/net/wireless/ath/ath6kl/common.h +++ b/trunk/drivers/net/wireless/ath/ath6kl/common.h @@ -155,7 +155,7 @@ void wlan_iterate_nodes(struct ath6kl_node_table *nt, void (*f) (void *arg, struct bss *), void *arg); -void wlan_node_table_init(void *wmip, struct ath6kl_node_table *nt); +void wlan_node_table_init(struct ath6kl_node_table *nt); void wlan_node_table_cleanup(struct ath6kl_node_table *nt); void wlan_refresh_inactive_nodes(struct ath6kl *ar); diff --git a/trunk/drivers/net/wireless/ath/ath6kl/node.c b/trunk/drivers/net/wireless/ath/ath6kl/node.c index 961154193ef5..7c9fbde9dedd 100644 --- a/trunk/drivers/net/wireless/ath/ath6kl/node.c +++ b/trunk/drivers/net/wireless/ath/ath6kl/node.c @@ -160,7 +160,7 @@ void wlan_iterate_nodes(struct ath6kl_node_table *nt, spin_unlock_bh(&nt->nt_nodelock); } -void wlan_node_table_init(void *wmi, struct ath6kl_node_table *nt) +void wlan_node_table_init(struct ath6kl_node_table *nt) { ath6kl_dbg(ATH6KL_DBG_WLAN_NODE, "node table = 0x%lx\n", (unsigned long)nt); diff --git a/trunk/drivers/net/wireless/ath/ath6kl/wmi.c b/trunk/drivers/net/wireless/ath/ath6kl/wmi.c index 50cee9bf0e2b..6f145d4c93c6 100644 --- a/trunk/drivers/net/wireless/ath/ath6kl/wmi.c +++ b/trunk/drivers/net/wireless/ath/ath6kl/wmi.c @@ -2727,7 +2727,7 @@ void *ath6kl_wmi_init(struct ath6kl *dev) wmi->parent_dev = dev; - wlan_node_table_init(wmi, &dev->scan_table); + wlan_node_table_init(&dev->scan_table); ath6kl_wmi_qos_state_init(wmi); wmi->pwr_mode = REC_POWER;