* [PATCH 01/13] wl1271: remove unecessary qual parameter from rx status
2009-08-27 20:59 [PATCH 00/13] wl1271: patch set with various improvements Luciano Coelho
@ 2009-08-27 20:59 ` Luciano Coelho
2009-08-27 20:59 ` [PATCH 02/13] wl1271: Correction to TX block allocation calculation Luciano Coelho
` (12 subsequent siblings)
13 siblings, 0 replies; 23+ messages in thread
From: Luciano Coelho @ 2009-08-27 20:59 UTC (permalink / raw)
To: linville; +Cc: linux-wireless, juuso.oikarinen, kalle.valo
The qual element in ieee80211_rx_status is not used anymore, so we don't need
to set it in the wl1271_rx_status() function. This saves a bit of time in
the RX path.
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
---
drivers/net/wireless/wl12xx/wl1271_rx.c | 6 ------
1 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/drivers/net/wireless/wl12xx/wl1271_rx.c b/drivers/net/wireless/wl12xx/wl1271_rx.c
index ad8b690..5d8d401 100644
--- a/drivers/net/wireless/wl12xx/wl1271_rx.c
+++ b/drivers/net/wireless/wl12xx/wl1271_rx.c
@@ -91,12 +91,6 @@ static void wl1271_rx_status(struct wl1271 *wl,
*/
status->signal = desc->rssi;
- /* FIXME: Should this be optimized? */
- status->qual = (desc->rssi - WL1271_RX_MIN_RSSI) * 100 /
- (WL1271_RX_MAX_RSSI - WL1271_RX_MIN_RSSI);
- status->qual = min(status->qual, 100);
- status->qual = max(status->qual, 0);
-
/*
* FIXME: In wl1251, the SNR should be divided by two. In wl1271 we
* need to divide by two for now, but TI has been discussing about
--
1.5.6.5
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PATCH 02/13] wl1271: Correction to TX block allocation calculation
2009-08-27 20:59 [PATCH 00/13] wl1271: patch set with various improvements Luciano Coelho
2009-08-27 20:59 ` [PATCH 01/13] wl1271: remove unecessary qual parameter from rx status Luciano Coelho
@ 2009-08-27 20:59 ` Luciano Coelho
2009-08-27 20:59 ` [PATCH 03/13] wl1271: Security sequence number handling for TX (for WPA) Luciano Coelho
` (11 subsequent siblings)
13 siblings, 0 replies; 23+ messages in thread
From: Luciano Coelho @ 2009-08-27 20:59 UTC (permalink / raw)
To: linville; +Cc: linux-wireless, juuso.oikarinen, kalle.valo
From: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Correct the TX path implementation to allocate sufficient blocks in the
firmware for TX packets.
Signed-off-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Reviewed-by: Kalle Valo <kalle.valo@nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
---
drivers/net/wireless/wl12xx/wl1271_tx.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/wireless/wl12xx/wl1271_tx.c b/drivers/net/wireless/wl12xx/wl1271_tx.c
index ff22125..0c19688 100644
--- a/drivers/net/wireless/wl12xx/wl1271_tx.c
+++ b/drivers/net/wireless/wl12xx/wl1271_tx.c
@@ -58,7 +58,7 @@ static int wl1271_tx_allocate(struct wl1271 *wl, struct sk_buff *skb, u32 extra)
/* approximate the number of blocks required for this packet
in the firmware */
/* FIXME: try to figure out what is done here and make it cleaner */
- total_blocks = (skb->len) >> TX_HW_BLOCK_SHIFT_DIV;
+ total_blocks = (total_len) >> TX_HW_BLOCK_SHIFT_DIV;
excluded = (total_blocks << 2) + (skb->len & 0xff) + 34;
total_blocks += (excluded > 252) ? 2 : 1;
total_blocks += TX_HW_BLOCK_SPARE;
--
1.5.6.5
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PATCH 03/13] wl1271: Security sequence number handling for TX (for WPA)
2009-08-27 20:59 [PATCH 00/13] wl1271: patch set with various improvements Luciano Coelho
2009-08-27 20:59 ` [PATCH 01/13] wl1271: remove unecessary qual parameter from rx status Luciano Coelho
2009-08-27 20:59 ` [PATCH 02/13] wl1271: Correction to TX block allocation calculation Luciano Coelho
@ 2009-08-27 20:59 ` Luciano Coelho
2009-08-27 20:59 ` [PATCH 04/13] wl1271: Correct TKIP header space handling in TX path Luciano Coelho
` (10 subsequent siblings)
13 siblings, 0 replies; 23+ messages in thread
From: Luciano Coelho @ 2009-08-27 20:59 UTC (permalink / raw)
To: linville; +Cc: linux-wireless, juuso.oikarinen, kalle.valo
From: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Add security sequence number handling to the driver TX data path needed
by WPA.
Signed-off-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Reviewed-by: Kalle Valo <kalle.valo@nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
---
drivers/net/wireless/wl12xx/wl1271.h | 5 +++++
drivers/net/wireless/wl12xx/wl1271_cmd.c | 11 +++++++++--
drivers/net/wireless/wl12xx/wl1271_cmd.h | 3 ++-
drivers/net/wireless/wl12xx/wl1271_main.c | 13 +++++++++++--
drivers/net/wireless/wl12xx/wl1271_tx.c | 11 +++++++++++
5 files changed, 38 insertions(+), 5 deletions(-)
diff --git a/drivers/net/wireless/wl12xx/wl1271.h b/drivers/net/wireless/wl12xx/wl1271.h
index 55818f9..e575dcc 100644
--- a/drivers/net/wireless/wl12xx/wl1271.h
+++ b/drivers/net/wireless/wl12xx/wl1271.h
@@ -337,6 +337,11 @@ struct wl1271 {
/* Pending TX frames */
struct sk_buff *tx_frames[16];
+ /* Security sequence number counters */
+ u8 tx_security_last_seq;
+ u16 tx_security_seq_16;
+ u32 tx_security_seq_32;
+
/* FW Rx counter */
u32 rx_counter;
diff --git a/drivers/net/wireless/wl12xx/wl1271_cmd.c b/drivers/net/wireless/wl12xx/wl1271_cmd.c
index 2a4351f..1ee1b2b 100644
--- a/drivers/net/wireless/wl12xx/wl1271_cmd.c
+++ b/drivers/net/wireless/wl12xx/wl1271_cmd.c
@@ -228,6 +228,10 @@ int wl1271_cmd_join(struct wl1271 *wl, u8 bss_type, u8 dtim_interval,
join->ctrl |= wl->session_counter << WL1271_JOIN_CMD_TX_SESSION_OFFSET;
+ /* reset TX security counters */
+ wl->tx_security_last_seq = 0;
+ wl->tx_security_seq_16 = 0;
+ wl->tx_security_seq_32 = 0;
ret = wl1271_cmd_send(wl, CMD_START_JOIN, join, sizeof(*join));
if (ret < 0) {
@@ -759,7 +763,8 @@ out:
}
int wl1271_cmd_set_key(struct wl1271 *wl, u16 action, u8 id, u8 key_type,
- u8 key_size, const u8 *key, const u8 *addr)
+ u8 key_size, const u8 *key, const u8 *addr,
+ u32 tx_seq_32, u16 tx_seq_16)
{
struct wl1271_cmd_set_keys *cmd;
int ret = 0;
@@ -777,12 +782,14 @@ int wl1271_cmd_set_key(struct wl1271 *wl, u16 action, u8 id, u8 key_type,
cmd->key_size = key_size;
cmd->key_type = key_type;
+ cmd->ac_seq_num16[0] = tx_seq_16;
+ cmd->ac_seq_num32[0] = tx_seq_32;
+
/* we have only one SSID profile */
cmd->ssid_profile = 0;
cmd->id = id;
- /* FIXME: this is from wl1251, needs to be checked */
if (key_type == KEY_TKIP) {
/*
* We get the key in the following form:
diff --git a/drivers/net/wireless/wl12xx/wl1271_cmd.h b/drivers/net/wireless/wl12xx/wl1271_cmd.h
index 951a844..7c4d3aa 100644
--- a/drivers/net/wireless/wl12xx/wl1271_cmd.h
+++ b/drivers/net/wireless/wl12xx/wl1271_cmd.h
@@ -49,7 +49,8 @@ int wl1271_cmd_build_ps_poll(struct wl1271 *wl, u16 aid);
int wl1271_cmd_build_probe_req(struct wl1271 *wl, u8 *ssid, size_t ssid_len);
int wl1271_cmd_set_default_wep_key(struct wl1271 *wl, u8 id);
int wl1271_cmd_set_key(struct wl1271 *wl, u16 action, u8 id, u8 key_type,
- u8 key_size, const u8 *key, const u8 *addr);
+ u8 key_size, const u8 *key, const u8 *addr,
+ u32 tx_seq_32, u16 tx_seq_16);
enum wl1271_commands {
CMD_INTERROGATE = 1, /*use this to read information elements*/
diff --git a/drivers/net/wireless/wl12xx/wl1271_main.c b/drivers/net/wireless/wl12xx/wl1271_main.c
index d9169b4..7faa65f 100644
--- a/drivers/net/wireless/wl12xx/wl1271_main.c
+++ b/drivers/net/wireless/wl12xx/wl1271_main.c
@@ -592,6 +592,9 @@ static void wl1271_op_stop(struct ieee80211_hw *hw)
wl->tx_blocks_available = 0;
wl->tx_results_count = 0;
wl->tx_packets_count = 0;
+ wl->tx_security_last_seq = 0;
+ wl->tx_security_seq_16 = 0;
+ wl->tx_security_seq_32 = 0;
wl->time_offset = 0;
wl->session_counter = 0;
for (i = 0; i < NUM_TX_QUEUES; i++)
@@ -824,6 +827,8 @@ static int wl1271_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
struct wl1271 *wl = hw->priv;
const u8 *addr;
int ret;
+ u32 tx_seq_32 = 0;
+ u16 tx_seq_16 = 0;
u8 key_type;
static const u8 bcast_addr[ETH_ALEN] =
@@ -862,11 +867,15 @@ static int wl1271_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
key_type = KEY_TKIP;
key_conf->hw_key_idx = key_conf->keyidx;
+ tx_seq_32 = wl->tx_security_seq_32;
+ tx_seq_16 = wl->tx_security_seq_16;
break;
case ALG_CCMP:
key_type = KEY_AES;
key_conf->flags |= IEEE80211_KEY_FLAG_GENERATE_IV;
+ tx_seq_32 = wl->tx_security_seq_32;
+ tx_seq_16 = wl->tx_security_seq_16;
break;
default:
wl1271_error("Unknown key algo 0x%x", key_conf->alg);
@@ -880,7 +889,7 @@ static int wl1271_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
ret = wl1271_cmd_set_key(wl, KEY_ADD_OR_REPLACE,
key_conf->keyidx, key_type,
key_conf->keylen, key_conf->key,
- addr);
+ addr, tx_seq_32, tx_seq_16);
if (ret < 0) {
wl1271_error("Could not add or replace key");
goto out_sleep;
@@ -891,7 +900,7 @@ static int wl1271_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
ret = wl1271_cmd_set_key(wl, KEY_REMOVE,
key_conf->keyidx, key_type,
key_conf->keylen, key_conf->key,
- addr);
+ addr, 0, 0);
if (ret < 0) {
wl1271_error("Could not remove key");
goto out_sleep;
diff --git a/drivers/net/wireless/wl12xx/wl1271_tx.c b/drivers/net/wireless/wl12xx/wl1271_tx.c
index 0c19688..162f026 100644
--- a/drivers/net/wireless/wl12xx/wl1271_tx.c
+++ b/drivers/net/wireless/wl12xx/wl1271_tx.c
@@ -258,6 +258,7 @@ static void wl1271_tx_complete_packet(struct wl1271 *wl,
struct ieee80211_tx_info *info;
struct sk_buff *skb;
u32 header_len;
+ u16 seq;
int id = result->id;
/* check for id legality */
@@ -284,6 +285,16 @@ static void wl1271_tx_complete_packet(struct wl1271 *wl,
/* info->status.retry_count = result->ack_failures; */
wl->stats.retry_count += result->ack_failures;
+ /* update security sequence number */
+ seq = wl->tx_security_seq_16 +
+ (result->lsb_security_sequence_number -
+ wl->tx_security_last_seq);
+ wl->tx_security_last_seq = result->lsb_security_sequence_number;
+
+ if (seq < wl->tx_security_seq_16)
+ wl->tx_security_seq_32++;
+ wl->tx_security_seq_16 = seq;
+
/* get header len */
if (info->control.hw_key &&
info->control.hw_key->alg == ALG_TKIP)
--
1.5.6.5
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PATCH 04/13] wl1271: Correct TKIP header space handling in TX path
2009-08-27 20:59 [PATCH 00/13] wl1271: patch set with various improvements Luciano Coelho
` (2 preceding siblings ...)
2009-08-27 20:59 ` [PATCH 03/13] wl1271: Security sequence number handling for TX (for WPA) Luciano Coelho
@ 2009-08-27 20:59 ` Luciano Coelho
2009-08-27 20:59 ` [PATCH 05/13] wl1271: Implement delayed entry into ELP Luciano Coelho
` (9 subsequent siblings)
13 siblings, 0 replies; 23+ messages in thread
From: Luciano Coelho @ 2009-08-27 20:59 UTC (permalink / raw)
To: linville; +Cc: linux-wireless, juuso.oikarinen, kalle.valo
From: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Correct the position to which TKIP header space is appended for TX
packets.
Signed-off-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Reviewed-by: Vidhya Govindan <vidhya.govindan@nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
---
drivers/net/wireless/wl12xx/wl1271_main.c | 9 +++------
drivers/net/wireless/wl12xx/wl1271_tx.c | 27 +++++++++++++++++----------
2 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/drivers/net/wireless/wl12xx/wl1271_main.c b/drivers/net/wireless/wl12xx/wl1271_main.c
index 7faa65f..4fb6138 100644
--- a/drivers/net/wireless/wl12xx/wl1271_main.c
+++ b/drivers/net/wireless/wl12xx/wl1271_main.c
@@ -1161,12 +1161,9 @@ static int wl1271_register_hw(struct wl1271 *wl)
static int wl1271_init_ieee80211(struct wl1271 *wl)
{
- /*
- * The tx descriptor buffer and the TKIP space.
- *
- * FIXME: add correct 1271 descriptor size
- */
- wl->hw->extra_tx_headroom = WL1271_TKIP_IV_SPACE;
+ /* The tx descriptor buffer and the TKIP space. */
+ wl->hw->extra_tx_headroom = WL1271_TKIP_IV_SPACE +
+ sizeof(struct wl1271_tx_hw_descr);
/* unit us */
/* FIXME: find a proper value */
diff --git a/drivers/net/wireless/wl12xx/wl1271_tx.c b/drivers/net/wireless/wl12xx/wl1271_tx.c
index 162f026..1ad1bc3 100644
--- a/drivers/net/wireless/wl12xx/wl1271_tx.c
+++ b/drivers/net/wireless/wl12xx/wl1271_tx.c
@@ -92,6 +92,14 @@ static int wl1271_tx_fill_hdr(struct wl1271 *wl, struct sk_buff *skb,
desc = (struct wl1271_tx_hw_descr *) skb->data;
+ /* relocate space for security header */
+ if (extra) {
+ void *framestart = skb->data + sizeof(*desc);
+ u16 fc = *(u16 *)(framestart + extra);
+ int hdrlen = ieee80211_hdrlen(fc);
+ memmove(framestart, framestart + extra, hdrlen);
+ }
+
/* configure packet life time */
desc->start_time = jiffies_to_usecs(jiffies) - wl->time_offset;
desc->life_time = TX_HW_MGMT_PKT_LIFETIME_TU;
@@ -257,7 +265,6 @@ static void wl1271_tx_complete_packet(struct wl1271 *wl,
struct ieee80211_tx_info *info;
struct sk_buff *skb;
- u32 header_len;
u16 seq;
int id = result->id;
@@ -295,22 +302,22 @@ static void wl1271_tx_complete_packet(struct wl1271 *wl,
wl->tx_security_seq_32++;
wl->tx_security_seq_16 = seq;
- /* get header len */
+ /* remove private header from packet */
+ skb_pull(skb, sizeof(struct wl1271_tx_hw_descr));
+
+ /* remove TKIP header space if present */
if (info->control.hw_key &&
- info->control.hw_key->alg == ALG_TKIP)
- header_len = WL1271_TKIP_IV_SPACE +
- sizeof(struct wl1271_tx_hw_descr);
- else
- header_len = sizeof(struct wl1271_tx_hw_descr);
+ info->control.hw_key->alg == ALG_TKIP) {
+ int hdrlen = ieee80211_get_hdrlen_from_skb(skb);
+ memmove(skb->data + WL1271_TKIP_IV_SPACE, skb->data, hdrlen);
+ skb_pull(skb, WL1271_TKIP_IV_SPACE);
+ }
wl1271_debug(DEBUG_TX, "tx status id %u skb 0x%p failures %u rate 0x%x"
" status 0x%x",
result->id, skb, result->ack_failures,
result->rate_class_index, result->status);
- /* remove private header from packet */
- skb_pull(skb, header_len);
-
/* return the packet to the stack */
ieee80211_tx_status(wl->hw, skb);
wl->tx_frames[result->id] = NULL;
--
1.5.6.5
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PATCH 05/13] wl1271: Implement delayed entry into ELP
2009-08-27 20:59 [PATCH 00/13] wl1271: patch set with various improvements Luciano Coelho
` (3 preceding siblings ...)
2009-08-27 20:59 ` [PATCH 04/13] wl1271: Correct TKIP header space handling in TX path Luciano Coelho
@ 2009-08-27 20:59 ` Luciano Coelho
2009-08-27 21:00 ` [PATCH 06/13] wl1271: mask aid bits 14 and 15 in ps-poll template Luciano Coelho
` (8 subsequent siblings)
13 siblings, 0 replies; 23+ messages in thread
From: Luciano Coelho @ 2009-08-27 20:59 UTC (permalink / raw)
To: linville; +Cc: linux-wireless, juuso.oikarinen, kalle.valo
From: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Implement delayed entry into ELP. This will promote the following:
- Less redundant sleep/wake cycles (better perf)
- Avoids known firmware issues with going to ELP too fast after an
operation
Signed-off-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Reviewed-by: Vidhya Govindan <vidhya.govindan@nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
---
drivers/net/wireless/wl12xx/wl1271.h | 1 +
drivers/net/wireless/wl12xx/wl1271_main.c | 1 +
drivers/net/wireless/wl12xx/wl1271_ps.c | 46 ++++++++++++++++++++---------
drivers/net/wireless/wl12xx/wl1271_ps.h | 2 +-
4 files changed, 35 insertions(+), 15 deletions(-)
diff --git a/drivers/net/wireless/wl12xx/wl1271.h b/drivers/net/wireless/wl12xx/wl1271.h
index e575dcc..c455dcb 100644
--- a/drivers/net/wireless/wl12xx/wl1271.h
+++ b/drivers/net/wireless/wl12xx/wl1271.h
@@ -373,6 +373,7 @@ struct wl1271 {
bool elp;
struct completion *elp_compl;
+ struct delayed_work elp_work;
/* we can be in psm, but not in elp, we have to differentiate */
bool psm;
diff --git a/drivers/net/wireless/wl12xx/wl1271_main.c b/drivers/net/wireless/wl12xx/wl1271_main.c
index 4fb6138..1a5e575 100644
--- a/drivers/net/wireless/wl12xx/wl1271_main.c
+++ b/drivers/net/wireless/wl12xx/wl1271_main.c
@@ -1227,6 +1227,7 @@ static int __devinit wl1271_probe(struct spi_device *spi)
skb_queue_head_init(&wl->tx_queue);
INIT_WORK(&wl->filter_work, wl1271_filter_work);
+ INIT_DELAYED_WORK(&wl->elp_work, wl1271_elp_work);
wl->channel = WL1271_DEFAULT_CHANNEL;
wl->scanning = false;
wl->default_key = 0;
diff --git a/drivers/net/wireless/wl12xx/wl1271_ps.c b/drivers/net/wireless/wl12xx/wl1271_ps.c
index 1dc74b0..7a3b53e 100644
--- a/drivers/net/wireless/wl12xx/wl1271_ps.c
+++ b/drivers/net/wireless/wl12xx/wl1271_ps.c
@@ -27,25 +27,43 @@
#define WL1271_WAKEUP_TIMEOUT 500
-/* Routines to toggle sleep mode while in ELP */
-void wl1271_ps_elp_sleep(struct wl1271 *wl)
+void wl1271_elp_work(struct work_struct *work)
{
+ struct delayed_work *dwork;
+ struct wl1271 *wl;
+
+ dwork = container_of(work, struct delayed_work, work);
+ wl = container_of(dwork, struct wl1271, elp_work);
+
+ wl1271_debug(DEBUG_PSM, "elp work");
+
+ mutex_lock(&wl->mutex);
+
/*
- * FIXME: due to a problem in the firmware (causing a firmware
- * crash), ELP entry is prevented below. Remove the "true" to
- * re-enable ELP entry.
+ * FIXME: below, by means of the "true", ELP has been disabled for now
+ * to work around a firmware bug. To be enabled upon receiving a new
+ * firmware version.
*/
if (true || wl->elp || !wl->psm)
- return;
+ goto out;
- /*
- * Go to ELP unless there is work already pending - pending work
- * will immediately wakeup the chipset anyway.
- */
- if (!work_pending(&wl->irq_work) && !work_pending(&wl->tx_work)) {
- wl1271_debug(DEBUG_PSM, "chip to elp");
- wl1271_write32(wl, HW_ACCESS_ELP_CTRL_REG_ADDR, ELPCTRL_SLEEP);
- wl->elp = true;
+ wl1271_debug(DEBUG_PSM, "chip to elp");
+ wl1271_write32(wl, HW_ACCESS_ELP_CTRL_REG_ADDR, ELPCTRL_SLEEP);
+ wl->elp = true;
+
+out:
+ mutex_unlock(&wl->mutex);
+}
+
+#define ELP_ENTRY_DELAY 5
+
+/* Routines to toggle sleep mode while in ELP */
+void wl1271_ps_elp_sleep(struct wl1271 *wl)
+{
+ if (wl->psm) {
+ cancel_delayed_work(&wl->elp_work);
+ queue_delayed_work(wl->hw->workqueue, &wl->elp_work,
+ msecs_to_jiffies(ELP_ENTRY_DELAY));
}
}
diff --git a/drivers/net/wireless/wl12xx/wl1271_ps.h b/drivers/net/wireless/wl12xx/wl1271_ps.h
index de2bd3c..779653d 100644
--- a/drivers/net/wireless/wl12xx/wl1271_ps.h
+++ b/drivers/net/wireless/wl12xx/wl1271_ps.h
@@ -30,6 +30,6 @@
int wl1271_ps_set_mode(struct wl1271 *wl, enum wl1271_cmd_ps_mode mode);
void wl1271_ps_elp_sleep(struct wl1271 *wl);
int wl1271_ps_elp_wakeup(struct wl1271 *wl, bool chip_awake);
-
+void wl1271_elp_work(struct work_struct *work);
#endif /* __WL1271_PS_H__ */
--
1.5.6.5
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PATCH 06/13] wl1271: mask aid bits 14 and 15 in ps-poll template
2009-08-27 20:59 [PATCH 00/13] wl1271: patch set with various improvements Luciano Coelho
` (4 preceding siblings ...)
2009-08-27 20:59 ` [PATCH 05/13] wl1271: Implement delayed entry into ELP Luciano Coelho
@ 2009-08-27 21:00 ` Luciano Coelho
2009-08-27 21:00 ` [PATCH 07/13] wl1271: Implementation for SPI busy word checking Luciano Coelho
` (7 subsequent siblings)
13 siblings, 0 replies; 23+ messages in thread
From: Luciano Coelho @ 2009-08-27 21:00 UTC (permalink / raw)
To: linville; +Cc: linux-wireless, juuso.oikarinen, kalle.valo
From: Juuso Oikarinen <juuso.oikarinen@nokia.com>
In ps-poll template aid bits 14 and 15 were not masked as required by
the standard. Mask them so that aid is sent in correct format.
This patch is a direct port of the respective patch for the wl1251
driver by Kalle Valo.
Signed-off-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Reviewed-by: Vidhya Govindan <vidhya.govindan@nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
---
drivers/net/wireless/wl12xx/wl1271_cmd.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/drivers/net/wireless/wl12xx/wl1271_cmd.c b/drivers/net/wireless/wl12xx/wl1271_cmd.c
index 1ee1b2b..bd65b38 100644
--- a/drivers/net/wireless/wl12xx/wl1271_cmd.c
+++ b/drivers/net/wireless/wl12xx/wl1271_cmd.c
@@ -682,7 +682,10 @@ int wl1271_cmd_build_ps_poll(struct wl1271 *wl, u16 aid)
memcpy(template.bssid, wl->bssid, ETH_ALEN);
memcpy(template.ta, wl->mac_addr, ETH_ALEN);
- template.aid = aid;
+
+ /* aid in PS-Poll has its two MSBs each set to 1 */
+ template.aid = cpu_to_le16(1 << 15 | 1 << 14 | aid);
+
template.fc = cpu_to_le16(IEEE80211_FTYPE_CTL | IEEE80211_STYPE_PSPOLL);
return wl1271_cmd_template_set(wl, CMD_TEMPL_PS_POLL, &template,
--
1.5.6.5
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PATCH 07/13] wl1271: Implementation for SPI busy word checking
2009-08-27 20:59 [PATCH 00/13] wl1271: patch set with various improvements Luciano Coelho
` (5 preceding siblings ...)
2009-08-27 21:00 ` [PATCH 06/13] wl1271: mask aid bits 14 and 15 in ps-poll template Luciano Coelho
@ 2009-08-27 21:00 ` Luciano Coelho
2009-08-27 21:00 ` [PATCH 08/13] wl1271: Configure rate policies based on AP rates Luciano Coelho
` (6 subsequent siblings)
13 siblings, 0 replies; 23+ messages in thread
From: Luciano Coelho @ 2009-08-27 21:00 UTC (permalink / raw)
To: linville; +Cc: linux-wireless, juuso.oikarinen, kalle.valo
From: Juuso Oikarinen <juuso.oikarinen@nokia.com>
This patch adds implementation for checking for SPI busy words - i.e.
honoring a delay request from the WLAN chipset upon reading
registers/memory.
To optimized the average SPI ready by 32 bits, also configure the number
of busywords to one to disable the "fixed-busy-word" functionality.
Signed-off-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Reviewed-by: Vidhya Govindan <vidhya.govindan@nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
---
drivers/net/wireless/wl12xx/wl1271.h | 10 +++-
drivers/net/wireless/wl12xx/wl1271_spi.c | 69 +++++++++++++++++++++++++++++-
2 files changed, 75 insertions(+), 4 deletions(-)
diff --git a/drivers/net/wireless/wl12xx/wl1271.h b/drivers/net/wireless/wl12xx/wl1271.h
index c455dcb..957da8c 100644
--- a/drivers/net/wireless/wl12xx/wl1271.h
+++ b/drivers/net/wireless/wl12xx/wl1271.h
@@ -107,7 +107,13 @@ enum {
#define WL1271_FW_NAME "wl1271-fw.bin"
#define WL1271_NVS_NAME "wl1271-nvs.bin"
-#define WL1271_BUSY_WORD_LEN 8
+/*
+ * FIXME: for the wl1271, a busy word count of 1 here will result in a more
+ * optimal SPI interface. There is some SPI bug however, causing RXS time outs
+ * with this mode occasionally on boot, so lets have two for now.
+ */
+#define WL1271_BUSY_WORD_CNT 2
+#define WL1271_BUSY_WORD_LEN (WL1271_BUSY_WORD_CNT * sizeof(u32))
#define WL1271_ELP_HW_STATE_ASLEEP 0
#define WL1271_ELP_HW_STATE_IRQ 1
@@ -389,7 +395,7 @@ struct wl1271 {
u32 buffer_32;
u32 buffer_cmd;
- u8 buffer_busyword[WL1271_BUSY_WORD_LEN];
+ u32 buffer_busyword[WL1271_BUSY_WORD_CNT];
struct wl1271_rx_descriptor *rx_descriptor;
struct wl1271_fw_status *fw_status;
diff --git a/drivers/net/wireless/wl12xx/wl1271_spi.c b/drivers/net/wireless/wl12xx/wl1271_spi.c
index 4a12880..504991a 100644
--- a/drivers/net/wireless/wl12xx/wl1271_spi.c
+++ b/drivers/net/wireless/wl12xx/wl1271_spi.c
@@ -244,12 +244,75 @@ int wl1271_set_partition(struct wl1271 *wl,
return 0;
}
+#define WL1271_BUSY_WORD_TIMEOUT 1000
+
+void wl1271_spi_read_busy(struct wl1271 *wl, void *buf, size_t len)
+{
+ struct spi_transfer t[1];
+ struct spi_message m;
+ u32 *busy_buf;
+ int num_busy_bytes = 0;
+
+ wl1271_info("spi read BUSY!");
+
+ /*
+ * Look for the non-busy word in the read buffer, and if found,
+ * read in the remaining data into the buffer.
+ */
+ busy_buf = (u32 *)buf;
+ for (; (u32)busy_buf < (u32)buf + len; busy_buf++) {
+ num_busy_bytes += sizeof(u32);
+ if (*busy_buf & 0x1) {
+ spi_message_init(&m);
+ memset(t, 0, sizeof(t));
+ memmove(buf, busy_buf, len - num_busy_bytes);
+ t[0].rx_buf = buf + (len - num_busy_bytes);
+ t[0].len = num_busy_bytes;
+ spi_message_add_tail(&t[0], &m);
+ spi_sync(wl->spi, &m);
+ return;
+ }
+ }
+
+ /*
+ * Read further busy words from SPI until a non-busy word is
+ * encountered, then read the data itself into the buffer.
+ */
+ wl1271_info("spi read BUSY-polling needed!");
+
+ num_busy_bytes = WL1271_BUSY_WORD_TIMEOUT;
+ busy_buf = wl->buffer_busyword;
+ while (num_busy_bytes) {
+ num_busy_bytes--;
+ spi_message_init(&m);
+ memset(t, 0, sizeof(t));
+ t[0].rx_buf = busy_buf;
+ t[0].len = sizeof(u32);
+ spi_message_add_tail(&t[0], &m);
+ spi_sync(wl->spi, &m);
+
+ if (*busy_buf & 0x1) {
+ spi_message_init(&m);
+ memset(t, 0, sizeof(t));
+ t[0].rx_buf = buf;
+ t[0].len = len;
+ spi_message_add_tail(&t[0], &m);
+ spi_sync(wl->spi, &m);
+ return;
+ }
+ }
+
+ /* The SPI bus is unresponsive, the read failed. */
+ memset(buf, 0, len);
+ wl1271_error("SPI read busy-word timeout!\n");
+}
+
void wl1271_spi_read(struct wl1271 *wl, int addr, void *buf,
size_t len, bool fixed)
{
struct spi_transfer t[3];
struct spi_message m;
- u8 *busy_buf;
+ u32 *busy_buf;
u32 *cmd;
cmd = &wl->buffer_cmd;
@@ -281,7 +344,9 @@ void wl1271_spi_read(struct wl1271 *wl, int addr, void *buf,
spi_sync(wl->spi, &m);
- /* FIXME: check busy words */
+ /* Check busy words */
+ if (!(busy_buf[WL1271_BUSY_WORD_CNT - 1] & 0x1))
+ wl1271_spi_read_busy(wl, buf, len);
wl1271_dump(DEBUG_SPI, "spi_read cmd -> ", cmd, sizeof(*cmd));
wl1271_dump(DEBUG_SPI, "spi_read buf <- ", buf, len);
--
1.5.6.5
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PATCH 08/13] wl1271: Configure rate policies based on AP rates
2009-08-27 20:59 [PATCH 00/13] wl1271: patch set with various improvements Luciano Coelho
` (6 preceding siblings ...)
2009-08-27 21:00 ` [PATCH 07/13] wl1271: Implementation for SPI busy word checking Luciano Coelho
@ 2009-08-27 21:00 ` Luciano Coelho
2009-08-27 21:00 ` [PATCH 09/13] wl1271: Update join usage Luciano Coelho
` (5 subsequent siblings)
13 siblings, 0 replies; 23+ messages in thread
From: Luciano Coelho @ 2009-08-27 21:00 UTC (permalink / raw)
To: linville; +Cc: linux-wireless, juuso.oikarinen, kalle.valo
From: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Configure the rate policies to the firmware based on the rates given by
the AP.
Signed-off-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Reviewed-by: Luciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
---
drivers/net/wireless/wl12xx/wl1271.h | 3 ++
drivers/net/wireless/wl12xx/wl1271_acx.c | 4 +-
drivers/net/wireless/wl12xx/wl1271_acx.h | 2 +-
drivers/net/wireless/wl12xx/wl1271_init.c | 2 +-
drivers/net/wireless/wl12xx/wl1271_main.c | 31 +++++++++++++++++++++++++++++
5 files changed, 38 insertions(+), 4 deletions(-)
diff --git a/drivers/net/wireless/wl12xx/wl1271.h b/drivers/net/wireless/wl12xx/wl1271.h
index 957da8c..671dc5a 100644
--- a/drivers/net/wireless/wl12xx/wl1271.h
+++ b/drivers/net/wireless/wl12xx/wl1271.h
@@ -369,6 +369,9 @@ struct wl1271 {
/* Our association ID */
u16 aid;
+ /* The current band */
+ enum ieee80211_band band;
+
/* Default key (for WEP) */
u32 default_key;
diff --git a/drivers/net/wireless/wl12xx/wl1271_acx.c b/drivers/net/wireless/wl12xx/wl1271_acx.c
index f622a40..2ae1081 100644
--- a/drivers/net/wireless/wl12xx/wl1271_acx.c
+++ b/drivers/net/wireless/wl12xx/wl1271_acx.c
@@ -703,7 +703,7 @@ int wl1271_acx_statistics(struct wl1271 *wl, struct acx_statistics *stats)
return 0;
}
-int wl1271_acx_rate_policies(struct wl1271 *wl)
+int wl1271_acx_rate_policies(struct wl1271 *wl, u32 enabled_rates)
{
struct acx_rate_policy *acx;
int ret = 0;
@@ -719,7 +719,7 @@ int wl1271_acx_rate_policies(struct wl1271 *wl)
/* configure one default (one-size-fits-all) rate class */
acx->rate_class_cnt = 1;
- acx->rate_class[0].enabled_rates = ACX_RATE_MASK_ALL;
+ acx->rate_class[0].enabled_rates = enabled_rates;
acx->rate_class[0].short_retry_limit = ACX_RATE_RETRY_LIMIT;
acx->rate_class[0].long_retry_limit = ACX_RATE_RETRY_LIMIT;
acx->rate_class[0].aflags = 0;
diff --git a/drivers/net/wireless/wl12xx/wl1271_acx.h b/drivers/net/wireless/wl12xx/wl1271_acx.h
index 9068daa..55850eb 100644
--- a/drivers/net/wireless/wl12xx/wl1271_acx.h
+++ b/drivers/net/wireless/wl12xx/wl1271_acx.h
@@ -1209,7 +1209,7 @@ int wl1271_acx_set_preamble(struct wl1271 *wl, enum acx_preamble_type preamble);
int wl1271_acx_cts_protect(struct wl1271 *wl,
enum acx_ctsprotect_type ctsprotect);
int wl1271_acx_statistics(struct wl1271 *wl, struct acx_statistics *stats);
-int wl1271_acx_rate_policies(struct wl1271 *wl);
+int wl1271_acx_rate_policies(struct wl1271 *wl, u32 enabled_rates);
int wl1271_acx_ac_cfg(struct wl1271 *wl);
int wl1271_acx_tid_cfg(struct wl1271 *wl);
int wl1271_acx_frag_threshold(struct wl1271 *wl);
diff --git a/drivers/net/wireless/wl12xx/wl1271_init.c b/drivers/net/wireless/wl12xx/wl1271_init.c
index 490df21..eb6b91a 100644
--- a/drivers/net/wireless/wl12xx/wl1271_init.c
+++ b/drivers/net/wireless/wl12xx/wl1271_init.c
@@ -369,7 +369,7 @@ int wl1271_hw_init(struct wl1271 *wl)
goto out_free_memmap;
/* Configure TX rate classes */
- ret = wl1271_acx_rate_policies(wl);
+ ret = wl1271_acx_rate_policies(wl, ACX_RATE_MASK_ALL);
if (ret < 0)
goto out_free_memmap;
diff --git a/drivers/net/wireless/wl12xx/wl1271_main.c b/drivers/net/wireless/wl12xx/wl1271_main.c
index 1a5e575..0f5958d 100644
--- a/drivers/net/wireless/wl12xx/wl1271_main.c
+++ b/drivers/net/wireless/wl12xx/wl1271_main.c
@@ -583,6 +583,7 @@ static void wl1271_op_stop(struct ieee80211_hw *hw)
wl->ssid_len = 0;
wl->listen_int = 1;
wl->bss_type = MAX_BSS_TYPE;
+ wl->band = IEEE80211_BAND_2GHZ;
wl->rx_counter = 0;
wl->elp = false;
@@ -728,6 +729,8 @@ static int wl1271_op_config(struct ieee80211_hw *hw, u32 changed)
mutex_lock(&wl->mutex);
+ wl->band = conf->channel->band;
+
ret = wl1271_ps_elp_wakeup(wl, false);
if (ret < 0)
goto out;
@@ -979,6 +982,22 @@ out:
return ret;
}
+static u32 wl1271_enabled_rates_get(struct wl1271 *wl, u64 basic_rate_set)
+{
+ struct ieee80211_supported_band *band;
+ u32 enabled_rates = 0;
+ int bit;
+
+ band = wl->hw->wiphy->bands[wl->band];
+ for (bit = 0; bit < band->n_bitrates; bit++) {
+ if (basic_rate_set & 0x1)
+ enabled_rates |= band->bitrates[bit].hw_value;
+ basic_rate_set >>= 1;
+ }
+
+ return enabled_rates;
+}
+
static void wl1271_op_bss_info_changed(struct ieee80211_hw *hw,
struct ieee80211_vif *vif,
struct ieee80211_bss_conf *bss_conf,
@@ -1017,6 +1036,7 @@ static void wl1271_op_bss_info_changed(struct ieee80211_hw *hw,
}
}
}
+
if (changed & BSS_CHANGED_ERP_SLOT) {
if (bss_conf->use_short_slot)
ret = wl1271_acx_slot(wl, SLOT_TIME_SHORT);
@@ -1046,6 +1066,16 @@ static void wl1271_op_bss_info_changed(struct ieee80211_hw *hw,
}
}
+ if (changed & BSS_CHANGED_BASIC_RATES) {
+ u32 enabled_rates = wl1271_enabled_rates_get(
+ wl, bss_conf->basic_rates);
+ ret = wl1271_acx_rate_policies(wl, enabled_rates);
+ if (ret < 0) {
+ wl1271_warning("Set rate policies failed %d", ret);
+ goto out_sleep;
+ }
+ }
+
out_sleep:
wl1271_ps_elp_sleep(wl);
@@ -1240,6 +1270,7 @@ static int __devinit wl1271_probe(struct spi_device *spi)
wl->psm_requested = false;
wl->tx_queue_stopped = false;
wl->power_level = WL1271_DEFAULT_POWER_LEVEL;
+ wl->band = IEEE80211_BAND_2GHZ;
/* We use the default power on sleep time until we know which chip
* we're using */
--
1.5.6.5
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PATCH 09/13] wl1271: Update join usage
2009-08-27 20:59 [PATCH 00/13] wl1271: patch set with various improvements Luciano Coelho
` (7 preceding siblings ...)
2009-08-27 21:00 ` [PATCH 08/13] wl1271: Configure rate policies based on AP rates Luciano Coelho
@ 2009-08-27 21:00 ` Luciano Coelho
2009-08-27 21:00 ` [PATCH 10/13] wl1271: Corrections to TX path Luciano Coelho
` (4 subsequent siblings)
13 siblings, 0 replies; 23+ messages in thread
From: Luciano Coelho @ 2009-08-27 21:00 UTC (permalink / raw)
To: linville; +Cc: linux-wireless, juuso.oikarinen, kalle.valo
From: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Update the usage of join's, including using actual beacon interval and
dtim from AP, and configuring a basic rate set from AP.
Signed-off-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Reviewed-by: Luciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
---
drivers/net/wireless/wl12xx/wl1271.h | 12 ++++++++
drivers/net/wireless/wl12xx/wl1271_cmd.c | 15 +++-------
drivers/net/wireless/wl12xx/wl1271_cmd.h | 3 +-
drivers/net/wireless/wl12xx/wl1271_main.c | 42 ++++++++++++++++++++++-------
4 files changed, 50 insertions(+), 22 deletions(-)
diff --git a/drivers/net/wireless/wl12xx/wl1271.h b/drivers/net/wireless/wl12xx/wl1271.h
index 671dc5a..05eb29c 100644
--- a/drivers/net/wireless/wl12xx/wl1271.h
+++ b/drivers/net/wireless/wl12xx/wl1271.h
@@ -104,6 +104,8 @@ enum {
CFG_RX_CTL_EN | CFG_RX_BCN_EN | \
CFG_RX_AUTH_EN | CFG_RX_ASSOC_EN)
+#define WL1271_DEFAULT_BASIC_RATE_SET (ACX_RATE_MASK_ALL)
+
#define WL1271_FW_NAME "wl1271-fw.bin"
#define WL1271_NVS_NAME "wl1271-nvs.bin"
@@ -118,6 +120,9 @@ enum {
#define WL1271_ELP_HW_STATE_ASLEEP 0
#define WL1271_ELP_HW_STATE_IRQ 1
+#define WL1271_DEFAULT_BEACON_INT 100
+#define WL1271_DEFAULT_DTIM_PERIOD 1
+
enum wl1271_state {
WL1271_STATE_OFF,
WL1271_STATE_ON,
@@ -369,6 +374,13 @@ struct wl1271 {
/* Our association ID */
u16 aid;
+ /* Beacon parameters */
+ u16 beacon_int;
+ u8 dtim_period;
+
+ /* currently configured rate set */
+ u32 basic_rate_set;
+
/* The current band */
enum ieee80211_band band;
diff --git a/drivers/net/wireless/wl12xx/wl1271_cmd.c b/drivers/net/wireless/wl12xx/wl1271_cmd.c
index bd65b38..35a6e67 100644
--- a/drivers/net/wireless/wl12xx/wl1271_cmd.c
+++ b/drivers/net/wireless/wl12xx/wl1271_cmd.c
@@ -175,11 +175,9 @@ int wl1271_cmd_cal(struct wl1271 *wl)
return ret;
}
-int wl1271_cmd_join(struct wl1271 *wl, u8 bss_type, u8 dtim_interval,
- u16 beacon_interval, u8 wait)
+int wl1271_cmd_join(struct wl1271 *wl)
{
static bool do_cal = true;
- unsigned long timeout;
struct wl1271_cmd_join *join;
int ret, i;
u8 *bssid;
@@ -213,9 +211,9 @@ int wl1271_cmd_join(struct wl1271 *wl, u8 bss_type, u8 dtim_interval,
join->basic_rate_set = RATE_MASK_1MBPS | RATE_MASK_2MBPS |
RATE_MASK_5_5MBPS | RATE_MASK_11MBPS;
- join->beacon_interval = beacon_interval;
- join->dtim_interval = dtim_interval;
- join->bss_type = bss_type;
+ join->beacon_interval = wl->beacon_int;
+ join->dtim_interval = wl->dtim_period;
+ join->bss_type = wl->bss_type;
join->channel = wl->channel;
join->ssid_len = wl->ssid_len;
memcpy(join->ssid, wl->ssid, wl->ssid_len);
@@ -239,14 +237,11 @@ int wl1271_cmd_join(struct wl1271 *wl, u8 bss_type, u8 dtim_interval,
goto out_free;
}
- timeout = msecs_to_jiffies(JOIN_TIMEOUT);
-
/*
* ugly hack: we should wait for JOIN_EVENT_COMPLETE_ID but to
* simplify locking we just sleep instead, for now
*/
- if (wait)
- msleep(10);
+ msleep(10);
out_free:
kfree(join);
diff --git a/drivers/net/wireless/wl12xx/wl1271_cmd.h b/drivers/net/wireless/wl12xx/wl1271_cmd.h
index 7c4d3aa..63bc441 100644
--- a/drivers/net/wireless/wl12xx/wl1271_cmd.h
+++ b/drivers/net/wireless/wl12xx/wl1271_cmd.h
@@ -30,8 +30,7 @@
struct acx_header;
int wl1271_cmd_send(struct wl1271 *wl, u16 type, void *buf, size_t buf_len);
-int wl1271_cmd_join(struct wl1271 *wl, u8 bss_type, u8 dtim_interval,
- u16 beacon_interval, u8 wait);
+int wl1271_cmd_join(struct wl1271 *wl);
int wl1271_cmd_test(struct wl1271 *wl, void *buf, size_t buf_len, u8 answer);
int wl1271_cmd_interrogate(struct wl1271 *wl, u16 id, void *buf, size_t len);
int wl1271_cmd_configure(struct wl1271 *wl, u16 id, void *buf, size_t len);
diff --git a/drivers/net/wireless/wl12xx/wl1271_main.c b/drivers/net/wireless/wl12xx/wl1271_main.c
index 0f5958d..f5e757d 100644
--- a/drivers/net/wireless/wl12xx/wl1271_main.c
+++ b/drivers/net/wireless/wl12xx/wl1271_main.c
@@ -394,8 +394,7 @@ static void wl1271_filter_work(struct work_struct *work)
if (ret < 0)
goto out;
- /* FIXME: replace the magic numbers with proper definitions */
- ret = wl1271_cmd_join(wl, wl->bss_type, 1, 100, 0);
+ ret = wl1271_cmd_join(wl);
if (ret < 0)
goto out_sleep;
@@ -673,8 +672,7 @@ static int wl1271_op_config_interface(struct ieee80211_hw *hw,
memcpy(wl->ssid, conf->ssid, wl->ssid_len);
if (wl->bss_type != BSS_TYPE_IBSS) {
- /* FIXME: replace the magic numbers with proper definitions */
- ret = wl1271_cmd_join(wl, wl->bss_type, 5, 100, 1);
+ ret = wl1271_cmd_join(wl);
if (ret < 0)
goto out_sleep;
}
@@ -697,8 +695,7 @@ static int wl1271_op_config_interface(struct ieee80211_hw *hw,
if (ret < 0)
goto out_sleep;
- /* FIXME: replace the magic numbers with proper definitions */
- ret = wl1271_cmd_join(wl, wl->bss_type, 1, 100, 0);
+ ret = wl1271_cmd_join(wl);
if (ret < 0)
goto out_sleep;
@@ -739,8 +736,7 @@ static int wl1271_op_config(struct ieee80211_hw *hw, u32 changed)
u8 old_channel = wl->channel;
wl->channel = channel;
- /* FIXME: use beacon interval provided by mac80211 */
- ret = wl1271_cmd_join(wl, wl->bss_type, 1, 100, 0);
+ ret = wl1271_cmd_join(wl);
if (ret < 0) {
wl->channel = old_channel;
goto out_sleep;
@@ -1017,8 +1013,17 @@ static void wl1271_op_bss_info_changed(struct ieee80211_hw *hw,
if (changed & BSS_CHANGED_ASSOC) {
if (bss_conf->assoc) {
+ wl->beacon_int = bss_conf->beacon_int;
+ wl->dtim_period = bss_conf->dtim_period;
wl->aid = bss_conf->aid;
+ ret = wl1271_cmd_join(wl);
+ if (ret < 0) {
+ wl1271_warning("Association configuration "
+ "failed %d", ret);
+ goto out_sleep;
+ }
+
ret = wl1271_cmd_build_ps_poll(wl, wl->aid);
if (ret < 0)
goto out_sleep;
@@ -1034,7 +1039,14 @@ static void wl1271_op_bss_info_changed(struct ieee80211_hw *hw,
if (ret < 0)
goto out_sleep;
}
+ } else {
+ /* use defaults when not associated */
+ wl->beacon_int = WL1271_DEFAULT_BEACON_INT;
+ wl->dtim_period = WL1271_DEFAULT_DTIM_PERIOD;
+ wl->basic_rate_set = WL1271_DEFAULT_BASIC_RATE_SET;
+ wl->aid = 0;
}
+
}
if (changed & BSS_CHANGED_ERP_SLOT) {
@@ -1067,13 +1079,20 @@ static void wl1271_op_bss_info_changed(struct ieee80211_hw *hw,
}
if (changed & BSS_CHANGED_BASIC_RATES) {
- u32 enabled_rates = wl1271_enabled_rates_get(
+ wl->basic_rate_set = wl1271_enabled_rates_get(
wl, bss_conf->basic_rates);
- ret = wl1271_acx_rate_policies(wl, enabled_rates);
+ ret = wl1271_acx_rate_policies(wl, wl->basic_rate_set);
+
if (ret < 0) {
wl1271_warning("Set rate policies failed %d", ret);
goto out_sleep;
}
+ ret = wl1271_cmd_join(wl);
+ if (ret < 0) {
+ wl1271_warning("Join with new basic rate "
+ "set failed %d", ret);
+ goto out_sleep;
+ }
}
out_sleep:
@@ -1270,6 +1289,9 @@ static int __devinit wl1271_probe(struct spi_device *spi)
wl->psm_requested = false;
wl->tx_queue_stopped = false;
wl->power_level = WL1271_DEFAULT_POWER_LEVEL;
+ wl->beacon_int = WL1271_DEFAULT_BEACON_INT;
+ wl->dtim_period = WL1271_DEFAULT_DTIM_PERIOD;
+ wl->basic_rate_set = WL1271_DEFAULT_BASIC_RATE_SET;
wl->band = IEEE80211_BAND_2GHZ;
/* We use the default power on sleep time until we know which chip
--
1.5.6.5
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PATCH 10/13] wl1271: Corrections to TX path
2009-08-27 20:59 [PATCH 00/13] wl1271: patch set with various improvements Luciano Coelho
` (8 preceding siblings ...)
2009-08-27 21:00 ` [PATCH 09/13] wl1271: Update join usage Luciano Coelho
@ 2009-08-27 21:00 ` Luciano Coelho
2009-08-27 21:00 ` [PATCH 11/13] wl1271: use workqueue provided by mac80211 instead of the default Luciano Coelho
` (3 subsequent siblings)
13 siblings, 0 replies; 23+ messages in thread
From: Luciano Coelho @ 2009-08-27 21:00 UTC (permalink / raw)
To: linville; +Cc: linux-wireless, juuso.oikarinen, kalle.valo
From: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Corrections to the TX path - use correct number of maximum descriptors
(32 instead of 16) and correct checking and setting of excessive retries
on completion.
Signed-off-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Reviewed-by: Luciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
---
drivers/net/wireless/wl12xx/wl1271.h | 4 +++-
drivers/net/wireless/wl12xx/wl1271_acx.h | 1 -
drivers/net/wireless/wl12xx/wl1271_main.c | 4 +---
drivers/net/wireless/wl12xx/wl1271_tx.c | 8 +++-----
4 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/drivers/net/wireless/wl12xx/wl1271.h b/drivers/net/wireless/wl12xx/wl1271.h
index 05eb29c..0b4744d 100644
--- a/drivers/net/wireless/wl12xx/wl1271.h
+++ b/drivers/net/wireless/wl12xx/wl1271.h
@@ -123,6 +123,8 @@ enum {
#define WL1271_DEFAULT_BEACON_INT 100
#define WL1271_DEFAULT_DTIM_PERIOD 1
+#define ACX_TX_DESCRIPTORS 32
+
enum wl1271_state {
WL1271_STATE_OFF,
WL1271_STATE_ON,
@@ -346,7 +348,7 @@ struct wl1271 {
struct work_struct filter_work;
/* Pending TX frames */
- struct sk_buff *tx_frames[16];
+ struct sk_buff *tx_frames[ACX_TX_DESCRIPTORS];
/* Security sequence number counters */
u8 tx_security_last_seq;
diff --git a/drivers/net/wireless/wl12xx/wl1271_acx.h b/drivers/net/wireless/wl12xx/wl1271_acx.h
index 55850eb..c177345 100644
--- a/drivers/net/wireless/wl12xx/wl1271_acx.h
+++ b/drivers/net/wireless/wl12xx/wl1271_acx.h
@@ -170,7 +170,6 @@ enum {
#define DP_RX_PACKET_RING_CHUNK_NUM 2
#define DP_TX_PACKET_RING_CHUNK_NUM 2
#define DP_TX_COMPLETE_TIME_OUT 20
-#define FW_TX_CMPLT_BLOCK_SIZE 16
#define TX_MSDU_LIFETIME_MIN 0
#define TX_MSDU_LIFETIME_MAX 3000
diff --git a/drivers/net/wireless/wl12xx/wl1271_main.c b/drivers/net/wireless/wl12xx/wl1271_main.c
index f5e757d..416fd9c 100644
--- a/drivers/net/wireless/wl12xx/wl1271_main.c
+++ b/drivers/net/wireless/wl12xx/wl1271_main.c
@@ -1294,9 +1294,7 @@ static int __devinit wl1271_probe(struct spi_device *spi)
wl->basic_rate_set = WL1271_DEFAULT_BASIC_RATE_SET;
wl->band = IEEE80211_BAND_2GHZ;
- /* We use the default power on sleep time until we know which chip
- * we're using */
- for (i = 0; i < FW_TX_CMPLT_BLOCK_SIZE; i++)
+ for (i = 0; i < ACX_TX_DESCRIPTORS; i++)
wl->tx_frames[i] = NULL;
spin_lock_init(&wl->wl_lock);
diff --git a/drivers/net/wireless/wl12xx/wl1271_tx.c b/drivers/net/wireless/wl12xx/wl1271_tx.c
index 1ad1bc3..5d3aa4b 100644
--- a/drivers/net/wireless/wl12xx/wl1271_tx.c
+++ b/drivers/net/wireless/wl12xx/wl1271_tx.c
@@ -33,8 +33,7 @@
static int wl1271_tx_id(struct wl1271 *wl, struct sk_buff *skb)
{
int i;
-
- for (i = 0; i < FW_TX_CMPLT_BLOCK_SIZE; i++)
+ for (i = 0; i < ACX_TX_DESCRIPTORS; i++)
if (wl->tx_frames[i] == NULL) {
wl->tx_frames[i] = skb;
return i;
@@ -262,14 +261,13 @@ out:
static void wl1271_tx_complete_packet(struct wl1271 *wl,
struct wl1271_tx_hw_res_descr *result)
{
-
struct ieee80211_tx_info *info;
struct sk_buff *skb;
u16 seq;
int id = result->id;
/* check for id legality */
- if (id >= TX_HW_RESULT_QUEUE_LEN || wl->tx_frames[id] == NULL) {
+ if (id >= ACX_TX_DESCRIPTORS || wl->tx_frames[id] == NULL) {
wl1271_warning("TX result illegal id: %d", id);
return;
}
@@ -382,7 +380,7 @@ void wl1271_tx_flush(struct wl1271 *wl)
ieee80211_tx_status(wl->hw, skb);
}
- for (i = 0; i < FW_TX_CMPLT_BLOCK_SIZE; i++)
+ for (i = 0; i < ACX_TX_DESCRIPTORS; i++)
if (wl->tx_frames[i] != NULL) {
skb = wl->tx_frames[i];
info = IEEE80211_SKB_CB(skb);
--
1.5.6.5
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PATCH 11/13] wl1271: use workqueue provided by mac80211 instead of the default
2009-08-27 20:59 [PATCH 00/13] wl1271: patch set with various improvements Luciano Coelho
` (9 preceding siblings ...)
2009-08-27 21:00 ` [PATCH 10/13] wl1271: Corrections to TX path Luciano Coelho
@ 2009-08-27 21:00 ` Luciano Coelho
2009-08-27 21:02 ` Luis R. Rodriguez
2009-08-27 21:00 ` [PATCH 12/13] wl1271: Clear probe-request template after scan Luciano Coelho
` (2 subsequent siblings)
13 siblings, 1 reply; 23+ messages in thread
From: Luciano Coelho @ 2009-08-27 21:00 UTC (permalink / raw)
To: linville; +Cc: linux-wireless, juuso.oikarinen, kalle.valo
From: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Use the workqueue provided by the mac80211 stack instead of the system
default queue.
Signed-off-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Reviewed-by: Luciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
---
drivers/net/wireless/wl12xx/wl1271_main.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/wireless/wl12xx/wl1271_main.c b/drivers/net/wireless/wl12xx/wl1271_main.c
index 416fd9c..a97d434 100644
--- a/drivers/net/wireless/wl12xx/wl1271_main.c
+++ b/drivers/net/wireless/wl12xx/wl1271_main.c
@@ -107,7 +107,7 @@ static void wl1271_fw_status(struct wl1271 *wl, struct wl1271_fw_status *status)
/* if more blocks are available now, schedule some tx work */
if (total && !skb_queue_empty(&wl->tx_queue))
- schedule_work(&wl->tx_work);
+ queue_work(wl->hw->workqueue, &wl->tx_work);
/* update the host-chipset time offset */
wl->time_offset = jiffies_to_usecs(jiffies) - status->fw_localtime;
@@ -205,7 +205,7 @@ static irqreturn_t wl1271_irq(int irq, void *cookie)
wl->elp_compl = NULL;
}
- schedule_work(&wl->irq_work);
+ queue_work(wl->hw->workqueue, &wl->irq_work);
spin_unlock_irqrestore(&wl->wl_lock, flags);
return IRQ_HANDLED;
@@ -480,7 +480,7 @@ static int wl1271_op_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
* before that, the tx_work will not be initialized!
*/
- schedule_work(&wl->tx_work);
+ queue_work(wl->hw->workqueue, &wl->tx_work);
/*
* The workqueue is slow to process the tx_queue and we need stop
--
1.5.6.5
^ permalink raw reply related [flat|nested] 23+ messages in thread* Re: [PATCH 11/13] wl1271: use workqueue provided by mac80211 instead of the default
2009-08-27 21:00 ` [PATCH 11/13] wl1271: use workqueue provided by mac80211 instead of the default Luciano Coelho
@ 2009-08-27 21:02 ` Luis R. Rodriguez
2009-08-27 21:17 ` Luciano Coelho
0 siblings, 1 reply; 23+ messages in thread
From: Luis R. Rodriguez @ 2009-08-27 21:02 UTC (permalink / raw)
To: Luciano Coelho; +Cc: linville, linux-wireless, juuso.oikarinen, kalle.valo
On Thu, Aug 27, 2009 at 2:00 PM, Luciano Coelho<luciano.coelho@nokia.com> wrote:
> From: Juuso Oikarinen <juuso.oikarinen@nokia.com>
>
> Use the workqueue provided by the mac80211 stack instead of the system
> default queue.
You mean ieee80211_queue_work() ? This patch seems to be based on an
old wireless-testing.
Luis
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 11/13] wl1271: use workqueue provided by mac80211 instead of the default
2009-08-27 21:02 ` Luis R. Rodriguez
@ 2009-08-27 21:17 ` Luciano Coelho
0 siblings, 0 replies; 23+ messages in thread
From: Luciano Coelho @ 2009-08-27 21:17 UTC (permalink / raw)
To: ext Luis R. Rodriguez, linville@tuxdriver.com
Cc: linux-wireless@vger.kernel.org,
Oikarinen Juuso (Nokia-D-MSW/Tampere),
Valo Kalle (Nokia-D/Tampere)
ext Luis R. Rodriguez wrote:
> On Thu, Aug 27, 2009 at 2:00 PM, Luciano Coelho<luciano.coelho@nokia.com> wrote:
>
>> From: Juuso Oikarinen <juuso.oikarinen@nokia.com>
>>
>> Use the workqueue provided by the mac80211 stack instead of the system
>> default queue.
>>
>
> You mean ieee80211_queue_work() ? This patch seems to be based on an
> old wireless-testing.
>
Oops! It seems like I have sent the wrong series of patches. I'll have
to review and resend tomorrow.
--
Cheers,
Luca.
^ permalink raw reply [flat|nested] 23+ messages in thread
* [PATCH 12/13] wl1271: Clear probe-request template after scan
2009-08-27 20:59 [PATCH 00/13] wl1271: patch set with various improvements Luciano Coelho
` (10 preceding siblings ...)
2009-08-27 21:00 ` [PATCH 11/13] wl1271: use workqueue provided by mac80211 instead of the default Luciano Coelho
@ 2009-08-27 21:00 ` Luciano Coelho
2009-08-27 21:00 ` [PATCH 13/13] wl1271: added Juuso Oikarinen as module author Luciano Coelho
2009-08-27 21:20 ` [PATCH 00/13] wl1271: patch set with various improvements Luciano Coelho
13 siblings, 0 replies; 23+ messages in thread
From: Luciano Coelho @ 2009-08-27 21:00 UTC (permalink / raw)
To: linville; +Cc: linux-wireless, juuso.oikarinen, kalle.valo
From: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Clear the probe-request template on the firmware after scan. Unless
cleared, the firmware can independently send probe requests to the AP
and interfere with the mac80211 logic.
Signed-off-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Reviewed-by: Luciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
---
drivers/net/wireless/wl12xx/wl1271_event.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/drivers/net/wireless/wl12xx/wl1271_event.c b/drivers/net/wireless/wl12xx/wl1271_event.c
index f3afd4a..87055f7 100644
--- a/drivers/net/wireless/wl12xx/wl1271_event.c
+++ b/drivers/net/wireless/wl12xx/wl1271_event.c
@@ -26,6 +26,7 @@
#include "wl1271_spi.h"
#include "wl1271_event.h"
#include "wl1271_ps.h"
+#include "wl12xx_80211.h"
static int wl1271_event_scan_complete(struct wl1271 *wl,
struct event_mailbox *mbox)
@@ -34,6 +35,9 @@ static int wl1271_event_scan_complete(struct wl1271 *wl,
mbox->scheduled_scan_status);
if (wl->scanning) {
+ int size = sizeof(struct wl12xx_probe_req_template);
+ wl1271_cmd_template_set(wl, CMD_TEMPL_CFG_PROBE_REQ_2_4, NULL,
+ size);
mutex_unlock(&wl->mutex);
ieee80211_scan_completed(wl->hw, false);
mutex_lock(&wl->mutex);
--
1.5.6.5
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PATCH 13/13] wl1271: added Juuso Oikarinen as module author
2009-08-27 20:59 [PATCH 00/13] wl1271: patch set with various improvements Luciano Coelho
` (11 preceding siblings ...)
2009-08-27 21:00 ` [PATCH 12/13] wl1271: Clear probe-request template after scan Luciano Coelho
@ 2009-08-27 21:00 ` Luciano Coelho
2009-08-27 21:32 ` Johannes Berg
2009-08-27 21:20 ` [PATCH 00/13] wl1271: patch set with various improvements Luciano Coelho
13 siblings, 1 reply; 23+ messages in thread
From: Luciano Coelho @ 2009-08-27 21:00 UTC (permalink / raw)
To: linville; +Cc: linux-wireless, juuso.oikarinen, kalle.valo
Add Juuso as one of the module authors, since he's working heavily on this
module as well.
Cc: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
---
drivers/net/wireless/wl12xx/wl1271_main.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/drivers/net/wireless/wl12xx/wl1271_main.c b/drivers/net/wireless/wl12xx/wl1271_main.c
index a97d434..4163eac 100644
--- a/drivers/net/wireless/wl12xx/wl1271_main.c
+++ b/drivers/net/wireless/wl12xx/wl1271_main.c
@@ -1449,4 +1449,5 @@ module_init(wl1271_init);
module_exit(wl1271_exit);
MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Luciano Coelho <luciano.coelho@nokia.com>");
+MODULE_AUTHOR("Luciano Coelho <luciano.coelho@nokia.com>, "
+ "Juuso Oikarinen <juuso.oikarinen@nokia.com>");
--
1.5.6.5
^ permalink raw reply related [flat|nested] 23+ messages in thread* Re: [PATCH 13/13] wl1271: added Juuso Oikarinen as module author
2009-08-27 21:00 ` [PATCH 13/13] wl1271: added Juuso Oikarinen as module author Luciano Coelho
@ 2009-08-27 21:32 ` Johannes Berg
2009-08-27 21:35 ` Luis R. Rodriguez
2009-08-28 9:01 ` Luciano Coelho
0 siblings, 2 replies; 23+ messages in thread
From: Johannes Berg @ 2009-08-27 21:32 UTC (permalink / raw)
To: Luciano Coelho; +Cc: linville, linux-wireless, juuso.oikarinen, kalle.valo
[-- Attachment #1: Type: text/plain, Size: 980 bytes --]
On Fri, 2009-08-28 at 00:00 +0300, Luciano Coelho wrote:
> Add Juuso as one of the module authors, since he's working heavily on this
> module as well.
>
> Cc: Juuso Oikarinen <juuso.oikarinen@nokia.com>
> Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
> ---
> drivers/net/wireless/wl12xx/wl1271_main.c | 3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/net/wireless/wl12xx/wl1271_main.c b/drivers/net/wireless/wl12xx/wl1271_main.c
> index a97d434..4163eac 100644
> --- a/drivers/net/wireless/wl12xx/wl1271_main.c
> +++ b/drivers/net/wireless/wl12xx/wl1271_main.c
> @@ -1449,4 +1449,5 @@ module_init(wl1271_init);
> module_exit(wl1271_exit);
>
> MODULE_LICENSE("GPL");
> -MODULE_AUTHOR("Luciano Coelho <luciano.coelho@nokia.com>");
> +MODULE_AUTHOR("Luciano Coelho <luciano.coelho@nokia.com>, "
> + "Juuso Oikarinen <juuso.oikarinen@nokia.com>");
Use multiple MODULE_AUTHORs instead.
johannes
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 801 bytes --]
^ permalink raw reply [flat|nested] 23+ messages in thread* Re: [PATCH 13/13] wl1271: added Juuso Oikarinen as module author
2009-08-27 21:32 ` Johannes Berg
@ 2009-08-27 21:35 ` Luis R. Rodriguez
2009-08-27 21:47 ` Luis R. Rodriguez
2009-08-28 9:01 ` Luciano Coelho
1 sibling, 1 reply; 23+ messages in thread
From: Luis R. Rodriguez @ 2009-08-27 21:35 UTC (permalink / raw)
To: Johannes Berg
Cc: Luciano Coelho, linville, linux-wireless, juuso.oikarinen,
kalle.valo
On Thu, Aug 27, 2009 at 2:32 PM, Johannes Berg<johannes@sipsolutions.net> wrote:
> On Fri, 2009-08-28 at 00:00 +0300, Luciano Coelho wrote:
>> Add Juuso as one of the module authors, since he's working heavily on this
>> module as well.
>>
>> Cc: Juuso Oikarinen <juuso.oikarinen@nokia.com>
>> Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
>> ---
>> drivers/net/wireless/wl12xx/wl1271_main.c | 3 ++-
>> 1 files changed, 2 insertions(+), 1 deletions(-)
>>
>> diff --git a/drivers/net/wireless/wl12xx/wl1271_main.c b/drivers/net/wireless/wl12xx/wl1271_main.c
>> index a97d434..4163eac 100644
>> --- a/drivers/net/wireless/wl12xx/wl1271_main.c
>> +++ b/drivers/net/wireless/wl12xx/wl1271_main.c
>> @@ -1449,4 +1449,5 @@ module_init(wl1271_init);
>> module_exit(wl1271_exit);
>>
>> MODULE_LICENSE("GPL");
>> -MODULE_AUTHOR("Luciano Coelho <luciano.coelho@nokia.com>");
>> +MODULE_AUTHOR("Luciano Coelho <luciano.coelho@nokia.com>, "
>> + "Juuso Oikarinen <juuso.oikarinen@nokia.com>");
>
> Use multiple MODULE_AUTHORs instead.
Where is that defined?
Luis
^ permalink raw reply [flat|nested] 23+ messages in thread* Re: [PATCH 13/13] wl1271: added Juuso Oikarinen as module author
2009-08-27 21:35 ` Luis R. Rodriguez
@ 2009-08-27 21:47 ` Luis R. Rodriguez
0 siblings, 0 replies; 23+ messages in thread
From: Luis R. Rodriguez @ 2009-08-27 21:47 UTC (permalink / raw)
To: Johannes Berg
Cc: Luciano Coelho, linville, linux-wireless, juuso.oikarinen,
kalle.valo
On Thu, Aug 27, 2009 at 2:35 PM, Luis R. Rodriguez<mcgrof@gmail.com> wrote:
> On Thu, Aug 27, 2009 at 2:32 PM, Johannes Berg<johannes@sipsolutions.net> wrote:
>> On Fri, 2009-08-28 at 00:00 +0300, Luciano Coelho wrote:
>>> Add Juuso as one of the module authors, since he's working heavily on this
>>> module as well.
>>>
>>> Cc: Juuso Oikarinen <juuso.oikarinen@nokia.com>
>>> Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
>>> ---
>>> drivers/net/wireless/wl12xx/wl1271_main.c | 3 ++-
>>> 1 files changed, 2 insertions(+), 1 deletions(-)
>>>
>>> diff --git a/drivers/net/wireless/wl12xx/wl1271_main.c b/drivers/net/wireless/wl12xx/wl1271_main.c
>>> index a97d434..4163eac 100644
>>> --- a/drivers/net/wireless/wl12xx/wl1271_main.c
>>> +++ b/drivers/net/wireless/wl12xx/wl1271_main.c
>>> @@ -1449,4 +1449,5 @@ module_init(wl1271_init);
>>> module_exit(wl1271_exit);
>>>
>>> MODULE_LICENSE("GPL");
>>> -MODULE_AUTHOR("Luciano Coelho <luciano.coelho@nokia.com>");
>>> +MODULE_AUTHOR("Luciano Coelho <luciano.coelho@nokia.com>, "
>>> + "Juuso Oikarinen <juuso.oikarinen@nokia.com>");
>>
>> Use multiple MODULE_AUTHORs instead.
>
> Where is that defined?
Hah nevermind, my mind read MODULE_AUTHORS() :)
Luis
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 13/13] wl1271: added Juuso Oikarinen as module author
2009-08-27 21:32 ` Johannes Berg
2009-08-27 21:35 ` Luis R. Rodriguez
@ 2009-08-28 9:01 ` Luciano Coelho
2009-08-28 9:10 ` Johannes Berg
1 sibling, 1 reply; 23+ messages in thread
From: Luciano Coelho @ 2009-08-28 9:01 UTC (permalink / raw)
To: ext Johannes Berg
Cc: linville@tuxdriver.com, linux-wireless@vger.kernel.org,
Oikarinen Juuso (Nokia-D-MSW/Tampere),
Valo Kalle (Nokia-D/Tampere)
ext Johannes Berg wrote:
> On Fri, 2009-08-28 at 00:00 +0300, Luciano Coelho wrote:
>
>> Add Juuso as one of the module authors, since he's working heavily on this
>> module as well.
>>
>> Cc: Juuso Oikarinen <juuso.oikarinen@nokia.com>
>> Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
>> ---
>> drivers/net/wireless/wl12xx/wl1271_main.c | 3 ++-
>> 1 files changed, 2 insertions(+), 1 deletions(-)
>>
>> diff --git a/drivers/net/wireless/wl12xx/wl1271_main.c b/drivers/net/wireless/wl12xx/wl1271_main.c
>> index a97d434..4163eac 100644
>> --- a/drivers/net/wireless/wl12xx/wl1271_main.c
>> +++ b/drivers/net/wireless/wl12xx/wl1271_main.c
>> @@ -1449,4 +1449,5 @@ module_init(wl1271_init);
>> module_exit(wl1271_exit);
>>
>> MODULE_LICENSE("GPL");
>> -MODULE_AUTHOR("Luciano Coelho <luciano.coelho@nokia.com>");
>> +MODULE_AUTHOR("Luciano Coelho <luciano.coelho@nokia.com>, "
>> + "Juuso Oikarinen <juuso.oikarinen@nokia.com>");
>>
>
> Use multiple MODULE_AUTHORs instead.
>
Is that the right way to do it? At least in include/linux/module.h it
says this:
/* Author, ideally of form NAME[, NAME]*[ and NAME] */
#define MODULE_AUTHOR(_author) MODULE_INFO(author, _author)
As I interpret it, it means that there should be one MODULE_AUTHOR with
a string that contains all the names. So actually the right way to do
it would be this:
MODULE_AUTHOR("Luciano Coelho <luciano.coelho@nokia.com> and "
"Juuso Oikarinen <juuso.oikarinen@nokia.com>");
Or am I missing/misinterpreting something?
--
Cheers,
Luca.
^ permalink raw reply [flat|nested] 23+ messages in thread* Re: [PATCH 13/13] wl1271: added Juuso Oikarinen as module author
2009-08-28 9:01 ` Luciano Coelho
@ 2009-08-28 9:10 ` Johannes Berg
2009-08-28 9:27 ` Luciano Coelho
0 siblings, 1 reply; 23+ messages in thread
From: Johannes Berg @ 2009-08-28 9:10 UTC (permalink / raw)
To: Luciano Coelho
Cc: linville@tuxdriver.com, linux-wireless@vger.kernel.org,
Oikarinen Juuso (Nokia-D-MSW/Tampere),
Valo Kalle (Nokia-D/Tampere)
[-- Attachment #1: Type: text/plain, Size: 692 bytes --]
On Fri, 2009-08-28 at 12:01 +0300, Luciano Coelho wrote:
> Is that the right way to do it? At least in include/linux/module.h it
> says this:
>
> /* Author, ideally of form NAME[, NAME]*[ and NAME] */
> #define MODULE_AUTHOR(_author) MODULE_INFO(author, _author)
Interesting, but I suspect that should just be changed.
If you use multiple MODULE_AUTHOR, they will be shown as such:
$ /sbin/modinfo ar9170usb | grep author
author: Christian Lamparter <chunkeey@web.de>
author: Johannes Berg <johannes@sipsolutions.net>
If you use just one, it would be one long author: line with all of them.
I think the multiple line case is much nicer.
johannes
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 801 bytes --]
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 13/13] wl1271: added Juuso Oikarinen as module author
2009-08-28 9:10 ` Johannes Berg
@ 2009-08-28 9:27 ` Luciano Coelho
0 siblings, 0 replies; 23+ messages in thread
From: Luciano Coelho @ 2009-08-28 9:27 UTC (permalink / raw)
To: ext Johannes Berg
Cc: linville@tuxdriver.com, linux-wireless@vger.kernel.org,
Oikarinen Juuso (Nokia-D-MSW/Tampere),
Valo Kalle (Nokia-D/Tampere)
ext Johannes Berg wrote:
> On Fri, 2009-08-28 at 12:01 +0300, Luciano Coelho wrote:
>
>
>> Is that the right way to do it? At least in include/linux/module.h it
>> says this:
>>
>> /* Author, ideally of form NAME[, NAME]*[ and NAME] */
>> #define MODULE_AUTHOR(_author) MODULE_INFO(author, _author)
>>
>
> Interesting, but I suspect that should just be changed.
>
> If you use multiple MODULE_AUTHOR, they will be shown as such:
>
> $ /sbin/modinfo ar9170usb | grep author
> author: Christian Lamparter <chunkeey@web.de>
> author: Johannes Berg <johannes@sipsolutions.net>
>
>
> If you use just one, it would be one long author: line with all of them.
> I think the multiple line case is much nicer.
>
Yes, I totally agree with you. I'll use multiple MODULE_AUTHOR()s. ;)
--
Cheers,
Luca.
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 00/13] wl1271: patch set with various improvements
2009-08-27 20:59 [PATCH 00/13] wl1271: patch set with various improvements Luciano Coelho
` (12 preceding siblings ...)
2009-08-27 21:00 ` [PATCH 13/13] wl1271: added Juuso Oikarinen as module author Luciano Coelho
@ 2009-08-27 21:20 ` Luciano Coelho
13 siblings, 0 replies; 23+ messages in thread
From: Luciano Coelho @ 2009-08-27 21:20 UTC (permalink / raw)
To: linville@tuxdriver.com
Cc: linux-wireless@vger.kernel.org,
Oikarinen Juuso (Nokia-D-MSW/Tampere),
Valo Kalle (Nokia-D/Tampere)
Coelho Luciano (Nokia-D/Helsinki) wrote:
> Hi John,
>
> Here is a bunch of patches with some improvements to the wl1271 driver. A few
> of them fix some issues with TX, some workaround for problems we have
> identified and other general improvements. I'm also adding Juuso Oikarinen as
> one of the module authors, since he's one of the main wl1271 developers as
> well.
>
John,
Please ignore this series. As Luis has noticed, I've messed up and sent
the wrong series. I'll have to review this stuff and send v2.
Oh, the woes of being forced to work with old kernel versions... :(
--
Cheers,
Luca.
^ permalink raw reply [flat|nested] 23+ messages in thread