* Re: [PATCH] iwlagn: fix priv->cfg->ht_params NULL pointer dereference
From: Guy, Wey-Yi @ 2011-10-12 13:26 UTC (permalink / raw)
To: Stanislaw Gruszka; +Cc: linux-wireless@vger.kernel.org, John W. Linville
In-Reply-To: <20111012081634.GA2675@redhat.com>
On Wed, 2011-10-12 at 01:16 -0700, Stanislaw Gruszka wrote:
> This fix regression introduced by commit:
>
> commit 15b3f3b006b42a678523cad989bfd60b76bf4403
> Author: Wey-Yi Guy <wey-yi.w.guy@intel.com>
> Date: Fri Jun 3 07:54:13 2011 -0700
>
> iwlagn: set smps mode after assoc for 1000 device
>
> Also remove unneeded brackets on the way.
>
> Address:
> https://bugzilla.redhat.com/show_bug.cgi?id=744155
>
> If fix will not get 3.1 release, it should be applied in 3.1 stable.
>
> Cc: stable@kernel.org # 3.1+
> Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Acked-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
> ---
> drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
Thanks a lot
Wey
^ permalink raw reply
* Re: [PATCH 1/5 V2] rtlwifi: Change PCI drivers to use the new PM framework
From: Mark Einon @ 2011-10-12 14:02 UTC (permalink / raw)
To: Larry Finger; +Cc: linville, linux-wireless
In-Reply-To: <1318386531-5859-2-git-send-email-Larry.Finger@lwfinger.net>
On 12 October 2011 03:28, Larry Finger <Larry.Finger@lwfinger.net> wrote:
>
> +static const struct dev_pm_ops rtlwifi_pm_ops = {
> + .suspend = rtl_pci_suspend,
> + .resume = rtl_pci_resume,
> + .freeze = rtl_pci_suspend,
> + .thaw = rtl_pci_resume,
> + .poweroff = rtl_pci_suspend,
> + .restore = rtl_pci_resume,
> +};
> +
Hi Larry,
You can save a few lines of code here, and in the other files where it
is done - there is a convenience macro for simplifying creating a
pm_ops struct like this, see SIMPLE_DEV_PM_OPS() in pm.h.
Cheers,
Mark
^ permalink raw reply
* Re: ath9k: irq storm after suspend/resume
From: Mohammed Shafi @ 2011-10-12 13:10 UTC (permalink / raw)
To: Adrian Chadd, Clemens Buchacher; +Cc: linux-wireless
In-Reply-To: <CAJ-Vmok4v2+ZEpAmVaj2pQ5U2StWxxD8f20u2Ln87o4+C_ST0g@mail.gmail.com>
Hi Clemens,
please try this in case it helps anything
to debug the issue.
this should avoid dead beef and the interrupt when we access MAC
registers when the MAC is asleep. also i did not see MAC irq being not
triggerred in your case(AR_INTR_ASYNC_CAUSE should be 0x2) or may be
its not an interrupt triggered by the chip itself. thanks
diff --git a/drivers/net/wireless/ath/ath9k/main.c
b/drivers/net/wireless/ath/ath9k/main.c
index 93fbe6f..51b7c54 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -770,6 +770,7 @@ irqreturn_t ath_isr(int irq, void *dev)
enum ath9k_int status;
bool sched = false;
+ ath9k_ps_wakeup(sc);
/*
* The hardware is not ready/present, don't
* touch anything. Note this can happen early
On Wed, Oct 5, 2011 at 6:32 PM, Adrian Chadd <adrian@freebsd.org> wrote:
> On 5 October 2011 14:28, Clemens Buchacher <drizzd@aon.at> wrote:
>> For the record, instead of going to full sleep, I can reproduce the
>> issue with
>>
>> echo devices >/sys/power/pm_test
>> echo mem >/sys/power/state
>>
>> but not with
>>
>> echo freezer >/sys/power/pm_test
>> echo mem >/sys/power/state
>>
>> So it could still be a different device that's causing the issue? I
>> can try unloading all kinds of modules. Or is there an option to
>> suspend just one device?
>
> Right. So its likely something (more) odd. Yes, see if that's the case
> :) At this point I'm going to punt this to the power management/ACPI
> people .:)
>
> Good luck!
>
>
> Adrian
>
--
shafi
^ permalink raw reply related
* Driver for Intel Pro/Wireless 2200BG
From: Jayanthi Venugopal @ 2011-10-12 12:58 UTC (permalink / raw)
To: linux-wireless
Hi,
I would like to download and install the above driver .I am not able
to download the driver from
http://ipw2200.sourceforge.net/index.php
I would like the driver and the installation instruction as well.
Looking forward for your reply,
Thanks
Jay
^ permalink raw reply
* Re: [PATCH] ath6kl: fix firmware start address for ar6003 hw2.0
From: Sangwook Lee @ 2011-10-12 10:45 UTC (permalink / raw)
To: Kalle Valo; +Cc: linux-wireless
In-Reply-To: <4E953FDB.9090709@qca.qualcomm.com>
Hi Kalle
You wrote:
>>>Before I'm able to find a hw 2.0 device, can you try to debug this more?
>>>When scanning fails can check if ath6kldev_intr_bh_handler() is called
>>>or not? When scanning fails it usually happens because irqs are failing.
Yes, it seems true. when scanning fails. it failed to receive no more sdio irqs.
For the temporary testing, I made sdio polling kernel thread and then let it
call ath6kldev_intr_bh_handler(). With hw2.0, it works fine with
scanning issue.
Do you know any ideas to solve this problem clearly ?
Thanks
Sangwook
On 12 October 2011 08:20, Kalle Valo <kvalo@qca.qualcomm.com> wrote:
> On 10/06/2011 04:12 PM, Sangwook Lee wrote:
>> From: Kalle Valo <kvalo@qca.qualcomm.com>
>>
>> Sangwook found out that commit 639d0b89 ("ath6kl: read firmware start
>> address from hardware") broke firmware boot on ar6003 hw2.0 as it seems
>> it's not posible to automatically query the address from hardware. So
>> we need to hardcode the address for hw2.0.
>>
>> Reported-by: Sangwook Lee <sangwook.lee@linaro.org>
>> Tested-by: Sangwook Lee <sangwook.lee@linaro.org>
>> Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
>> ---
>> Kalle:
>> I slightly changed again. without running ath6kl_bmi_read() before,
>> ath6kl_bmi_execute() failed with hw2.0 board, but I am not clear about this reason.
>
> Hmm, that's strange. I didn't find any reason why this is needed.
>
>> @@ -1201,25 +1202,28 @@ static int ath6kl_upload_otp(struct ath6kl *ar)
>> }
>>
>> /* read firmware start address */
>> - ret = ath6kl_bmi_read(ar,
>> - ath6kl_get_hi_item_addr(ar,
>> - HI_ITEM(hi_app_start)),
>> - (u8 *) &address, sizeof(address));
>> + ret = ath6kl_bmi_read(ar, ath6kl_get_hi_item_addr(ar,
>> + HI_ITEM(hi_app_start)), (u8 *) &address, sizeof(address));
>
> You just change indentation here, right? So this part can be dropped.
>
> I have applied to ath6kl.git now. Thank you very much for your help!
>
> Kalle
>
^ permalink raw reply
* Re: [PATCH] iw: add DFS region parsing support
From: Luis R. Rodriguez @ 2011-10-12 9:13 UTC (permalink / raw)
To: Johannes Berg; +Cc: linville, linux-wireless
In-Reply-To: <1318408634.3933.32.camel@jlt3.sipsolutions.net>
On Wed, Oct 12, 2011 at 1:37 AM, Johannes Berg
<johannes@sipsolutions.net> wrote:
> On Tue, 2011-10-11 at 13:25 -0700, Luis R. Rodriguez wrote:
>
>> > Also, I prefer patches w/o nl80211.h updates.
>>
>> In my RFC on December the stars aligned differently and you preferred
>> it together I think.
>
> Really? I must've been confused. The reason I don't want them is that
> then I can never merge something that isn't upstream yet. :)
That's fine, I also like to split it. I'll resend the iw patches.
John, let me know if the other ones look peachy, once and if you merge
to wireless-regdb, wireless-next I'll push to CRDA too.
Luis
^ permalink raw reply
* Re: [RFC 01/07] wireless-next: WAPI support for hardware-accelerated drivers
From: Jouni Malinen @ 2011-10-12 8:50 UTC (permalink / raw)
To: Dmitry Tarnyagin; +Cc: linux-wireless, Bartosz MARKOWSKI, Janusz DZIEDZIC
In-Reply-To: <op.v27rufm9ya27un@edmitar>
On Wed, Oct 12, 2011 at 03:02:29AM +0200, Dmitry Tarnyagin wrote:
> diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h
> @@ -1551,12 +1552,14 @@ enum ieee80211_sa_query_action {
> #define WLAN_CIPHER_SUITE_CCMP 0x000FAC04
> #define WLAN_CIPHER_SUITE_WEP104 0x000FAC05
> #define WLAN_CIPHER_SUITE_AES_CMAC 0x000FAC06
> +#define WLAN_CIPHER_SUITE_SMS4 0x000FAC07
>
> /* AKM suite selectors */
> #define WLAN_AKM_SUITE_8021X 0x000FAC01
> #define WLAN_AKM_SUITE_PSK 0x000FAC02
> #define WLAN_AKM_SUITE_SAE 0x000FAC08
> #define WLAN_AKM_SUITE_FT_OVER_SAE 0x000FAC09
> +#define WLAN_AKM_SUITE_WAPI_PSK 0x000FAC03
Where do these values come from?
00-0F-AC:7 cipher suite selector has already been allocated for other
purposes ("Group addressed traffic not allowed") and similarly, AKM
suite 00-0F-AC:3 is already in use ("FT authentication negotiated over
IEEE 802.1X"). The 00-0F-AC OUI is managed by IEEE 802.11 and you cannot
just pick a random suite type from that OUI and hope for the best. This
will result in conflicts with other uses.
These need to be either allocated by IEEE 802.11 ANA or maybe more
likely, by any vendor that has their own OUI could allocate a unique
identifier for this purpose.
--
Jouni Malinen PGP id EFC895FA
^ permalink raw reply
* Re: [PATCH] iw: add DFS region parsing support
From: Johannes Berg @ 2011-10-12 8:37 UTC (permalink / raw)
To: Luis R. Rodriguez; +Cc: linville, linux-wireless
In-Reply-To: <CAB=NE6WtkokxWg4zJtjyKVZmhZAhzArfoJuOOqhuKSw940hxqg@mail.gmail.com>
On Tue, 2011-10-11 at 13:25 -0700, Luis R. Rodriguez wrote:
> > Also, I prefer patches w/o nl80211.h updates.
>
> In my RFC on December the stars aligned differently and you preferred
> it together I think.
Really? I must've been confused. The reason I don't want them is that
then I can never merge something that isn't upstream yet. :)
johannes
^ permalink raw reply
* Re: [RFC 07/07] mac80211: Do not call release_buffered_frames if not available.
From: Johannes Berg @ 2011-10-12 8:32 UTC (permalink / raw)
To: Dmitry Tarnyagin
Cc: linux-wireless.vger.kernel.org, Bartosz MARKOWSKI,
Janusz DZIEDZIC
In-Reply-To: <op.v27ru2maya27un@edmitar>
On Wed, 2011-10-12 at 03:02 +0200, Dmitry Tarnyagin wrote:
> From: Dmitry Tarnyagin <dmitry.tarnyagin@stericsson.com>
> Date: Wed, 5 Oct 2011 13:20:04 +0200
>
> A new .release_buffered_frames callback was introduced recently.
> Check for the callback presence was missing in the mac80211 code,
> and PM state could get broken in some cases.
Interesting, but we do check:
drv_release_buffered_frames(struct ieee80211_local *local,
struct sta_info *sta, u16 tids, int num_frames,
enum ieee80211_frame_release_type reason,
bool more_data)
{
trace_drv_release_buffered_frames(local, &sta->sta, tids, num_frames,
reason, more_data);
if (local->ops->release_buffered_frames)
local->ops->release_buffered_frames(&local->hw, &sta->sta, tids,
So whatever you're trying to do must be something else.
johannes
^ permalink raw reply
* Re: [RFC 05/07] mac80211: Purge cfg80211 beacon cache before authentication.
From: Johannes Berg @ 2011-10-12 8:31 UTC (permalink / raw)
To: Dmitry Tarnyagin
Cc: linux-wireless.vger.kernel.org, Bartosz MARKOWSKI,
Janusz DZIEDZIC
In-Reply-To: <op.v27ruyliya27un@edmitar>
On Wed, 2011-10-12 at 03:02 +0200, Dmitry Tarnyagin wrote:
> From: Dmitry Tarnyagin <dmitry.tarnyagin@stericsson.com>
> Date: Wed, 10 Aug 2011 19:15:13 +0200
>
> cw1200 device requires SSID to be available at AUTH stage.
> cfg80211 beacon cache is designed to handle multi-SSID BSSes, so
> bss struct returned by cfg80211_get_bss() has random SSID if BSS
> just changed SSID before authentication (typical for p2p).
>
> As a workaround cfg80211 beacon cache is purged to make sure
> target BSS is searchable in rb-tree at the AUTH stage.
Funny, but hell no.
johannes
^ permalink raw reply
* Re: [RFC 04/07] compat-wireless: p2p power save support
From: Johannes Berg @ 2011-10-12 8:30 UTC (permalink / raw)
To: Dmitry Tarnyagin
Cc: linux-wireless.vger.kernel.org, Bartosz MARKOWSKI,
Janusz DZIEDZIC
In-Reply-To: <op.v27ruwj6ya27un@edmitar>
On Wed, 2011-10-12 at 03:02 +0200, Dmitry Tarnyagin wrote:
> From: Janusz Dziedzic <janusz.dziedzic@tieto.com>
> Date: Thu, 4 Aug 2011 11:42:16 +0200
>
> P2P power save support:
> - Opportunistic Power Save
> - Notice Of Absence
More explanation please. I know I sound like a broken record but for
such a big change you really need more text.
I'm not even going to bother to review the patch in detail. You need to
explain why you need to set NoA. There are three reasons this would be
used:
1) actually save power
2) do scanning, multi-channel operation, etc.
3) P2P certification testing
Only 3) seems to be useful from userspace, and then maybe it shouldn't
be full-blown nl80211 API.
Similarly for the P2P power save stuff. Since you generally lack
documentation updates in your patches (read this as criticism) there's
no way reason to even look through your patches since they don't explain
anything.
FWIW, a very brief glance over this patch tells me that there's at least
one obvious, glaring bug in it.
johannes
^ permalink raw reply
* Re: [RFC 06/07] compat-wireless: UAPSD configuration in STA mode
From: Johannes Berg @ 2011-10-12 8:25 UTC (permalink / raw)
To: Dmitry Tarnyagin
Cc: linux-wireless.vger.kernel.org, Bartosz MARKOWSKI,
Janusz DZIEDZIC
In-Reply-To: <op.v27ru00wya27un@edmitar>
On Wed, 2011-10-12 at 03:02 +0200, Dmitry Tarnyagin wrote:
> From: Janusz Dziedzic <janusz.dziedzic@tieto.com>
> Date: Wed, 3 Aug 2011 09:46:05 +0200
>
> This patch adds UAPSD queues configuration as a param to assoc request.
> With the patch it's possible to configure UAPSD from user space.
>
> Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
> ---
> include/linux/nl80211.h | 2 ++
> include/net/cfg80211.h | 1 +
> net/mac80211/main.c | 3 ++-
> net/mac80211/mlme.c | 2 ++
> net/wireless/core.h | 6 ++++--
> net/wireless/mlme.c | 10 +++++++---
> net/wireless/nl80211.c | 7 ++++++-
> net/wireless/sme.c | 2 +-
> 8 files changed, 25 insertions(+), 8 deletions(-)
This is a rare case where *maybe* it's OK to do both mac80211 and
cfg80211 in one patch, but I haven't seen much evidence from all of you
that you really understand the separation, so I'd prefer if you split it
up and explained the changes separately.
> +++ b/include/net/cfg80211.h
> @@ -1050,6 +1050,7 @@ struct cfg80211_assoc_request {
> size_t ie_len;
> struct cfg80211_crypto_settings crypto;
> bool use_mfp;
> + int uapsd;
int? explain. also you're obviously missing documentation that would
have explained this.
> - local->uapsd_queues = IEEE80211_DEFAULT_UAPSD_QUEUES;
> + /* Disable all UAPSD AC by default */
> + local->uapsd_queues = 0;
You should obviously then remove the default constant, or better yet
just set it to 0. Also _that_ specific change needs to be a separate
change since it modifies existing behaviour.
> + if (info->attrs[NL80211_ATTR_UAPSD])
> + uapsd = nla_get_u32(info->attrs[NL80211_ATTR_UAPSD]);
clearly missing validation.
> +++ b/net/wireless/sme.c
> @@ -190,7 +190,7 @@ static int cfg80211_conn_do_work(struct wireless_dev
> *wdev)
> prev_bssid,
> params->ssid, params->ssid_len,
> params->ie, params->ie_len,
> - false, ¶ms->crypto);
> + false, ¶ms->crypto, -1);
> if (err)
> __cfg80211_mlme_deauth(rdev, wdev->netdev, params->bssid,
> NULL, 0,
Really? Why should this not be able to do uapsd with the same way?
johannes
^ permalink raw reply
* Re: [patch] iwmc3200wifi: add a range check to iwm_cfg80211_get_key()
From: Samuel Ortiz @ 2011-10-12 8:26 UTC (permalink / raw)
To: Dan Carpenter
Cc: Intel Linux Wireless, John W. Linville, linux-wireless,
kernel-janitors
In-Reply-To: <20111012081036.GA32384@elgon.mountain>
Hi Dan,
On Wed, Oct 12, 2011 at 11:10:37AM +0300, Dan Carpenter wrote:
> Smatch complains that "key_index" is capped at 5 in nl80211_get_key()
> but iwm->keys[] only has 4 elements. I don't know if this is really
> needed, but the other ->get_key() implementations seemed to check
> for overflows so I've added a check here.
>
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Samuel Ortiz <sameo@linux.intel.com>
Cheers.
Samuel.
--
Intel Open Source Technology Centre
http://oss.intel.com/
---------------------------------------------------------------------
Intel Corporation SAS (French simplified joint stock company)
Registered headquarters: "Les Montalets"- 2, rue de Paris,
92196 Meudon Cedex, France
Registration Number: 302 456 199 R.C.S. NANTERRE
Capital: 4,572,000 Euros
This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.
^ permalink raw reply
* Re: [RFC 03/07] compat-wireless: Enable changing regulatory domain
From: Johannes Berg @ 2011-10-12 8:22 UTC (permalink / raw)
To: Dmitry Tarnyagin
Cc: linux-wireless.vger.kernel.org, Bartosz MARKOWSKI,
Janusz DZIEDZIC, Johan Lilje
In-Reply-To: <op.v27rusy7ya27un@edmitar>
On Wed, 2011-10-12 at 03:02 +0200, Dmitry Tarnyagin wrote:
> From: Johan Lilje <johan.lilje@stericsson.com>
> Date: Tue, 2 Aug 2011 09:21:49 +0200
>
> If compat-wireless code is compiled into the kernel,
> first request regulatory hint fails to return since
> userspace is not ready yet.
> Added timeout mechanism to remove old pending requests.
Completely wrong description. Make your patches apply to the kernel, not
compat-wireless.
> + * @timestamp: stores the time when this request calls crda, to enable
> + * timeout mechanism.
> * @list: used to insert into the reg_requests_list linked list
> */
> struct regulatory_request {
> @@ -70,6 +72,7 @@ struct regulatory_request {
> bool intersect;
> bool processed;
> enum environment_cap country_ie_env;
> + struct timespec timestamp;
Seriously? You've gotta be kidding. WAAYY overkill to use timespec. Just
use jiffies.
johannes
^ permalink raw reply
* Re: [RFC 02/07] compat-wireless: Connection quality monitor extensions
From: Johannes Berg @ 2011-10-12 8:21 UTC (permalink / raw)
To: Dmitry Tarnyagin; +Cc: linux-wireless, Bartosz MARKOWSKI, Janusz DZIEDZIC
In-Reply-To: <op.v27rulkhya27un@edmitar>
On Wed, 2011-10-12 at 03:02 +0200, Dmitry Tarnyagin wrote:
> added:
> * beacon miss threshold - This value specifies the threshold
> for the BEACON loss level
> * tx fail - This value specifies the threshold for the TX loss level
That's a bit short for a changelog for such a big patch. The patch might
stand to be split up into two and be explained better.
Also, as Julian pointed out -- get your compat vs. wireless tree in
order. You don't want to be modifying the compat repository, it's even
impossible, you need to be submitting patches against wireless-next or
-testing. You also need to make sure they apply against those trees,
which this patch obviously can't:
> include/linux/compat-3.0.h | 2 +
as you can see easily :)
> +++ b/include/linux/nl80211.h
> @@ -2311,6 +2311,14 @@ enum nl80211_ps_state {
> * @NL80211_ATTR_CQM_RSSI_THRESHOLD_EVENT: RSSI threshold event
> * @NL80211_ATTR_CQM_PKT_LOSS_EVENT: a u32 value indicating that this many
> * consecutive packets were not acknowledged by the peer
> + * @NL80211_ATTR_CQM_BEACON_MISS_THOLD: BEACON threshold. This value
> specifies
> + * the threshold for the BEACON loss level at which an event will be
> + * sent. Zero to disable.
Should it really be zero to disable rather than leaving it out to
disable?
> + * @NL80211_ATTR_CQM_BEACON_MISS_THOLD_EVENT: BEACON miss event
> + * @NL80211_ATTR_CQM_TX_FAIL_THOLD: TX threshold. This value specifies the
> + * the threshold for the TX loss level at which an event will be
> + * sent. Zero to disable.
> + * @NL80211_ATTR_CQM_TX_FAIL_THOLD_EVENT: TX threshold event
How's this not the same as PKT_LOSS_EVENT?
Some advertising for whether this is supported or not is necessary.
> +++ b/include/net/mac80211.h
Again a fairly complex patch modifying both cfg80211 and mac80211 -- not
good. Keep in mind that there are in fact drivers not using mac80211.
> @@ -244,6 +244,10 @@ enum ieee80211_rssi_event {
> * @cqm_rssi_thold: Connection quality monitor RSSI threshold, a zero
> value
> * implies disabled
> * @cqm_rssi_hyst: Connection quality monitor RSSI hysteresis
> + * @cqm_beacon_miss_thold: Connection quality monitor beacon threshold, a
> zero
> + * value implies disabled
> + * @cqm_tx_fail_thold: Connection quality monitor tx threshold, a zero
> value
> + * implies disabled
Your line-wrapping makes this hard to read :(
> +++ b/net/mac80211/cfg.c
> @@ -1751,6 +1751,58 @@ static int ieee80211_set_cqm_rssi_config(struct
> wiphy *wiphy,
> return 0;
> }
>
> +static int ieee80211_set_cqm_beacon_miss_config(struct wiphy *wiphy,
> + struct net_device *dev,
> + u32 beacon_thold)
> +{
> + struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
> + struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
> + struct ieee80211_vif *vif = &sdata->vif;
> + struct ieee80211_bss_conf *bss_conf = &vif->bss_conf;
> +
> + if (beacon_thold == bss_conf->cqm_beacon_miss_thold)
> + return 0;
> +
> + bss_conf->cqm_beacon_miss_thold = beacon_thold;
> +
> + if (!(local->hw.flags & IEEE80211_HW_SUPPORTS_CQM_BEACON_MISS)) {
> + if (sdata->vif.type != NL80211_IFTYPE_STATION)
> + return -EOPNOTSUPP;
> + return 0;
This looks/is wrong in multiple ways.
> +++ b/net/mac80211/mlme.c
> @@ -2174,7 +2174,10 @@ void ieee80211_sta_work(struct
> ieee80211_sub_if_data *sdata)
> ifmgd->probe_send_count, max_tries);
> #endif
> ieee80211_mgd_probe_ap_send(sdata);
> - } else {
> + } else if (!(local->hw.flags &
> + IEEE80211_HW_SUPPORTS_CQM_BEACON_MISS) &&
> + !(local->hw.flags &
> + IEEE80211_HW_SUPPORTS_CQM_TX_FAIL)) {
> /*
> * We actually lost the connection ... or did we?
> * Let's make sure!
explain.
> diff --git a/net/wireless/mlme.c b/net/wireless/mlme.c
> index 21fc970..4194b3e 100644
> --- a/net/wireless/mlme.c
> +++ b/net/wireless/mlme.c
> @@ -1097,6 +1097,7 @@ void cfg80211_gtk_rekey_notify(struct net_device
> *dev, const u8 *bssid,
> }
> EXPORT_SYMBOL(cfg80211_gtk_rekey_notify);
>
> +
> void cfg80211_pmksa_candidate_notify(struct net_device *dev, int index,
spurious whitespace change
johannes
^ permalink raw reply
* [PATCH] iwlagn: fix priv->cfg->ht_params NULL pointer dereference
From: Stanislaw Gruszka @ 2011-10-12 8:16 UTC (permalink / raw)
To: Wey-Yi Guy; +Cc: linux-wireless, John W. Linville
This fix regression introduced by commit:
commit 15b3f3b006b42a678523cad989bfd60b76bf4403
Author: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Date: Fri Jun 3 07:54:13 2011 -0700
iwlagn: set smps mode after assoc for 1000 device
Also remove unneeded brackets on the way.
Address:
https://bugzilla.redhat.com/show_bug.cgi?id=744155
If fix will not get 3.1 release, it should be applied in 3.1 stable.
Cc: stable@kernel.org # 3.1+
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
---
drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
index ca632f9..5004342 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
@@ -296,8 +296,8 @@ static int iwlagn_rxon_connect(struct iwl_priv *priv,
return ret;
}
- if ((ctx->vif && ctx->vif->type == NL80211_IFTYPE_STATION) &&
- priv->cfg->ht_params->smps_mode)
+ if (ctx->vif && ctx->vif->type == NL80211_IFTYPE_STATION &&
+ priv->cfg->ht_params && priv->cfg->ht_params->smps_mode)
ieee80211_request_smps(ctx->vif,
priv->cfg->ht_params->smps_mode);
--
1.7.1
^ permalink raw reply related
* Re: [RFC 01/07] wireless-next: WAPI support for hardware-accelerated drivers
From: Johannes Berg @ 2011-10-12 8:13 UTC (permalink / raw)
To: Dmitry Tarnyagin; +Cc: linux-wireless, Bartosz MARKOWSKI, Janusz DZIEDZIC
In-Reply-To: <op.v27rufm9ya27un@edmitar>
Hi Dmitry,
Thanks for sending these patches.
Process things first: Your patches are line-wrapped in a few places.
You'll have to fix that later (but it's not very important for the first
round of review)
> This commit implements WAPI support for hardware-accelerated devices.
Note that there's at least one device that supports WAPI already, it has
HW crypto for SMS4. So it is already possible to implement. I'm not
saying this patch is bad though, it may be good to make things gradually
more generic.
> --- a/include/linux/wireless.h
> +++ b/include/linux/wireless.h
> @@ -586,6 +586,7 @@
> #define IW_AUTH_WPA_VERSION_DISABLED 0x00000001
> #define IW_AUTH_WPA_VERSION_WPA 0x00000002
> #define IW_AUTH_WPA_VERSION_WPA2 0x00000004
> +#define IW_AUTH_WPA_VERSION_WAPI 0x00000008
I don't think we should be extending wireless extensions any more, so
please remove all the wireless extensions bits from your patch(es).
> --- a/net/mac80211/Makefile
This patch is changing both mac80211 and cfg80211. I'd prefer to have
clearly separated patches so it is easier to tell which part is mac80211
specific and which will apply to other drivers that don't use mac80211.
> +++ b/net/mac80211/ieee80211_i.h
> @@ -42,7 +42,7 @@ struct ieee80211_local;
> #define TOTAL_MAX_TX_BUFFER 512
>
> /* Required encryption head and tailroom */
> -#define IEEE80211_ENCRYPT_HEADROOM 8
> +#define IEEE80211_ENCRYPT_HEADROOM 20
Hmm. This is pretty wasteful. Is this really the only way you can do
this?
> --- a/net/mac80211/main.c
> +++ b/net/mac80211/main.c
> @@ -716,6 +716,7 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)
> WLAN_CIPHER_SUITE_WEP104,
> WLAN_CIPHER_SUITE_TKIP,
> WLAN_CIPHER_SUITE_CCMP,
> + WLAN_CIPHER_SUITE_SMS4,
This is quite clearly not true -- you don't support SMS4 unless the
hardware has support for it. As a result, you can't put this here -- you
need to make your low-level driver override the cipher list. See wl12xx
for example.
> --- a/net/mac80211/tx.c
> +++ b/net/mac80211/tx.c
> @@ -31,6 +31,7 @@
> #include "mesh.h"
> #include "wep.h"
> #include "wpa.h"
> +#include "wapi.h"
> #include "wme.h"
> #include "rate.h"
>
> @@ -592,6 +593,11 @@ ieee80211_tx_h_select_key(struct ieee80211_tx_data
> *tx)
> if (!ieee80211_is_mgmt(hdr->frame_control))
> tx->key = NULL;
> break;
> +
> + case WLAN_CIPHER_SUITE_SMS4:
> + if (tx->ethertype == ETH_P_WAPI)
> + tx->key = NULL;
> + break;
This is wrong -- and already covered by
ieee80211_tx_h_check_control_port_protocol() if you set that up
correctly from nl80211. Another reason to get rid of wireless extensions
support for this.
> +static int ieee80211_wapi_decrypt(struct ieee80211_local *local,
> + struct sk_buff *skb,
> + struct ieee80211_key *key)
> +{
> + struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
> + int hdrlen = ieee80211_hdrlen(hdr->frame_control);
> + struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb);
> + int data_len;
> +
> + if (!(status->flag & RX_FLAG_DECRYPTED)) {
> + /* TODO - SMS4 decryption for firmware without
> + * SMS4 support */
> + return RX_DROP_UNUSABLE;
> + }
> +
> +
> + data_len = skb->len - hdrlen - WAPI_IV_LEN - WAPI_ICV_LEN;
> + if (data_len < 0)
> + return RX_DROP_UNUSABLE;
> +
> + /* Trim ICV */
> + skb_trim(skb, skb->len - WAPI_ICV_LEN);
> +
> + /* Remove IV */
> + memmove(skb->data + WAPI_IV_LEN, skb->data, hdrlen);
> + skb_pull(skb, WAPI_IV_LEN);
> +
> + return RX_CONTINUE;
This is wrong -- if the device didn't strip the IV it likely also didn't
*check* the IV, so it should be checked here. If it *did* check the IV
then we expect drivers to strip it as well.
> +}
> +
> +ieee80211_rx_result
> +ieee80211_crypto_wapi_decrypt(struct ieee80211_rx_data *rx)
> +{
> + struct sk_buff *skb = rx->skb;
> + struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
> +
> + if (!ieee80211_is_data(hdr->frame_control))
> + return RX_CONTINUE;
This probably needs to check data_present, not is_data. But again, I
think if you just strip the IV you can simplify this and move it into
the driver, like wl12xx, unless you need to verify the IV.
> +++ b/net/mac80211/wapi.h
This header file is unnecessary.
> +#ifndef ETH_P_WAPI
> +#define ETH_P_WAPI 0x88B4
> +#endif
This you don't actually need any more given my comments above.
> +ieee80211_rx_result
> +ieee80211_crypto_wapi_decrypt(struct ieee80211_rx_data *rx);
We can stick that into wpa.h. It also needs to be renamed -- it's not
doing decryption. I think you should get rid of it unless you need it to
check IVs.
> @@ -4167,7 +4167,8 @@ static bool nl80211_valid_auth_type(enum
> nl80211_auth_type auth_type)
> static bool nl80211_valid_wpa_versions(u32 wpa_versions)
> {
> return !(wpa_versions & ~(NL80211_WPA_VERSION_1 |
> - NL80211_WPA_VERSION_2));
> + NL80211_WPA_VERSION_2 |
> + NL80211_WAPI_VERSION_1));
> }
If your device is a mac80211 device then this isn't really needed.
johannes
^ permalink raw reply
* [patch] iwmc3200wifi: add a range check to iwm_cfg80211_get_key()
From: Dan Carpenter @ 2011-10-12 8:10 UTC (permalink / raw)
To: Samuel Ortiz
Cc: Intel Linux Wireless, John W. Linville, linux-wireless,
kernel-janitors
Smatch complains that "key_index" is capped at 5 in nl80211_get_key()
but iwm->keys[] only has 4 elements. I don't know if this is really
needed, but the other ->get_key() implementations seemed to check
for overflows so I've added a check here.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/drivers/net/wireless/iwmc3200wifi/cfg80211.c b/drivers/net/wireless/iwmc3200wifi/cfg80211.c
index ed57e44..c42be81 100644
--- a/drivers/net/wireless/iwmc3200wifi/cfg80211.c
+++ b/drivers/net/wireless/iwmc3200wifi/cfg80211.c
@@ -187,13 +187,17 @@ static int iwm_cfg80211_get_key(struct wiphy *wiphy, struct net_device *ndev,
struct key_params*))
{
struct iwm_priv *iwm = ndev_to_iwm(ndev);
- struct iwm_key *key = &iwm->keys[key_index];
+ struct iwm_key *key;
struct key_params params;
IWM_DBG_WEXT(iwm, DBG, "Getting key %d\n", key_index);
+ if (key_index >= IWM_NUM_KEYS)
+ return -ENOENT;
+
memset(¶ms, 0, sizeof(params));
+ key = &iwm->keys[key_index];
params.cipher = key->cipher;
params.key_len = key->key_len;
params.seq_len = key->seq_len;
^ permalink raw reply related
* [PATCH] ath6kl: unbreak suspend
From: Kalle Valo @ 2011-10-12 7:42 UTC (permalink / raw)
To: linux-wireless
From: Sam Leffler <sleffler@chromium.org>
Add missing {}'s that caused ath6kl_sdio_suspend to always return -EINVAL
causing suspend to be aborted.
kvalo: I broke this in commit f7325b85e ("ath6kl: add sdio debug messages")
Signed-off-by: Sam Leffler <sleffler@chromium.org>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
---
drivers/net/wireless/ath/ath6kl/sdio.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/drivers/net/wireless/ath/ath6kl/sdio.c b/drivers/net/wireless/ath/ath6kl/sdio.c
index 2394c17..58e31f6 100644
--- a/drivers/net/wireless/ath/ath6kl/sdio.c
+++ b/drivers/net/wireless/ath/ath6kl/sdio.c
@@ -724,12 +724,13 @@ static int ath6kl_sdio_suspend(struct ath6kl *ar)
flags = sdio_get_host_pm_caps(func);
- if (!(flags & MMC_PM_KEEP_POWER))
+ if (!(flags & MMC_PM_KEEP_POWER)) {
/* as host doesn't support keep power we need to bail out */
ath6kl_dbg(ATH6KL_DBG_SDIO,
"func %d doesn't support MMC_PM_KEEP_POWER\n",
func->num);
return -EINVAL;
+ }
ret = sdio_set_host_pm_flags(func, MMC_PM_KEEP_POWER);
if (ret) {
^ permalink raw reply related
* Re: [PATCH] ath6kl: fix firmware start address for ar6003 hw2.0
From: Kalle Valo @ 2011-10-12 7:20 UTC (permalink / raw)
To: Sangwook Lee; +Cc: linux-wireless
In-Reply-To: <1317906725-31130-1-git-send-email-sangwook.lee@linaro.org>
On 10/06/2011 04:12 PM, Sangwook Lee wrote:
> From: Kalle Valo <kvalo@qca.qualcomm.com>
>
> Sangwook found out that commit 639d0b89 ("ath6kl: read firmware start
> address from hardware") broke firmware boot on ar6003 hw2.0 as it seems
> it's not posible to automatically query the address from hardware. So
> we need to hardcode the address for hw2.0.
>
> Reported-by: Sangwook Lee <sangwook.lee@linaro.org>
> Tested-by: Sangwook Lee <sangwook.lee@linaro.org>
> Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
> ---
> Kalle:
> I slightly changed again. without running ath6kl_bmi_read() before,
> ath6kl_bmi_execute() failed with hw2.0 board, but I am not clear about this reason.
Hmm, that's strange. I didn't find any reason why this is needed.
> @@ -1201,25 +1202,28 @@ static int ath6kl_upload_otp(struct ath6kl *ar)
> }
>
> /* read firmware start address */
> - ret = ath6kl_bmi_read(ar,
> - ath6kl_get_hi_item_addr(ar,
> - HI_ITEM(hi_app_start)),
> - (u8 *) &address, sizeof(address));
> + ret = ath6kl_bmi_read(ar, ath6kl_get_hi_item_addr(ar,
> + HI_ITEM(hi_app_start)), (u8 *) &address, sizeof(address));
You just change indentation here, right? So this part can be dropped.
I have applied to ath6kl.git now. Thank you very much for your help!
Kalle
^ permalink raw reply
* Re: [RFC 06/07] compat-wireless: UAPSD configuration in STA mode
From: Julian Calaby @ 2011-10-12 3:19 UTC (permalink / raw)
To: Dmitry Tarnyagin
Cc: linux-wireless.vger.kernel.org, Bartosz MARKOWSKI,
Janusz DZIEDZIC
In-Reply-To: <op.v27ru00wya27un@edmitar>
Hi Dmitry,
Some minor comments on this patch:
Note that I'm not a maintainer and that these are comments on the
patch itself, not the code it adds.
Again, this is marked as a compat-wireless patch, but you're modifying
files that aren't in compat-wireless. Are you sure this patch is
correct?
Thanks,
--
Julian Calaby
Email: julian.calaby@gmail.com
Profile: http://www.google.com/profiles/julian.calaby/
.Plan: http://sites.google.com/site/juliancalaby/
^ permalink raw reply
* Re: [RFC 04/07] compat-wireless: p2p power save support
From: Julian Calaby @ 2011-10-12 3:17 UTC (permalink / raw)
To: Dmitry Tarnyagin
Cc: linux-wireless.vger.kernel.org, Bartosz MARKOWSKI,
Janusz DZIEDZIC
In-Reply-To: <op.v27ruwj6ya27un@edmitar>
Hi Dmitry,
Some minor comments on this patch:
Note that I'm not a maintainer and that these are comments on the
patch itself, not the code it adds.
On Wed, Oct 12, 2011 at 12:02, Dmitry Tarnyagin <abi.dmitryt@gmail.com> wrote:
> From: Janusz Dziedzic <janusz.dziedzic@tieto.com>
> Date: Thu, 4 Aug 2011 11:42:16 +0200
>
> P2P power save support:
> - Opportunistic Power Save
> - Notice Of Absence
>
> Signed-off-by: Dmitry Tarnyagin <dmitry.tarnyagin@stericsson.com>
> ---
> include/linux/nl80211.h | 12 +++++
> include/net/cfg80211.h | 34 +++++++++++++
> include/net/mac80211.h | 3 +
> net/mac80211/cfg.c | 24 +++++++++
> net/mac80211/ieee80211_i.h | 3 +
> net/mac80211/mlme.c | 114
> ++++++++++++++++++++++++++++++++++++++++++
> net/wireless/nl80211.c | 119
> ++++++++++++++++++++++++++++++++++++++++++++
> net/wireless/util.c | 9 +++
Same again.
Thanks,
--
Julian Calaby
Email: julian.calaby@gmail.com
Profile: http://www.google.com/profiles/julian.calaby/
.Plan: http://sites.google.com/site/juliancalaby/
^ permalink raw reply
* Re: [RFC 03/07] compat-wireless: Enable changing regulatory domain
From: Julian Calaby @ 2011-10-12 3:17 UTC (permalink / raw)
To: Dmitry Tarnyagin
Cc: linux-wireless.vger.kernel.org, Bartosz MARKOWSKI,
Janusz DZIEDZIC, Johan Lilje
In-Reply-To: <op.v27rusy7ya27un@edmitar>
Hi Dmitry,
Some minor comments on this patch:
Note that I'm not a maintainer and that these are comments on the
patch itself, not the code it adds.
On Wed, Oct 12, 2011 at 12:02, Dmitry Tarnyagin <abi.dmitryt@gmail.com> wrote:
> From: Johan Lilje <johan.lilje@stericsson.com>
> Date: Tue, 2 Aug 2011 09:21:49 +0200
>
> If compat-wireless code is compiled into the kernel,
> first request regulatory hint fails to return since
> userspace is not ready yet.
> Added timeout mechanism to remove old pending requests.
>
> Signed-off-by: Johan Lilje <johan.lilje@stericsson.com>
> ---
> include/net/regulatory.h | 3 +++
> net/wireless/reg.c | 26 +++++++++++++++++++++++---
Again, you're updating files that aren't part of the compat-wireless
repository. Are you sure this patch is correct?
Thanks,
--
Julian Calaby
Email: julian.calaby@gmail.com
Profile: http://www.google.com/profiles/julian.calaby/
.Plan: http://sites.google.com/site/juliancalaby/
^ permalink raw reply
* Re: [RFC 02/07] compat-wireless: Connection quality monitor extensions
From: Julian Calaby @ 2011-10-12 3:15 UTC (permalink / raw)
To: Dmitry Tarnyagin; +Cc: linux-wireless, Bartosz MARKOWSKI, Janusz DZIEDZIC
In-Reply-To: <op.v27rulkhya27un@edmitar>
Hi Dmitry,
Some minor comments on this patch:
Note that I'm not a maintainer and that these are comments on the
patch itself, not the code it adds.
That said, it's nice to see someone updating compat-wireless when they
update the main wireless repository.
On Wed, Oct 12, 2011 at 12:02, Dmitry Tarnyagin <abi.dmitryt@gmail.com> wrote:
> From: Bartosz Markowski <bartosz.markowski@tieto.com>
> Date: Tue, 12 Jul 2011 13:29:03 +0200
> Subject: [PATCH 2/7] compat-wireless: CQM STE extensions
>
> added:
> * beacon miss threshold - This value specifies the threshold
> for the BEACON loss level
> * tx fail - This value specifies the threshold for the TX loss level
>
> Signed-off-by: Bartosz Markowski <bartosz.markowski@tieto.com>
> ---
> include/linux/compat-3.0.h | 2 +
> include/linux/nl80211.h | 16 +++++
> include/net/cfg80211.h | 34 ++++++++++
> include/net/mac80211.h | 41 ++++++++++++
> net/mac80211/cfg.c | 54 ++++++++++++++++
> net/mac80211/mlme.c | 23 ++++++-
> net/wireless/mlme.c | 25 +++++++
> net/wireless/nl80211.c | 152
> +++++++++++++++++++++++++++++++++++++++++++-
> net/wireless/nl80211.h | 9 +++
You are changing a lot of files that are not actually part of the
compat-wireless git repository - are you sure that this patch is
correct?
> diff --git a/include/linux/compat-3.0.h b/include/linux/compat-3.0.h
> index 8c8720e..961a3a6 100644
> --- a/include/linux/compat-3.0.h
> +++ b/include/linux/compat-3.0.h
> @@ -59,6 +59,7 @@ int __must_check kstrtos16_from_user(const char __user *s,
> size_t count, unsigne
> int __must_check kstrtou8_from_user(const char __user *s, size_t count,
> unsigned int base, u8 *res);
> int __must_check kstrtos8_from_user(const char __user *s, size_t count,
> unsigned int base, s8 *res);
>
> +/*
> static inline int __must_check kstrtou64_from_user(const char __user *s,
> size_t count, unsigned int base, u64 *res)
> {
> return kstrtoull_from_user(s, count, base, res);
> @@ -78,6 +79,7 @@ static inline int __must_check kstrtos32_from_user(const
> char __user *s, size_t
> {
> return kstrtoint_from_user(s, count, base, res);
> }
> +*/
Why are you commenting out this function?
Thanks,
--
Julian Calaby
Email: julian.calaby@gmail.com
Profile: http://www.google.com/profiles/julian.calaby/
.Plan: http://sites.google.com/site/juliancalaby/
^ permalink raw reply
* Re: [RFC 01/07] wireless-next: WAPI support for hardware-accelerated drivers
From: Julian Calaby @ 2011-10-12 2:54 UTC (permalink / raw)
To: Dmitry Tarnyagin; +Cc: linux-wireless, Bartosz MARKOWSKI, Janusz DZIEDZIC
In-Reply-To: <op.v27rufm9ya27un@edmitar>
Hi Dmitry,
Some minor comments on your patch:
Note that I'm not a maintainer and that these are comments on the
patch itself, not the code it adds.
On Wed, Oct 12, 2011 at 12:02, Dmitry Tarnyagin <abi.dmitryt@gmail.com> wrote:
> From: Janusz Dziedzic <janusz.dziedzic@tieto.com>
> Date: Wed, 1 Jun 2011 14:40:13 +0200
>
> This commit implements WAPI support for hardware-accelerated devices.
>
> Signed-off-by: Dmitry Tarnyagin <dmitry.tarnyagin@stericsson.com>
> ---
> diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h
> index 48363c3..bf86b0d 100644
> --- a/include/linux/ieee80211.h
> +++ b/include/linux/ieee80211.h
> @@ -1551,12 +1552,14 @@ enum ieee80211_sa_query_action {
> #define WLAN_CIPHER_SUITE_CCMP 0x000FAC04
> #define WLAN_CIPHER_SUITE_WEP104 0x000FAC05
> #define WLAN_CIPHER_SUITE_AES_CMAC 0x000FAC06
> +#define WLAN_CIPHER_SUITE_SMS4 0x000FAC07
>
> /* AKM suite selectors */
> #define WLAN_AKM_SUITE_8021X 0x000FAC01
> #define WLAN_AKM_SUITE_PSK 0x000FAC02
> #define WLAN_AKM_SUITE_SAE 0x000FAC08
> #define WLAN_AKM_SUITE_FT_OVER_SAE 0x000FAC09
> +#define WLAN_AKM_SUITE_WAPI_PSK 0x000FAC03
Should these go in numerical order?
> diff --git a/net/mac80211/wapi.h b/net/mac80211/wapi.h
> new file mode 100644
> index 0000000..f06eee0
> --- /dev/null
> +++ b/net/mac80211/wapi.h
> @@ -0,0 +1,27 @@
[snip]
> +#ifndef ETH_P_WAPI
> +#define ETH_P_WAPI 0x88B4
> +#endif
Should this go somewhere else? Maybe where the other ETH_P_* #defines
are defined?
Thanks,
--
Julian Calaby
Email: julian.calaby@gmail.com
Profile: http://www.google.com/profiles/julian.calaby/
.Plan: http://sites.google.com/site/juliancalaby/
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox