Commit 287f6f96 authored by Juuso Oikarinen's avatar Juuso Oikarinen Committed by John W. Linville

wl1251: Enable beacon filtering with the stack

Enable beacon filtering with the mac80211 stack.
Signed-off-by: default avatarJuuso Oikarinen <juuso.oikarinen@nokia.com>
Signed-off-by: default avatarKalle Valo <kalle.valo@nokia.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 474c48c9
...@@ -374,6 +374,8 @@ struct wl1251 { ...@@ -374,6 +374,8 @@ struct wl1251 {
u8 buffer_busyword[WL1251_BUSY_WORD_LEN]; u8 buffer_busyword[WL1251_BUSY_WORD_LEN];
struct wl1251_rx_descriptor *rx_descriptor; struct wl1251_rx_descriptor *rx_descriptor;
struct ieee80211_vif *vif;
u32 chip_id; u32 chip_id;
char fw_ver[21]; char fw_ver[21];
}; };
......
...@@ -79,6 +79,13 @@ static int wl1251_event_process(struct wl1251 *wl, struct event_mailbox *mbox) ...@@ -79,6 +79,13 @@ static int wl1251_event_process(struct wl1251 *wl, struct event_mailbox *mbox)
} }
} }
if (vector & SYNCHRONIZATION_TIMEOUT_EVENT_ID && wl->psm) {
wl1251_debug(DEBUG_EVENT, "SYNCHRONIZATION_TIMEOUT_EVENT");
/* indicate to the stack, that beacons have been lost */
ieee80211_beacon_loss(wl->vif);
}
return 0; return 0;
} }
......
...@@ -509,6 +509,12 @@ static int wl1251_op_add_interface(struct ieee80211_hw *hw, ...@@ -509,6 +509,12 @@ static int wl1251_op_add_interface(struct ieee80211_hw *hw,
conf->type, conf->mac_addr); conf->type, conf->mac_addr);
mutex_lock(&wl->mutex); mutex_lock(&wl->mutex);
if (wl->vif) {
ret = -EBUSY;
goto out;
}
wl->vif = conf->vif;
switch (conf->type) { switch (conf->type) {
case NL80211_IFTYPE_STATION: case NL80211_IFTYPE_STATION:
...@@ -538,7 +544,12 @@ static int wl1251_op_add_interface(struct ieee80211_hw *hw, ...@@ -538,7 +544,12 @@ static int wl1251_op_add_interface(struct ieee80211_hw *hw,
static void wl1251_op_remove_interface(struct ieee80211_hw *hw, static void wl1251_op_remove_interface(struct ieee80211_hw *hw,
struct ieee80211_if_init_conf *conf) struct ieee80211_if_init_conf *conf)
{ {
struct wl1251 *wl = hw->priv;
mutex_lock(&wl->mutex);
wl1251_debug(DEBUG_MAC80211, "mac80211 remove interface"); wl1251_debug(DEBUG_MAC80211, "mac80211 remove interface");
wl->vif = NULL;
mutex_unlock(&wl->mutex);
} }
static int wl1251_build_null_data(struct wl1251 *wl) static int wl1251_build_null_data(struct wl1251 *wl)
...@@ -1372,6 +1383,7 @@ struct ieee80211_hw *wl1251_alloc_hw(void) ...@@ -1372,6 +1383,7 @@ struct ieee80211_hw *wl1251_alloc_hw(void)
wl->power_level = WL1251_DEFAULT_POWER_LEVEL; wl->power_level = WL1251_DEFAULT_POWER_LEVEL;
wl->beacon_int = WL1251_DEFAULT_BEACON_INT; wl->beacon_int = WL1251_DEFAULT_BEACON_INT;
wl->dtim_period = WL1251_DEFAULT_DTIM_PERIOD; wl->dtim_period = WL1251_DEFAULT_DTIM_PERIOD;
wl->vif = NULL;
for (i = 0; i < FW_TX_CMPLT_BLOCK_SIZE; i++) for (i = 0; i < FW_TX_CMPLT_BLOCK_SIZE; i++)
wl->tx_frames[i] = NULL; wl->tx_frames[i] = NULL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment