diff options
| author | Eliad Peller <eliad@wizery.com> | 2011-10-05 13:55:51 +0400 |
|---|---|---|
| committer | Luciano Coelho <coelho@ti.com> | 2011-10-07 09:32:42 +0400 |
| commit | 0603d891c5b5153f667a79357d4652824c22b54e (patch) | |
| tree | a5662e776f2609db07d05415d65c5fa74a0ef564 /drivers/net/wireless/wl12xx/scan.c | |
| parent | 6840e37aec6fd9ffa5b4cf62674af55afdb565ed (diff) | |
| download | linux-0603d891c5b5153f667a79357d4652824c22b54e.tar.xz | |
wl12xx: move role_id into wlvif
move role_id 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/scan.c')
| -rw-r--r-- | drivers/net/wireless/wl12xx/scan.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/wl12xx/scan.c b/drivers/net/wireless/wl12xx/scan.c index e3b863b895f3..9d0dfb516e26 100644 --- a/drivers/net/wireless/wl12xx/scan.c +++ b/drivers/net/wireless/wl12xx/scan.c @@ -163,6 +163,7 @@ static int wl1271_scan_send(struct wl1271 *wl, struct ieee80211_vif *vif, enum ieee80211_band band, bool passive, u32 basic_rate) { + struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif); struct wl1271_cmd_scan *cmd; struct wl1271_cmd_trigger_scan_to *trigger; int ret; @@ -182,11 +183,11 @@ static int wl1271_scan_send(struct wl1271 *wl, struct ieee80211_vif *vif, if (passive) scan_options |= WL1271_SCAN_OPT_PASSIVE; - if (WARN_ON(wl->role_id == WL12XX_INVALID_ROLE_ID)) { + if (WARN_ON(wlvif->role_id == WL12XX_INVALID_ROLE_ID)) { ret = -EINVAL; goto out; } - cmd->params.role_id = wl->role_id; + cmd->params.role_id = wlvif->role_id; cmd->params.scan_options = cpu_to_le16(scan_options); cmd->params.n_ch = wl1271_get_scan_channels(wl, wl->scan.req, |