lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wl12xx: move some logic into wl12xx_init_vif_data

Browse Source 
Initialize the vif data according to the vif type

Signed-off-by: Eliad Peller <eliad@wizery.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>
This commit is contained in:
Eliad Peller
2011-10-05 11:55:56 +02:00
committed by Luciano Coelho
parent 98b8625301
commit e936bbe0dc
1 changed files with 40 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
drivers/net/wireless/wl12xx/main.c
View File

@@ -1854,20 +1854,52 @@ static u8 wl12xx_get_role_type(struct wl1271 *wl, struct wl12xx_vif *wlvif)
return WL12XX_INVALID_ROLE_TYPE; return WL12XX_INVALID_ROLE_TYPE;
} }
static void wl12xx_init_vif_data(struct wl12xx_vif *wlvif) static int wl12xx_init_vif_data(struct ieee80211_vif *vif)
{ {
wlvif->bss_type = MAX_BSS_TYPE; struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);
/* make sure wlvif is zeroed */
memset(wlvif, 0, sizeof(*wlvif));
switch (ieee80211_vif_type_p2p(vif)) {
case NL80211_IFTYPE_P2P_CLIENT:
wlvif->p2p = 1;
/* fall-through */
case NL80211_IFTYPE_STATION:
wlvif->bss_type = BSS_TYPE_STA_BSS;
break;
case NL80211_IFTYPE_ADHOC:
wlvif->bss_type = BSS_TYPE_IBSS;
break;
case NL80211_IFTYPE_P2P_GO:
wlvif->p2p = 1;
/* fall-through */
case NL80211_IFTYPE_AP:
wlvif->bss_type = BSS_TYPE_AP_BSS;
break;
default:
wlvif->bss_type = MAX_BSS_TYPE;
return -EOPNOTSUPP;
}
wlvif->role_id = WL12XX_INVALID_ROLE_ID; wlvif->role_id = WL12XX_INVALID_ROLE_ID;
wlvif->dev_role_id = WL12XX_INVALID_ROLE_ID; wlvif->dev_role_id = WL12XX_INVALID_ROLE_ID;
/* TODO: init union by type */ if (wlvif->bss_type == BSS_TYPE_STA_BSS ||
wlvif->sta.hlid = WL12XX_INVALID_LINK_ID; wlvif->bss_type == BSS_TYPE_IBSS) {
wlvif->ap.bcast_hlid = WL12XX_INVALID_LINK_ID; /* init sta/ibss data */
wlvif->ap.global_hlid = WL12XX_INVALID_LINK_ID; wlvif->sta.hlid = WL12XX_INVALID_LINK_ID;
} else {
/* init ap data */
wlvif->ap.bcast_hlid = WL12XX_INVALID_LINK_ID;
wlvif->ap.global_hlid = WL12XX_INVALID_LINK_ID;
}
wlvif->basic_rate_set = CONF_TX_RATE_MASK_BASIC; wlvif->basic_rate_set = CONF_TX_RATE_MASK_BASIC;
wlvif->basic_rate = CONF_TX_RATE_MASK_BASIC; wlvif->basic_rate = CONF_TX_RATE_MASK_BASIC;
wlvif->rate_set = CONF_TX_RATE_MASK_BASIC; wlvif->rate_set = CONF_TX_RATE_MASK_BASIC;
return 0;
} }
static int wl1271_op_add_interface(struct ieee80211_hw *hw, static int wl1271_op_add_interface(struct ieee80211_hw *hw,
@@ -1891,7 +1923,6 @@ static int wl1271_op_add_interface(struct ieee80211_hw *hw,
ret = -EBUSY; ret = -EBUSY;
goto out; goto out;
} }
wl12xx_init_vif_data(wlvif);
/* /*
* in some very corner case HW recovery scenarios its possible to * in some very corner case HW recovery scenarios its possible to
@@ -1903,26 +1934,9 @@ static int wl1271_op_add_interface(struct ieee80211_hw *hw,
goto out; goto out;
} }
switch (ieee80211_vif_type_p2p(vif)) { ret = wl12xx_init_vif_data(vif);
case NL80211_IFTYPE_P2P_CLIENT: if (ret < 0)
wlvif->p2p = 1;
/* fall-through */
case NL80211_IFTYPE_STATION:
wlvif->bss_type = BSS_TYPE_STA_BSS;
break;
case NL80211_IFTYPE_ADHOC:
wlvif->bss_type = BSS_TYPE_IBSS;
break;
case NL80211_IFTYPE_P2P_GO:
wlvif->p2p = 1;
/* fall-through */
case NL80211_IFTYPE_AP:
wlvif->bss_type = BSS_TYPE_AP_BSS;
break;
default:
ret = -EOPNOTSUPP;
goto out; goto out;
}
role_type = wl12xx_get_role_type(wl, wlvif); role_type = wl12xx_get_role_type(wl, wlvif);
if (role_type == WL12XX_INVALID_ROLE_TYPE) { if (role_type == WL12XX_INVALID_ROLE_TYPE) {