diff options
Diffstat (limited to 'drivers/net/wireless/ti')
| -rw-r--r-- | drivers/net/wireless/ti/wl1251/rx.c | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/ti/wlcore/main.c | 33 |
2 files changed, 17 insertions, 18 deletions
diff --git a/drivers/net/wireless/ti/wl1251/rx.c b/drivers/net/wireless/ti/wl1251/rx.c index 6af3526..23289d4 100644 --- a/drivers/net/wireless/ti/wl1251/rx.c +++ b/drivers/net/wireless/ti/wl1251/rx.c @@ -81,7 +81,7 @@ static void wl1251_rx_status(struct wl1251 *wl, status->freq = ieee80211_channel_to_frequency(desc->channel, status->band); - status->flag |= RX_FLAG_MACTIME_MPDU; + status->flag |= RX_FLAG_MACTIME_START; if (desc->flags & RX_DESC_ENCRYPTION_MASK) { status->flag |= RX_FLAG_IV_STRIPPED | RX_FLAG_MMIC_STRIPPED; diff --git a/drivers/net/wireless/ti/wlcore/main.c b/drivers/net/wireless/ti/wlcore/main.c index 4dfd533..a163b09 100644 --- a/drivers/net/wireless/ti/wlcore/main.c +++ b/drivers/net/wireless/ti/wlcore/main.c @@ -687,7 +687,7 @@ static void wl12xx_get_vif_count(struct ieee80211_hw *hw, memset(data, 0, sizeof(*data)); data->cur_vif = cur_vif; - ieee80211_iterate_active_interfaces(hw, + ieee80211_iterate_active_interfaces(hw, IEEE80211_IFACE_ITER_RESUME_ALL, wl12xx_vif_count_iter, data); } @@ -2649,7 +2649,7 @@ static int wlcore_set_assoc(struct wl1271 *wl, struct wl12xx_vif *wlvif, int ret; wlvif->aid = bss_conf->aid; - wlvif->channel_type = bss_conf->channel_type; + wlvif->channel_type = cfg80211_get_chandef_type(&bss_conf->chandef); wlvif->beacon_int = bss_conf->beacon_int; wlvif->wmm_enabled = bss_conf->qos; @@ -3857,7 +3857,7 @@ static void wl1271_bss_info_changed_ap(struct wl1271 *wl, /* Handle HT information change */ if ((changed & BSS_CHANGED_HT) && - (bss_conf->channel_type != NL80211_CHAN_NO_HT)) { + (bss_conf->chandef.width != NL80211_CHAN_WIDTH_20_NOHT)) { ret = wl1271_acx_set_ht_information(wl, wlvif, bss_conf->ht_operation_mode); if (ret < 0) { @@ -4121,7 +4121,7 @@ static void wl1271_bss_info_changed_sta(struct wl1271 *wl, if (sta_exists && (changed & BSS_CHANGED_HT)) { bool enabled = - bss_conf->channel_type != NL80211_CHAN_NO_HT; + bss_conf->chandef.width != NL80211_CHAN_WIDTH_20_NOHT; ret = wl1271_acx_set_ht_capabilities(wl, &sta_ht_cap, @@ -4234,8 +4234,8 @@ static int wlcore_op_add_chanctx(struct ieee80211_hw *hw, struct ieee80211_chanctx_conf *ctx) { wl1271_debug(DEBUG_MAC80211, "mac80211 add chanctx %d (type %d)", - ieee80211_frequency_to_channel(ctx->channel->center_freq), - ctx->channel_type); + ieee80211_frequency_to_channel(ctx->def.chan->center_freq), + cfg80211_get_chandef_type(&ctx->def)); return 0; } @@ -4243,8 +4243,8 @@ static void wlcore_op_remove_chanctx(struct ieee80211_hw *hw, struct ieee80211_chanctx_conf *ctx) { wl1271_debug(DEBUG_MAC80211, "mac80211 remove chanctx %d (type %d)", - ieee80211_frequency_to_channel(ctx->channel->center_freq), - ctx->channel_type); + ieee80211_frequency_to_channel(ctx->def.chan->center_freq), + cfg80211_get_chandef_type(&ctx->def)); } static void wlcore_op_change_chanctx(struct ieee80211_hw *hw, @@ -4253,8 +4253,8 @@ static void wlcore_op_change_chanctx(struct ieee80211_hw *hw, { wl1271_debug(DEBUG_MAC80211, "mac80211 change chanctx %d (type %d) changed 0x%x", - ieee80211_frequency_to_channel(ctx->channel->center_freq), - ctx->channel_type, changed); + ieee80211_frequency_to_channel(ctx->def.chan->center_freq), + cfg80211_get_chandef_type(&ctx->def), changed); } static int wlcore_op_assign_vif_chanctx(struct ieee80211_hw *hw, @@ -4264,17 +4264,17 @@ static int wlcore_op_assign_vif_chanctx(struct ieee80211_hw *hw, struct wl1271 *wl = hw->priv; struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif); int channel = ieee80211_frequency_to_channel( - ctx->channel->center_freq); + ctx->def.chan->center_freq); wl1271_debug(DEBUG_MAC80211, "mac80211 assign chanctx (role %d) %d (type %d)", - wlvif->role_id, channel, ctx->channel_type); + wlvif->role_id, channel, cfg80211_get_chandef_type(&ctx->def)); mutex_lock(&wl->mutex); - wlvif->band = ctx->channel->band; + wlvif->band = ctx->def.chan->band; wlvif->channel = channel; - wlvif->channel_type = ctx->channel_type; + wlvif->channel_type = cfg80211_get_chandef_type(&ctx->def); /* update default rates according to the band */ wl1271_set_band_rate(wl, wlvif); @@ -4294,8 +4294,8 @@ static void wlcore_op_unassign_vif_chanctx(struct ieee80211_hw *hw, wl1271_debug(DEBUG_MAC80211, "mac80211 unassign chanctx (role %d) %d (type %d)", wlvif->role_id, - ieee80211_frequency_to_channel(ctx->channel->center_freq), - ctx->channel_type); + ieee80211_frequency_to_channel(ctx->def.chan->center_freq), + cfg80211_get_chandef_type(&ctx->def)); wl1271_tx_flush(wl); } @@ -4872,7 +4872,6 @@ static void wlcore_op_flush(struct ieee80211_hw *hw, bool drop) static int wlcore_op_remain_on_channel(struct ieee80211_hw *hw, struct ieee80211_vif *vif, struct ieee80211_channel *chan, - enum nl80211_channel_type channel_type, int duration) { struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif); |