wl12xx: move session_counter into wlvif
move session_counter 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>
This commit is contained in:
parent
a8ab39a4b5
commit
98b8625301
|
@ -454,14 +454,15 @@ static void wl12xx_free_link(struct wl1271 *wl, u8 *hlid)
|
|||
*hlid = WL12XX_INVALID_LINK_ID;
|
||||
}
|
||||
|
||||
static int wl12xx_get_new_session_id(struct wl1271 *wl)
|
||||
static int wl12xx_get_new_session_id(struct wl1271 *wl,
|
||||
struct wl12xx_vif *wlvif)
|
||||
{
|
||||
if (wl->session_counter >= SESSION_COUNTER_MAX)
|
||||
wl->session_counter = 0;
|
||||
if (wlvif->session_counter >= SESSION_COUNTER_MAX)
|
||||
wlvif->session_counter = 0;
|
||||
|
||||
wl->session_counter++;
|
||||
wlvif->session_counter++;
|
||||
|
||||
return wl->session_counter;
|
||||
return wlvif->session_counter;
|
||||
}
|
||||
|
||||
int wl12xx_cmd_role_start_dev(struct wl1271 *wl, struct wl12xx_vif *wlvif)
|
||||
|
@ -488,7 +489,7 @@ int wl12xx_cmd_role_start_dev(struct wl1271 *wl, struct wl12xx_vif *wlvif)
|
|||
goto out_free;
|
||||
}
|
||||
cmd->device.hlid = wl->dev_hlid;
|
||||
cmd->device.session = wl->session_counter;
|
||||
cmd->device.session = wlvif->session_counter;
|
||||
|
||||
wl1271_debug(DEBUG_CMD, "role start: roleid=%d, hlid=%d, session=%d",
|
||||
cmd->role_id, cmd->device.hlid, cmd->device.session);
|
||||
|
@ -587,7 +588,7 @@ int wl12xx_cmd_role_start_sta(struct wl1271 *wl, struct wl12xx_vif *wlvif)
|
|||
goto out_free;
|
||||
}
|
||||
cmd->sta.hlid = wlvif->sta.hlid;
|
||||
cmd->sta.session = wl12xx_get_new_session_id(wl);
|
||||
cmd->sta.session = wl12xx_get_new_session_id(wl, wlvif);
|
||||
cmd->sta.remote_rates = cpu_to_le32(wlvif->rate_set);
|
||||
|
||||
wl1271_debug(DEBUG_CMD, "role start: roleid=%d, hlid=%d, session=%d "
|
||||
|
|
|
@ -348,7 +348,6 @@ static ssize_t driver_state_read(struct file *file, char __user *user_buf,
|
|||
DRIVER_STATE_PRINT_INT(tx_blocks_freed);
|
||||
DRIVER_STATE_PRINT_INT(tx_security_last_seq_lsb);
|
||||
DRIVER_STATE_PRINT_INT(rx_counter);
|
||||
DRIVER_STATE_PRINT_INT(session_counter);
|
||||
DRIVER_STATE_PRINT_INT(state);
|
||||
DRIVER_STATE_PRINT_INT(channel);
|
||||
DRIVER_STATE_PRINT_INT(band);
|
||||
|
|
|
@ -2128,7 +2128,6 @@ deinit:
|
|||
wl->tx_results_count = 0;
|
||||
wl->tx_packets_count = 0;
|
||||
wl->time_offset = 0;
|
||||
wl->session_counter = 0;
|
||||
wl->bitrate_masks[IEEE80211_BAND_2GHZ] = wl->conf.tx.basic_rate;
|
||||
wl->bitrate_masks[IEEE80211_BAND_5GHZ] = wl->conf.tx.basic_rate_5;
|
||||
wl->vif = NULL;
|
||||
|
@ -4896,7 +4895,6 @@ struct ieee80211_hw *wl1271_alloc_hw(void)
|
|||
wl->tx_spare_blocks = TX_HW_BLOCK_SPARE_DEFAULT;
|
||||
wl->system_hlid = WL12XX_SYSTEM_HLID;
|
||||
wl->dev_hlid = WL12XX_INVALID_LINK_ID;
|
||||
wl->session_counter = 0;
|
||||
wl->active_sta_count = 0;
|
||||
setup_timer(&wl->rx_streaming_timer, wl1271_rx_streaming_timer,
|
||||
(unsigned long) wl);
|
||||
|
|
|
@ -321,15 +321,15 @@ static void wl1271_tx_fill_hdr(struct wl1271 *wl, struct ieee80211_vif *vif,
|
|||
* FW expects the dummy packet to have an invalid session id -
|
||||
* any session id that is different than the one set in the join
|
||||
*/
|
||||
tx_attr = ((~wl->session_counter) <<
|
||||
tx_attr = (SESSION_COUNTER_INVALID <<
|
||||
TX_HW_ATTR_OFST_SESSION_COUNTER) &
|
||||
TX_HW_ATTR_SESSION_COUNTER;
|
||||
|
||||
tx_attr |= TX_HW_ATTR_TX_DUMMY_REQ;
|
||||
} else {
|
||||
/* configure the tx attributes */
|
||||
tx_attr =
|
||||
wl->session_counter << TX_HW_ATTR_OFST_SESSION_COUNTER;
|
||||
tx_attr = wlvif->session_counter <<
|
||||
TX_HW_ATTR_OFST_SESSION_COUNTER;
|
||||
}
|
||||
|
||||
desc->hlid = hlid;
|
||||
|
|
|
@ -429,9 +429,6 @@ struct wl1271 {
|
|||
/* Time-offset between host and chipset clocks */
|
||||
s64 time_offset;
|
||||
|
||||
/* Session counter for the chipset */
|
||||
int session_counter;
|
||||
|
||||
/* Frames scheduled for transmission, not handled yet */
|
||||
struct sk_buff_head tx_queue[NUM_TX_QUEUES];
|
||||
int tx_queue_count[NUM_TX_QUEUES];
|
||||
|
@ -650,6 +647,9 @@ struct wl12xx_vif {
|
|||
|
||||
/* Our association ID */
|
||||
u16 aid;
|
||||
|
||||
/* Session counter for the chipset */
|
||||
int session_counter;
|
||||
};
|
||||
|
||||
static inline struct wl12xx_vif *wl12xx_vif_to_data(struct ieee80211_vif *vif)
|
||||
|
@ -671,7 +671,8 @@ size_t wl12xx_copy_fwlog(struct wl1271 *wl, u8 *memblock, size_t maxlen);
|
|||
|
||||
#define JOIN_TIMEOUT 5000 /* 5000 milliseconds to join */
|
||||
|
||||
#define SESSION_COUNTER_MAX 7 /* maximum value for the session counter */
|
||||
#define SESSION_COUNTER_MAX 6 /* maximum value for the session counter */
|
||||
#define SESSION_COUNTER_INVALID 7 /* used with dummy_packet */
|
||||
|
||||
#define WL1271_DEFAULT_POWER_LEVEL 0
|
||||
|
||||
|
|
Loading…
Reference in New Issue