by Arik Nemtsov

[permalink] [raw]

Subject: [PATCH 25/78] wlcore: track current channel type per vif

Track the current 802.11 channel type, defaulting to a NO_HT channel.
Update the channel type element when changed by mac80211.

Signed-off-by: Arik Nemtsov <[email protected]>
---
drivers/net/wireless/ti/wlcore/main.c | 9 ++++++++-
drivers/net/wireless/ti/wlcore/wl12xx.h | 1 +
drivers/net/wireless/ti/wlcore/wlcore.h | 3 +++
3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/drivers/net/wireless/ti/wlcore/main.c b/drivers/net/wireless/ti/wlcore/main.c
index 45fe911..3cd2ddd 100644
--- a/drivers/net/wireless/ti/wlcore/main.c
+++ b/drivers/net/wireless/ti/wlcore/main.c
@@ -1766,6 +1766,7 @@ static void wl1271_op_stop(struct ieee80211_hw *hw)

wl->rx_counter = 0;
wl->power_level = WL1271_DEFAULT_POWER_LEVEL;
+ wl->channel_type = NL80211_CHAN_NO_HT;
wl->tx_blocks_available = 0;
wl->tx_allocated_blocks = 0;
wl->tx_results_count = 0;
@@ -1918,6 +1919,7 @@ static int wl12xx_init_vif_data(struct wl1271 *wl, struct ieee80211_vif *vif)
wlvif->band = wl->band;
wlvif->channel = wl->channel;
wlvif->power_level = wl->power_level;
+ wlvif->channel_type = wl->channel_type;

INIT_WORK(&wlvif->rx_streaming_enable_work,
wl1271_rx_streaming_enable_work);
@@ -2468,11 +2470,13 @@ static int wl12xx_config_vif(struct wl1271 *wl, struct wl12xx_vif *wlvif,
/* if the channel changes while joined, join again */
if (changed & IEEE80211_CONF_CHANGE_CHANNEL &&
((wlvif->band != conf->channel->band) ||
- (wlvif->channel != channel))) {
+ (wlvif->channel != channel) ||
+ (wlvif->channel_type != conf->channel_type))) {
/* send all pending packets */
wl1271_tx_work_locked(wl);
wlvif->band = conf->channel->band;
wlvif->channel = channel;
+ wlvif->channel_type = conf->channel_type;

if (!is_ap) {
/*
@@ -2592,6 +2596,7 @@ static int wl1271_op_config(struct ieee80211_hw *hw, u32 changed)
if (changed & IEEE80211_CONF_CHANGE_CHANNEL) {
wl->band = conf->channel->band;
wl->channel = channel;
+ wl->channel_type = conf->channel_type;
}

if (changed & IEEE80211_CONF_CHANGE_POWER)
@@ -3703,6 +3708,7 @@ sta_not_found:
u32 rates;
int ieoffset;
wlvif->aid = bss_conf->aid;
+ wlvif->channel_type = bss_conf->channel_type;
wlvif->beacon_int = bss_conf->beacon_int;
do_join = true;
set_assoc = true;
@@ -5116,6 +5122,7 @@ struct ieee80211_hw *wlcore_alloc_hw(size_t priv_size)
wl->rx_counter = 0;
wl->power_level = WL1271_DEFAULT_POWER_LEVEL;
wl->band = IEEE80211_BAND_2GHZ;
+ wl->channel_type = NL80211_CHAN_NO_HT;
wl->flags = 0;
wl->sg_enabled = true;
wl->hw_pg_ver = -1;
diff --git a/drivers/net/wireless/ti/wlcore/wl12xx.h b/drivers/net/wireless/ti/wlcore/wl12xx.h
index f12bdf7..05e6f74 100644
--- a/drivers/net/wireless/ti/wlcore/wl12xx.h
+++ b/drivers/net/wireless/ti/wlcore/wl12xx.h
@@ -367,6 +367,7 @@ struct wl12xx_vif {
/* The current band */
enum ieee80211_band band;
int channel;
+ enum nl80211_channel_type channel_type;

u32 bitrate_masks[IEEE80211_NUM_BANDS];
u32 basic_rate_set;
diff --git a/drivers/net/wireless/ti/wlcore/wlcore.h b/drivers/net/wireless/ti/wlcore/wlcore.h
index 2922d8a..83c43c9 100644
--- a/drivers/net/wireless/ti/wlcore/wlcore.h
+++ b/drivers/net/wireless/ti/wlcore/wlcore.h
@@ -362,6 +362,9 @@ struct wl1271 {

/* RX Data filter rule state - enabled/disabled */
bool rx_filter_enabled[WL1271_MAX_RX_FILTERS];
+
+ /* the current channel type */
+ enum nl80211_channel_type channel_type;
};

int __devinit wlcore_probe(struct wl1271 *wl, struct platform_device *pdev);
--
1.7.9.5

2012-06-05 14:04:40

by Luciano Coelho

[permalink] [raw]

Subject: Re: [PATCH 00/78] 18xx chip support

On Thu, 2012-05-10 at 12:13 +0300, Arik Nemtsov wrote:
> This series adds initial support for the 18xx chip family. The new
> module uses wlcore for functionality common with the 12xx family.
>
> Arik Nemtsov (28):
> wl18xx: create per-chip-family private storage
> wl18xx: set the number of Tx descriptors
> wl18xx: set normal/GEM Tx spare block counts
> wl18xx: implement hw op for calculating hw block count per packet
> wl18xx: implement hw op for setting blocks in hw_tx_desc
> wl18xx: implement hw op for setting frame length in tx_hw_desc
> wl18xx: define HW-rate translation elements/tables
> wl18xx: add fw_status private data
> wl18xx: set Rx block-size alignment quirk
> wl18xx: implement hw op for getting rx buffer data alignment
> wl18xx: implement hw op for getting rx packet data length
> wl18xx: implement immediate Tx completion
> wlcore/wl18xx: add hw op for setting Tx HW checksum
> wlcore/wl18xx: add hw op for Rx HW checksum
> wlcore: track current channel type per vif
> wl18xx: send channel type to FW on role start
> wl18xx: ipmlement ap_rate_mask hw op
> wlcore: support peer MIMO rates
> wlcore/wl18xx: enable MIMO/wide-chan rates in AP-mode rate config
> wl18xx: set HT capabilities
> wl18xx: add module param for overriding HT caps
> wl18xx: read FW pc on recovery
> wl18xx: disable FW log functionality
> wl18xx: implement hw op to read PG version
> wl18xx: init Tx-released index to 0 on HW init
> wl18xx: don't upload NVS to FW
> wl18xx: change board type enum according to new FW
> wlcore/wl12xx/18xx: split fw_status struct into two
>
> Assaf Azulay (1):
> wl18xx: change default tcp_checksum to false
>
> Luciano Coelho (49):
> wl18xx: add new module
> wlcore_sdio/wl18xx: use SDIO revision number to identify wl18xx chips
> wl18xx: add empty operations struct
> wl18xx: add partition table
> wl18xx: add register table
> wl18xx: add identify chip operation
> wl18xx: add some boot operations and hw-specific configurations
> wl18xx: add trigger command and ack event operations
> wl18xx: add hw_init operation
> wl18xx: add runtime configuration parameters
> wl18xx: add board type module argument
> wl18xx: translate and write the board type to SCR_PAD2
> wl18xx: read clock frequency and do top init accordingly
> wlcore: rename wl12xx.h to wlcore_i.h
> wlcore/wl12xx: move ref_clock and tcxo_clock elements to wl12xx
> wlcore/wl12xx: move rx_mem_pool_addr element to wl12xx
> wlcore/wl12xx: add plt_init op and move the code to wl12xx
> wl18xx: add plt_init operation
> wl18xx: change the low_band_component_type for HDK boards
> wl18xx: add number of antennas and dc2dc type as module params
> wl18xx: add module parameter to disable TCP checksum
> wl18xx: derive the MAC address from the BD_ADDR in fuse ROM
> wl18xx: add a module parameter to control 11a support
> wlcore: add module parameter to dump SDIO reads and writes
> wl18xx: copy the default configuration before checking the board_type
> wl18xx: changed default board_type to HDK
> wlcore: add space for private area when allocating fw_status
> wl18xx: change low_band_component_type value for COM8
> wlcore: reorder identify_chip and get_hw_info
> wl18xx: disable MCS_13 for wl18xx PG 1.0
> wlcore: update beacon and probe_resp templates when rates change
> wlcore: use all AP basic rates as default
> wlcore: abstract debugfs fw_stats to be handled by the lower drivers
> wlcore: add debugfs macro to help print fw statistics arrays
> wl12xx: implement fw status debugfs entries
> wl18xx: implement fw status debugfs entries
> wlcore: create private static_data area and add operation to parse it
> wl18xx: print the PHY firmware version from the private static data
> wlcore: print the interrupt status when recovery is triggered
> wl18xx: don't use MIMO when ht_mode is set to wide
> wlcore: use proper values for supported local rates
> wl18xx: add module parameter to force SISO 20MHz
> wl18xx: add power limit reference value to mac_and_phy settings
> wl18xx: export low/high band component values as module params
> wl18xx: export pwr_limit_reference_11_abg value as a module parameter
> wlcore/wl12xx/wl18xx: move lower driver debugfs to a subdir
> wlcore: increase aggregation buffer size by one page
> wl18xx: increase tx_ba_win_size to 64
> wl18xx: use new fw stats structures

Applied and pushed this whole series to wl12xx/master.

--
Cheers,
Luca.