[Acx100-devel] [PATCH 3/3] fix warning when building against kernel 2.6.32

[Hauke M. <ha...@ha...>]

This fixes the following warning:

acx-mac80211/main.c: In function ‘acx_recover_hw’:
acx-mac80211/main.c:1115:2: warning: passing argument 2 of ‘acx_remove_interface’ from incompatible pointer type [enabled by default]
acx-mac80211/main.c:629:6: note: expected ‘struct ieee80211_if_init_conf *’ but argument is of type ‘struct ieee80211_vif *’
  LD [M]  acx-mac80211/acx-mac80211.o

Signed-off-by: Hauke Mehrtens <ha...@ha...>
---
 main.c |    4 ++--
 main.h |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/main.c b/main.c
index 6c80479..7f6f449 100644
--- a/main.c
+++ b/main.c
@@ -626,7 +626,7 @@ out_unlock:
 	return err;
 }
 
-void acx_remove_interface(acx_device_t *adev, struct ieee80211_VIF *vif)
+void acx_remove_interface(acx_device_t *adev, struct ieee80211_vif *vif)
 {
 	if (vif->type == NL80211_IFTYPE_MONITOR)
 		adev->vif_monitor--;
@@ -647,7 +647,7 @@ void acx_op_remove_interface(struct ieee80211_hw *hw, struct ieee80211_VIF *vif)
 
 	mac_vif = VIF_addr(vif);
 
-	acx_remove_interface(adev, vif);
+	acx_remove_interface(adev, VIF_vif(vif));
 
 	log(L_ANY, "Virtual interface removed: type=%d, MAC=%s\n",
 		vif->type, acx_print_mac(mac, mac_vif));
diff --git a/main.h b/main.h
index 3df808c..293f5c8 100644
--- a/main.h
+++ b/main.h
@@ -24,7 +24,7 @@ void acx_schedule_task(acx_device_t *adev, unsigned int set_flag);
 void acx_timer(unsigned long address);
 
 int acx_op_add_interface(struct ieee80211_hw *ieee, struct ieee80211_VIF *vif);
-void acx_remove_interface(acx_device_t *adev, struct ieee80211_VIF *vif);
+void acx_remove_interface(acx_device_t *adev, struct ieee80211_vif *vif);
 void acx_op_remove_interface(struct ieee80211_hw *hw, struct ieee80211_VIF *vif);
 int acx_op_config(struct ieee80211_hw *hw, u32 changed);
 void acx_op_bss_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
-- 
1.7.10.4