From: "Pali Rohár" <pali.rohar@gmail.com>
To: Luciano Coelho <luca@coelho.fi>,
"John W. Linville" <linville@tuxdriver.com>,
Johannes Berg <johannes@sipsolutions.net>,
"David S. Miller" <davem@davemloft.net>
Cc: linux-wireless@vger.kernel.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org, freemangordon@abv.bg,
aaro.koskinen@iki.fi, pavel@ucw.cz, sre@ring0.de,
joni.lapilainen@gmail.com, pali.rohar@gmail.com,
David Gnedt <david.gnedt@davizone.at>
Subject: [PATCH 12/16] wl1251: disable retry and ACK policy for injected packets
Date: Sat, 26 Oct 2013 22:34:11 +0200 [thread overview]
Message-ID: <1382819655-30430-13-git-send-email-pali.rohar@gmail.com> (raw)
In-Reply-To: <1382819655-30430-1-git-send-email-pali.rohar@gmail.com>
From: David Gnedt <david.gnedt@davizone.at>
Set the retry limit to 0 and disable the ACK policy for injected packets.
Signed-off-by: David Gnedt <david.gnedt@davizone.at>
---
drivers/net/wireless/ti/wl1251/acx.c | 8 +++++++-
drivers/net/wireless/ti/wl1251/tx.c | 7 ++++++-
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/ti/wl1251/acx.c b/drivers/net/wireless/ti/wl1251/acx.c
index 14da6de..f98d46f 100644
--- a/drivers/net/wireless/ti/wl1251/acx.c
+++ b/drivers/net/wireless/ti/wl1251/acx.c
@@ -943,12 +943,18 @@ int wl1251_acx_rate_policies(struct wl1251 *wl)
}
/* configure one default (one-size-fits-all) rate class */
- acx->rate_class_cnt = 1;
+ acx->rate_class_cnt = 2;
acx->rate_class[0].enabled_rates = ACX_RATE_MASK_UNSPECIFIED;
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;
+ /* no-retry rate class */
+ acx->rate_class[1].enabled_rates = ACX_RATE_MASK_UNSPECIFIED;
+ acx->rate_class[1].short_retry_limit = 0;
+ acx->rate_class[1].long_retry_limit = 0;
+ acx->rate_class[1].aflags = 0;
+
ret = wl1251_cmd_configure(wl, ACX_RATE_POLICY, acx, sizeof(*acx));
if (ret < 0) {
wl1251_warning("Setting of rate policies failed: %d", ret);
diff --git a/drivers/net/wireless/ti/wl1251/tx.c b/drivers/net/wireless/ti/wl1251/tx.c
index 1de4ccb..e559bc4 100644
--- a/drivers/net/wireless/ti/wl1251/tx.c
+++ b/drivers/net/wireless/ti/wl1251/tx.c
@@ -90,8 +90,12 @@ static void wl1251_tx_control(struct tx_double_buffer_desc *tx_hdr,
/* 802.11 packets */
tx_hdr->control.packet_type = 0;
- if (control->flags & IEEE80211_TX_CTL_NO_ACK)
+ /* Also disable retry and ACK policy for injected packets */
+ if ((control->flags & IEEE80211_TX_CTL_NO_ACK) ||
+ (control->flags & IEEE80211_TX_CTL_INJECTED)) {
+ tx_hdr->control.rate_policy = 1;
tx_hdr->control.ack_policy = 1;
+ }
tx_hdr->control.tx_complete = 1;
@@ -414,6 +418,7 @@ static void wl1251_tx_packet_cb(struct wl1251 *wl,
info = IEEE80211_SKB_CB(skb);
if (!(info->flags & IEEE80211_TX_CTL_NO_ACK) &&
+ !(info->flags & IEEE80211_TX_CTL_INJECTED) &&
(result->status == TX_SUCCESS))
info->flags |= IEEE80211_TX_STAT_ACK;
--
1.7.10.4
next prev parent reply other threads:[~2013-10-26 20:40 UTC|newest]
Thread overview: 116+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-26 20:33 [PATCH 00/16] wl1251 patches from linux-n900 tree Pali Rohár
2013-10-26 20:34 ` [PATCH 01/16] mac80211: fix TX device statistics for monitor interfaces Pali Rohár
2013-10-28 5:53 ` Kalle Valo
2013-12-08 8:45 ` [PATCH] " Pali Rohár
2013-12-16 12:38 ` Johannes Berg
2013-10-28 13:47 ` [PATCH 01/16] " Johannes Berg
2013-10-26 20:34 ` [PATCH 02/16] wl1251: fix scan behaviour while not associated Pali Rohár
2013-10-30 11:24 ` Pavel Machek
2013-10-26 20:34 ` [PATCH 03/16] wl1251: add sysfs interface for bluetooth coexistence mode configuration Pali Rohár
2013-10-28 23:39 ` Ben Hutchings
2013-10-29 7:09 ` Luca Coelho
2013-10-29 13:35 ` Kalle Valo
2013-12-08 7:55 ` Pali Rohár
2013-12-08 16:36 ` Ben Hutchings
2013-10-26 20:34 ` [PATCH 04/16] wl1251: retry power save entry Pali Rohár
2013-10-26 20:34 ` [PATCH 05/16] wl1251: implement hardware ARP filtering Pali Rohár
2013-10-30 11:28 ` Pavel Machek
2013-10-26 20:34 ` [PATCH 06/16] wl1251: split RX and TX data path initialisation Pali Rohár
2013-10-30 11:31 ` Pavel Machek
2013-10-26 20:34 ` [PATCH 07/16] wl1251: configure hardware en-/decryption for monitor mode Pali Rohár
2013-10-30 11:35 ` Pavel Machek
2013-10-26 20:34 ` [PATCH 08/16] wl1251: implement multicast address filtering Pali Rohár
2013-10-30 11:41 ` Pavel Machek
2013-10-26 20:34 ` [PATCH 09/16] wl1251: disable power saving in monitor mode Pali Rohár
2013-10-30 11:46 ` Pavel Machek
2013-10-26 20:34 ` [PATCH 10/16] wl1251: fix channel switching " Pali Rohár
2013-10-30 11:47 ` Pavel Machek
2013-10-26 20:34 ` [PATCH 11/16] wl1251: enable tx path in monitor mode if necessary for packet injection Pali Rohár
2013-10-30 11:51 ` Pavel Machek
2013-10-26 20:34 ` Pali Rohár [this message]
2013-10-30 11:52 ` [PATCH 12/16] wl1251: disable retry and ACK policy for injected packets Pavel Machek
2013-10-26 20:34 ` [PATCH 13/16] wl1251: enforce changed hw encryption support on monitor state change Pali Rohár
2013-10-30 11:55 ` Pavel Machek
2013-10-26 20:34 ` [PATCH 14/16] wl1251: add nvs file name to module firmware list Pali Rohár
2013-10-30 11:55 ` Pavel Machek
2013-10-26 20:34 ` [PATCH 15/16] wl1251: Add sysfs file tx_mgmt_frm_rate for setting rate Pali Rohár
2013-10-28 13:45 ` Johannes Berg
2013-10-26 20:34 ` [PATCH 16/16] wl1251: Add sysfs file address for setting permanent mac address Pali Rohár
2013-10-28 13:45 ` Johannes Berg
2013-10-28 13:49 ` Pali Rohár
2013-10-28 13:55 ` Johannes Berg
2013-10-28 14:00 ` Pali Rohár
2013-10-28 14:46 ` Dan Williams
2013-10-28 14:56 ` Johannes Berg
2013-10-28 15:04 ` Pali Rohár
2013-10-28 15:29 ` Dan Williams
2013-10-28 16:21 ` Pali Rohár
2013-10-28 15:33 ` Stephen Hemminger
2013-10-28 23:50 ` Ben Hutchings
2013-11-08 14:20 ` [PATCH 00/16] wl1251 patches from linux-n900 tree Felipe Contreras
2013-11-25 19:54 ` Pali Rohár
2013-12-08 9:24 ` [PATCH v2 " Pali Rohár
2013-12-08 9:24 ` [PATCH v2 01/16] wl1251: fix scan behaviour while not associated Pali Rohár
2013-12-10 9:21 ` Pavel Machek
2013-12-10 15:41 ` Kalle Valo
2013-12-10 17:08 ` Pali Rohár
2013-12-11 20:44 ` Ben Hutchings
2013-12-31 9:44 ` Pali Rohár
2013-12-08 9:25 ` [PATCH v2 02/16] wl1251: add sysfs interface for bluetooth coexistence mode configuration Pali Rohár
2013-12-10 15:46 ` Kalle Valo
2013-12-10 16:09 ` Pali Rohár
2013-12-08 9:25 ` [PATCH v2 03/16] wl1251: retry power save entry Pali Rohár
2013-12-10 9:24 ` Pavel Machek
2013-12-08 9:25 ` [PATCH v2 04/16] wl1251: implement hardware ARP filtering Pali Rohár
2013-12-10 9:29 ` Pavel Machek
2013-12-10 9:59 ` Michal Kubecek
2013-12-08 9:25 ` [PATCH v2 05/16] wl1251: split RX and TX data path initialisation Pali Rohár
2013-12-10 9:31 ` Pavel Machek
2013-12-08 9:25 ` [PATCH v2 06/16] wl1251: configure hardware en-/decryption for monitor mode Pali Rohár
2013-12-10 9:35 ` Pavel Machek
2013-12-31 9:31 ` Pali Rohár
2013-12-08 9:25 ` [PATCH v2 07/16] wl1251: implement multicast address filtering Pali Rohár
2013-12-10 9:39 ` Pavel Machek
2013-12-08 9:25 ` [PATCH v2 08/16] wl1251: disable power saving in monitor mode Pali Rohár
2013-12-10 9:41 ` Pavel Machek
2013-12-08 9:25 ` [PATCH v2 09/16] wl1251: fix channel switching " Pali Rohár
2013-12-10 9:43 ` Pavel Machek
2013-12-08 9:25 ` [PATCH v2 10/16] wl1251: enable tx path in monitor mode if necessary for packet injection Pali Rohár
2013-12-10 9:44 ` Pavel Machek
2013-12-08 9:25 ` [PATCH v2 11/16] wl1251: disable retry and ACK policy for injected packets Pali Rohár
2013-12-10 9:46 ` Pavel Machek
2013-12-08 9:25 ` [PATCH v2 12/16] wl1251: enforce changed hw encryption support on monitor state change Pali Rohár
2013-12-10 9:48 ` Pavel Machek
2013-12-08 9:25 ` [PATCH v2 13/16] wl1251: add nvs file name to module firmware list Pali Rohár
2013-12-10 9:49 ` Pavel Machek
2013-12-08 9:25 ` [PATCH v2 14/16] wl1251: Add sysfs file tx_mgmt_frm_rate for setting rate Pali Rohár
2013-12-09 16:50 ` Dan Williams
2013-12-10 15:36 ` Kalle Valo
2013-12-08 9:25 ` [PATCH v2 15/16] wl1251: Add sysfs file address for setting permanent mac address Pali Rohár
2013-12-10 15:49 ` Kalle Valo
2013-12-10 16:10 ` Pali Rohár
2013-12-10 17:14 ` Pali Rohár
2013-12-10 17:49 ` Dan Williams
2013-12-10 17:52 ` Pali Rohár
2013-12-10 19:22 ` Dan Williams
2013-12-10 19:31 ` Pali Rohár
2013-12-11 21:26 ` Ben Hutchings
2013-12-11 21:17 ` Ben Hutchings
2013-12-11 21:28 ` Ben Hutchings
2013-12-11 21:35 ` Ivajlo Dimitrov
2013-12-11 22:15 ` Ben Hutchings
2013-12-11 22:36 ` Ivajlo Dimitrov
2013-12-12 12:45 ` Sergei Shtylyov
2013-12-11 22:53 ` Dan Williams
2013-12-12 19:55 ` Ben Hutchings
2013-12-12 20:24 ` Ivajlo Dimitrov
2013-12-12 10:56 ` Pavel Machek
2013-12-08 9:25 ` [PATCH v2 16/16] wl1251: fix NULL pointer dereference Pali Rohár
2013-12-10 9:42 ` Pavel Machek
2013-12-31 9:47 ` [PATCH v2 00/16] wl1251 patches from linux-n900 tree Pali Rohár
2014-01-06 20:00 ` John W. Linville
2014-01-06 20:26 ` Johannes Berg
2014-01-06 22:03 ` Pavel Machek
2014-01-07 12:15 ` Pavel Machek
2014-01-16 0:21 ` Pavel Machek
2014-01-16 20:29 ` John W. Linville
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1382819655-30430-13-git-send-email-pali.rohar@gmail.com \
--to=pali.rohar@gmail.com \
--cc=aaro.koskinen@iki.fi \
--cc=davem@davemloft.net \
--cc=david.gnedt@davizone.at \
--cc=freemangordon@abv.bg \
--cc=johannes@sipsolutions.net \
--cc=joni.lapilainen@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=luca@coelho.fi \
--cc=netdev@vger.kernel.org \
--cc=pavel@ucw.cz \
--cc=sre@ring0.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).