From 9532b1a50e4a372a3f312ee9168bb396819a5b06 Mon Sep 17 00:00:00 2001 From: XazZ Date: Wed, 23 Apr 2008 14:02:38 +0200 Subject: [PATCH] rename acx_select_opmode to acx_s_select_opmode to make sure we name the functions as described in acx_func.h --- common.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/common.c b/common.c index be7d5d6..a275607 100644 --- a/common.c +++ b/common.c @@ -4215,7 +4215,7 @@ void acx_update_capabilities(acx_device_t * adev) ** Derived from mac80211 code, p54, bcm43xx_mac80211 ** */ -static void acx_select_opmode(acx_device_t * adev) +static void acx_s_select_opmode(acx_device_t * adev) { int changed = 0; FN_ENTER; @@ -4320,11 +4320,12 @@ int acx_add_interface(struct ieee80211_hw *ieee, acx_unlock(adev, flags); if (adev->initialized) - acx_select_opmode(adev); - err = 0; + acx_s_select_opmode(adev); acx_lock(adev, flags); + err = 0; + printk(KERN_INFO "Virtual interface added " #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25) "(type: 0x%08X), ID: %pd, MAC: %s\n", @@ -4372,7 +4373,7 @@ void acx_remove_interface(struct ieee80211_hw *hw, acx_unlock(adev, flags); if (adev->initialized) - acx_select_opmode(adev); + acx_s_select_opmode(adev); flush_scheduled_work(); printk(KERN_INFO "Virtual interface removed " @@ -4519,10 +4520,11 @@ extern int acx_config_interface(struct ieee80211_hw* ieee, FN_ENTER; if (!adev->interface.operating) goto err_out; - acx_lock(adev, flags); if (adev->initialized) - acx_select_opmode(adev); + acx_s_select_opmode(adev); + + acx_lock(adev, flags); if ((conf->type != IEEE80211_IF_TYPE_MNTR) && (adev->vif == vif)) { @@ -4546,7 +4548,7 @@ int acx_config_interface(struct ieee80211_hw* ieee, int if_id, goto err_out; if (adev->initialized) - acx_select_opmode(adev); + acx_s_select_opmode(adev); acx_lock(adev, flags); -- 2.11.4.GIT