summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/wl12xx/init.c
diff options
context:
space:
mode:
authorEliad Peller <eliad@wizery.com>2011-10-05 13:55:42 +0400
committerLuciano Coelho <coelho@ti.com>2011-10-07 09:32:34 +0400
commit30d0c8fd5b87d1c5486705d6420545a21533e115 (patch)
tree73e911f10dd19e16789b58ab8a496a9ec3fff6ad /drivers/net/wireless/wl12xx/init.c
parent87fbcb0f8c5c8fd57a4e3e7e638977c04ce1e0ca (diff)
downloadlinux-30d0c8fd5b87d1c5486705d6420545a21533e115.tar.xz
wl12xx: move rate_set into wlvif
move rate_set into the per-interface data, rather than being global. Signed-off-by: Eliad Peller <eliad@wizery.com> Signed-off-by: Luciano Coelho <coelho@ti.com>
Diffstat (limited to 'drivers/net/wireless/wl12xx/init.c')
-rw-r--r--drivers/net/wireless/wl12xx/init.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/wl12xx/init.c b/drivers/net/wireless/wl12xx/init.c
index c00bdf8a3584..37955dad1f93 100644
--- a/drivers/net/wireless/wl12xx/init.c
+++ b/drivers/net/wireless/wl12xx/init.c
@@ -320,7 +320,7 @@ static int wl12xx_init_fwlog(struct wl1271 *wl)
}
/* generic sta initialization (non vif-specific) */
-static int wl1271_sta_hw_init(struct wl1271 *wl)
+static int wl1271_sta_hw_init(struct wl1271 *wl, struct wl12xx_vif *wlvif)
{
int ret;
@@ -345,7 +345,7 @@ static int wl1271_sta_hw_init(struct wl1271 *wl)
if (ret < 0)
return ret;
- ret = wl1271_acx_sta_rate_policies(wl);
+ ret = wl1271_acx_sta_rate_policies(wl, wlvif);
if (ret < 0)
return ret;
@@ -586,7 +586,7 @@ int wl1271_init_vif_specific(struct wl1271 *wl, struct ieee80211_vif *vif)
if (ret < 0)
return ret;
} else {
- ret = wl1271_sta_hw_init(wl);
+ ret = wl1271_sta_hw_init(wl, wlvif);
if (ret < 0)
return ret;