* Re: [PATCH] nl80211: better document NL80211_CMD_TDLS_MGMT
From: Arik Nemtsov @ 2013-10-31 12:53 UTC (permalink / raw)
To: Bob Copeland; +Cc: linux-wireless@vger.kernel.org, Johannes Berg
In-Reply-To: <20131030184302.GA1026@localhost>
On Wed, Oct 30, 2013 at 8:43 PM, Bob Copeland <me@bobcopeland.com> wrote:
>
> On Wed, Oct 30, 2013 at 07:09:34PM +0200, Arik Nemtsov wrote:
> > + * @NL80211_CMD_TDLS_MGMT: Send a TDLS management frame. The
> > + * %NL80211_ATTR_TDLS_ACTION attribute determines the typ of frame to be
>
> type typo there.
Thanks.
^ permalink raw reply
* Re: [PATCH 19/51] DMA-API: media: dt3155v4l: replace dma_set_mask()+dma_set_coherent_mask() with new helper
From: Mauro Carvalho Chehab @ 2013-10-31 11:46 UTC (permalink / raw)
To: Hans Verkuil
Cc: Russell King, alsa-devel, b43-dev, devel, devicetree, dri-devel,
e1000-devel, linux-arm-kernel, linux-crypto, linux-doc,
linux-fbdev, linux-ide, linux-media, linux-mmc, linux-nvme,
linux-omap, linuxppc-dev, linux-samsung-soc, linux-scsi,
linux-tegra, linux-usb, linux-wireless, netdev,
Solarflare linux maintainers, uclinux-dist-devel,
Greg Kroah-Hartman, Russell King
In-Reply-To: <5249673B.5020705@xs4all.nl>
Hi Russell,
Em Mon, 30 Sep 2013 13:57:47 +0200
Hans Verkuil <hverkuil@xs4all.nl> escreveu:
> On 09/19/2013 11:44 PM, Russell King wrote:
> > Replace the following sequence:
> >
> > dma_set_mask(dev, mask);
> > dma_set_coherent_mask(dev, mask);
> >
> > with a call to the new helper dma_set_mask_and_coherent().
> >
> > Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
>
> Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Somehow, I lost your original post (I got unsubscribed on a few days
from all vger mailing lists at the end of september).
I suspect that you want to sent this via your tree, right?
If so:
Acked-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
>
> Regards,
>
> Hans
>
> > ---
> > drivers/staging/media/dt3155v4l/dt3155v4l.c | 5 +----
> > 1 files changed, 1 insertions(+), 4 deletions(-)
> >
> > diff --git a/drivers/staging/media/dt3155v4l/dt3155v4l.c b/drivers/staging/media/dt3155v4l/dt3155v4l.c
> > index 90d6ac4..081407b 100644
> > --- a/drivers/staging/media/dt3155v4l/dt3155v4l.c
> > +++ b/drivers/staging/media/dt3155v4l/dt3155v4l.c
> > @@ -901,10 +901,7 @@ dt3155_probe(struct pci_dev *pdev, const struct pci_device_id *id)
> > int err;
> > struct dt3155_priv *pd;
> >
> > - err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
> > - if (err)
> > - return -ENODEV;
> > - err = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
> > + err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
> > if (err)
> > return -ENODEV;
> > pd = kzalloc(sizeof(*pd), GFP_KERNEL);
> >
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-media" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
Cheers,
Mauro
^ permalink raw reply
* [PATCH] rt2x00: fix HT TX descriptor settings regression
From: Stanislaw Gruszka @ 2013-10-31 10:23 UTC (permalink / raw)
To: linux-wireless; +Cc: users
Since:
commit 36323f817af0376c78612cfdab714b0feb05fea5
Author: Thomas Huehn <thomas@net.t-labs.tu-berlin.de>
Date: Mon Jul 23 21:33:42 2012 +0200
mac80211: move TX station pointer and restructure TX
we do not pass sta pointer to rt2x00queue_create_tx_descriptor_ht(),
hence we do not correctly set station WCID and AMPDU density parameters.
Cc: stable@vger.kernel.org # 3.7+
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
---
drivers/net/wireless/rt2x00/rt2x00lib.h | 2 +-
drivers/net/wireless/rt2x00/rt2x00mac.c | 4 ++--
drivers/net/wireless/rt2x00/rt2x00queue.c | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/net/wireless/rt2x00/rt2x00lib.h b/drivers/net/wireless/rt2x00/rt2x00lib.h
index a093598..7f40ab8 100644
--- a/drivers/net/wireless/rt2x00/rt2x00lib.h
+++ b/drivers/net/wireless/rt2x00/rt2x00lib.h
@@ -146,7 +146,7 @@ void rt2x00queue_remove_l2pad(struct sk_buff *skb, unsigned int header_length);
* @local: frame is not from mac80211
*/
int rt2x00queue_write_tx_frame(struct data_queue *queue, struct sk_buff *skb,
- bool local);
+ struct ieee80211_sta *sta, bool local);
/**
* rt2x00queue_update_beacon - Send new beacon from mac80211
diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c
index 7c15785..2183e79 100644
--- a/drivers/net/wireless/rt2x00/rt2x00mac.c
+++ b/drivers/net/wireless/rt2x00/rt2x00mac.c
@@ -90,7 +90,7 @@ static int rt2x00mac_tx_rts_cts(struct rt2x00_dev *rt2x00dev,
frag_skb->data, data_length, tx_info,
(struct ieee80211_rts *)(skb->data));
- retval = rt2x00queue_write_tx_frame(queue, skb, true);
+ retval = rt2x00queue_write_tx_frame(queue, skb, NULL, true);
if (retval) {
dev_kfree_skb_any(skb);
rt2x00_warn(rt2x00dev, "Failed to send RTS/CTS frame\n");
@@ -151,7 +151,7 @@ void rt2x00mac_tx(struct ieee80211_hw *hw,
goto exit_fail;
}
- if (unlikely(rt2x00queue_write_tx_frame(queue, skb, false)))
+ if (unlikely(rt2x00queue_write_tx_frame(queue, skb, control->sta, false)))
goto exit_fail;
/*
diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c
index 50590b1..a5d38e8 100644
--- a/drivers/net/wireless/rt2x00/rt2x00queue.c
+++ b/drivers/net/wireless/rt2x00/rt2x00queue.c
@@ -635,7 +635,7 @@ static void rt2x00queue_bar_check(struct queue_entry *entry)
}
int rt2x00queue_write_tx_frame(struct data_queue *queue, struct sk_buff *skb,
- bool local)
+ struct ieee80211_sta *sta, bool local)
{
struct ieee80211_tx_info *tx_info;
struct queue_entry *entry;
@@ -649,7 +649,7 @@ int rt2x00queue_write_tx_frame(struct data_queue *queue, struct sk_buff *skb,
* after that we are free to use the skb->cb array
* for our information.
*/
- rt2x00queue_create_tx_descriptor(queue->rt2x00dev, skb, &txdesc, NULL);
+ rt2x00queue_create_tx_descriptor(queue->rt2x00dev, skb, &txdesc, sta);
/*
* All information is retrieved from the skb->cb array,
--
1.8.3.1
^ permalink raw reply related
* [PATCH] wcn36xx: enable beacon change using BSS_CHANGED_BEACON
From: Chun-Yeow Yeoh @ 2013-10-31 6:07 UTC (permalink / raw)
To: linux-wireless
Cc: k.eugene.e, linville, wcn36xx, Chun-Yeow Yeoh, Chun-Yeow Yeoh
Enable the beacon changed using BSS_CHANGED_BEACON. This is
especially useful for mesh mode.
Signed-off-by: Chun-Yeow Yeoh <yeohchunyeow@cozybit.com>
---
drivers/net/wireless/ath/wcn36xx/main.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/net/wireless/ath/wcn36xx/main.c b/drivers/net/wireless/ath/wcn36xx/main.c
index 7839b31..e64a678 100644
--- a/drivers/net/wireless/ath/wcn36xx/main.c
+++ b/drivers/net/wireless/ath/wcn36xx/main.c
@@ -641,7 +641,8 @@ static void wcn36xx_bss_info_changed(struct ieee80211_hw *hw,
dev_kfree_skb(skb);
}
- if (changed & BSS_CHANGED_BEACON_ENABLED) {
+ if (changed & BSS_CHANGED_BEACON_ENABLED ||
+ changed & BSS_CHANGED_BEACON) {
wcn36xx_dbg(WCN36XX_DBG_MAC,
"mac bss changed beacon enabled %d\n",
bss_conf->enable_beacon);
--
1.7.9.5
^ permalink raw reply related
* [PATCH] wcn36xx: enable the beaconing in mesh mode
From: Chun-Yeow Yeoh @ 2013-10-31 6:04 UTC (permalink / raw)
To: linux-wireless
Cc: k.eugene.e, linville, wcn36xx, Chun-Yeow Yeoh, Chun-Yeow Yeoh
Enable the beaconing in wnc36xx by tweaking the tim offset and
force the use of AP-style beaconing. Otherwise, beaconing is not
working. The tim offset is set to 256. Otherwise, this will
overwrite mesh beacon submitted by mac80211.
Signed-off-by: Chun-Yeow Yeoh <yeohchunyeow@cozybit.com>
---
drivers/net/wireless/ath/wcn36xx/smd.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/drivers/net/wireless/ath/wcn36xx/smd.c b/drivers/net/wireless/ath/wcn36xx/smd.c
index f8c3a10..19f43de 100644
--- a/drivers/net/wireless/ath/wcn36xx/smd.c
+++ b/drivers/net/wireless/ath/wcn36xx/smd.c
@@ -1134,14 +1134,14 @@ int wcn36xx_smd_config_bss(struct wcn36xx *wcn, struct ieee80211_vif *vif,
/* STA */
bss->oper_mode = 1;
bss->wcn36xx_hal_persona = WCN36XX_HAL_STA_MODE;
- } else if (vif->type == NL80211_IFTYPE_AP) {
+ } else if (vif->type == NL80211_IFTYPE_AP ||
+ vif->type == NL80211_IFTYPE_MESH_POINT) {
bss->bss_type = WCN36XX_HAL_INFRA_AP_MODE;
/* AP */
bss->oper_mode = 0;
bss->wcn36xx_hal_persona = WCN36XX_HAL_STA_SAP_MODE;
- } else if (vif->type == NL80211_IFTYPE_ADHOC ||
- vif->type == NL80211_IFTYPE_MESH_POINT) {
+ } else if (vif->type == NL80211_IFTYPE_ADHOC) {
bss->bss_type = WCN36XX_HAL_IBSS_MODE;
/* STA */
@@ -1291,7 +1291,11 @@ int wcn36xx_smd_send_beacon(struct wcn36xx *wcn, struct ieee80211_vif *vif,
memcpy(msg_body.bssid, vif->addr, ETH_ALEN);
/* TODO need to find out why this is needed? */
- msg_body.tim_ie_offset = tim_off+4;
+ if (vif->type == NL80211_IFTYPE_MESH_POINT)
+ /* mesh beacon don't need this, so push further down */
+ msg_body.tim_ie_offset = 256;
+ else
+ msg_body.tim_ie_offset = tim_off+4;
msg_body.p2p_ie_offset = p2p_off;
PREPARE_HAL_BUF(wcn->hal_buf, msg_body);
--
1.7.9.5
^ permalink raw reply related
* Re: [PATCH/RFT 00/12] ath10k: pci fixes 2013-10-30
From: Ben Greear @ 2013-10-30 23:41 UTC (permalink / raw)
To: Michal Kazior; +Cc: ath10k, linux-wireless
In-Reply-To: <1383133346-8135-1-git-send-email-michal.kazior@tieto.com>
On 10/30/2013 04:42 AM, Michal Kazior wrote:
> Hi,
>
> This patchset contains a slew of PCI/CE cleanups
> and fixes. The aim of the patchset is to deal with
> CE null dereference bugs Ben has been reporting on
> the mailing list for some time now.
>
> I've done some brief testing and don't see any
> major regressions. I wasn't able to reproduce the
> reported bugs though. @Ben: Could you perhaps test
> this, please?
I have done a bit of testing on this. First, I did see
a total machine lockup, but I have been seeing those fairly
often on module reloads, so probably that was nothing new
in your patches.
I am also still running the crash avoidance patches I posted
recently.
And good news for me at least...with some modified firmware,
I am getting two stations to associate to the same AP and
pass traffic to each other (no encryption..that probably
doesn't work yet) :)
Thanks,
Ben
--
Ben Greear <greearb@candelatech.com>
Candela Technologies Inc http://www.candelatech.com
^ permalink raw reply
* Re: [PATCH 0/7] wireless-regdb: DFS regions and optimizations
From: Luis R. Rodriguez @ 2013-10-30 21:46 UTC (permalink / raw)
To: John W. Linville
Cc: linux-wireless, wireless-regdb@lists.infradead.org,
Luis R. Rodriguez
In-Reply-To: <1383169509-22619-1-git-send-email-mcgrof@do-not-panic.com>
On Wed, Oct 30, 2013 at 10:45 PM, Luis R. Rodriguez
<mcgrof@do-not-panic.com> wrote:
> This patch series associates a slew of countries
> to DFS regions and then provides updates to 4
> countries based on the new CRDA optimizer. The
> optimizations have no functional changes other
> than reducing the size of the regulatory domain
> data strucutre that would be used to send to
> the kernel.
I should note that this depends on the removal of antenna gain patch.
Luis
^ permalink raw reply
* [PATCH 7/7] wireless-regdb: optimize two of NL's rules
From: Luis R. Rodriguez @ 2013-10-30 21:45 UTC (permalink / raw)
To: linville; +Cc: linux-wireless, wireless-regdb, Luis R. Rodriguez
In-Reply-To: <1383169509-22619-1-git-send-email-mcgrof@do-not-panic.com>
There's no reason not to merge these two rules.
This as picked up by the new CRDA optimizer.
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
---
db.txt | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/db.txt b/db.txt
index efd9902..429a380 100644
--- a/db.txt
+++ b/db.txt
@@ -557,8 +557,7 @@ country MX: DFS-FCC
country NL: DFS-ETSI
(2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), NO-OUTDOOR
- (5250 - 5330 @ 80), (20), NO-OUTDOOR
+ (5170 - 5330 @ 80), (20), NO-OUTDOOR
(5490 - 5710 @ 80), (27), DFS
# 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (40), NO-OUTDOOR
--
1.8.4.rc3
^ permalink raw reply related
* [PATCH 6/7] wireless-regdb: optimize two of IL's rules
From: Luis R. Rodriguez @ 2013-10-30 21:45 UTC (permalink / raw)
To: linville; +Cc: linux-wireless, wireless-regdb, Luis R. Rodriguez
In-Reply-To: <1383169509-22619-1-git-send-email-mcgrof@do-not-panic.com>
There's no reason not to merge these two rules.
This as picked up by the new CRDA optimizer.
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
---
db.txt | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/db.txt b/db.txt
index 7532166..efd9902 100644
--- a/db.txt
+++ b/db.txt
@@ -389,8 +389,7 @@ country IE: DFS-ETSI
country IL: DFS-ETSI
(2402 - 2482 @ 40), (20)
- (5150 - 5250 @ 80), (200 mW), NO-OUTDOOR
- (5250 - 5350 @ 80), (200 mW), NO-OUTDOOR
+ (5150 - 5350 @ 80), (200 mW), NO-OUTDOOR
country IN: DFS-JP
(2402 - 2482 @ 40), (20)
--
1.8.4.rc3
^ permalink raw reply related
* [PATCH 5/7] wireless-regdb: optimize two of ES's rules
From: Luis R. Rodriguez @ 2013-10-30 21:45 UTC (permalink / raw)
To: linville; +Cc: linux-wireless, wireless-regdb, Luis R. Rodriguez
In-Reply-To: <1383169509-22619-1-git-send-email-mcgrof@do-not-panic.com>
There's no reason not to merge these two rules.
This as picked up by the new CRDA optimizer.
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
---
db.txt | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/db.txt b/db.txt
index da8fcfe..7532166 100644
--- a/db.txt
+++ b/db.txt
@@ -268,8 +268,7 @@ country EG: DFS-ETSI
country ES: DFS-ETSI
(2400 - 2483.5 @ 40), (100 mW)
- (5150 - 5250 @ 80), (100 mW), NO-OUTDOOR
- (5250 - 5350 @ 80), (100 mW), NO-OUTDOOR
+ (5150 - 5350 @ 80), (100 mW), NO-OUTDOOR
(5470 - 5725 @ 80), (500 mW), DFS
# 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (40), NO-OUTDOOR
--
1.8.4.rc3
^ permalink raw reply related
* [PATCH 4/7] wireless-regdb: optimize two of DE's rules
From: Luis R. Rodriguez @ 2013-10-30 21:45 UTC (permalink / raw)
To: linville; +Cc: linux-wireless, wireless-regdb, Luis R. Rodriguez
In-Reply-To: <1383169509-22619-1-git-send-email-mcgrof@do-not-panic.com>
There's no reason not to merge these two rules.
This as picked up by the new CRDA optimizer.
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
---
db.txt | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/db.txt b/db.txt
index 5ca9704..da8fcfe 100644
--- a/db.txt
+++ b/db.txt
@@ -222,10 +222,8 @@ country CZ: DFS-ETSI
country DE: DFS-ETSI
# entries 279004 and 280006
(2400 - 2483.5 @ 40), (100 mW)
- # entry 303005
- (5150 - 5250 @ 80), (100 mW), NO-OUTDOOR
- # entries 304002 and 305002
- (5250 - 5350 @ 80), (100 mW), NO-OUTDOOR
+ # entry 303005, 304002 and 305002
+ (5150 - 5350 @ 80), (100 mW), NO-OUTDOOR
# entries 308002, 309001 and 310003
(5470 - 5725 @ 80), (500 mW), DFS
# 60 gHz band channels 1-4, ref: Etsi En 302 567
--
1.8.4.rc3
^ permalink raw reply related
* [PATCH 3/7] wireless-regdb: add DFS JP regions
From: Luis R. Rodriguez @ 2013-10-30 21:45 UTC (permalink / raw)
To: linville; +Cc: linux-wireless, wireless-regdb, Luis R. Rodriguez
In-Reply-To: <1383169509-22619-1-git-send-email-mcgrof@do-not-panic.com>
This associates the following countries to the
DFS JP region:
BD, BH, BN, BO, BZ, CL, DZ, ID, IN, IR
JP, JO, KE, KP, KR, NP, PK, QA, TW
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
---
db.txt | 36 ++++++++++++++++++------------------
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/db.txt b/db.txt
index 1c20be2..5ca9704 100644
--- a/db.txt
+++ b/db.txt
@@ -86,7 +86,7 @@ country BB: DFS-FCC
(5250 - 5330 @ 40), (23), DFS
(5735 - 5835 @ 40), (30)
-country BD:
+country BD: DFS-JP
(2402 - 2482 @ 40), (20)
country BE: DFS-ETSI
@@ -105,7 +105,7 @@ country BG: DFS-ETSI
# 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (40), NO-OUTDOOR
-country BH:
+country BH: DFS-JP
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 20), (20)
(5250 - 5330 @ 20), (20), DFS
@@ -116,13 +116,13 @@ country BL:
(5170 - 5250 @ 40), (18)
(5250 - 5330 @ 40), (18), DFS
-country BN:
+country BN: DFS-JP
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 40), (20)
(5250 - 5330 @ 40), (20), DFS
(5735 - 5835 @ 40), (30)
-country BO:
+country BO: DFS-JP
(2402 - 2482 @ 40), (30)
(5735 - 5835 @ 40), (30)
@@ -139,7 +139,7 @@ country BY: DFS-ETSI
(5250 - 5330 @ 40), (20), DFS
(5490 - 5710 @ 40), (27), DFS
-country BZ:
+country BZ: DFS-JP
(2402 - 2482 @ 40), (30)
(5735 - 5835 @ 40), (30)
@@ -158,7 +158,7 @@ country CH: DFS-ETSI
# 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (40), NO-OUTDOOR
-country CL:
+country CL: DFS-JP
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 40), (20)
(5250 - 5330 @ 40), (20), DFS
@@ -245,7 +245,7 @@ country DO: DFS-FCC
(5250 - 5330 @ 40), (23), DFS
(5735 - 5835 @ 40), (30)
-country DZ:
+country DZ: DFS-JP
(2402 - 2482 @ 40), (20)
country EC: DFS-FCC
@@ -377,7 +377,7 @@ country HU: DFS-ETSI
# 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (40), NO-OUTDOOR
-country ID:
+country ID: DFS-JP
# ref: http://www.postel.go.id/content/ID/regulasi/standardisasi/kepdir/bwa%205,8%20ghz.pdf
(2402 - 2482 @ 40), (20)
(5735 - 5815 @ 80), (20)
@@ -395,7 +395,7 @@ country IL: DFS-ETSI
(5150 - 5250 @ 80), (200 mW), NO-OUTDOOR
(5250 - 5350 @ 80), (200 mW), NO-OUTDOOR
-country IN:
+country IN: DFS-JP
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 40), (20)
(5250 - 5330 @ 40), (20), DFS
@@ -409,7 +409,7 @@ country IS: DFS-ETSI
# 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (40), NO-OUTDOOR
-country IR:
+country IR: DFS-JP
(2402 - 2482 @ 40), (20)
(5735 - 5835 @ 40), (30)
@@ -428,7 +428,7 @@ country JM: DFS-FCC
(5490 - 5710 @ 40), (20), DFS
(5735 - 5835 @ 40), (30)
-country JP:
+country JP: DFS-JP
(2402 - 2482 @ 40), (20)
(2474 - 2494 @ 20), (20), NO-OFDM
(4910 - 4990 @ 40), (23)
@@ -437,11 +437,11 @@ country JP:
(5250 - 5330 @ 80), (20), DFS
(5490 - 5710 @ 160), (23), DFS
-country JO:
+country JO: DFS-JP
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 40), (18)
-country KE:
+country KE: DFS-JP
(2402 - 2482 @ 40), (20)
(5735 - 5835 @ 40), (30)
@@ -451,7 +451,7 @@ country KH: DFS-ETSI
(5250 - 5330 @ 40), (20), DFS
(5490 - 5710 @ 40), (27), DFS
-country KP:
+country KP: DFS-JP
(2402 - 2482 @ 40), (20)
(5170 - 5330 @ 40), (20)
(5160 - 5250 @ 40), (20), DFS
@@ -575,7 +575,7 @@ country NO: DFS-ETSI
# 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (40), NO-OUTDOOR
-country NP:
+country NP: DFS-JP
(2402 - 2482 @ 40), (20)
(5735 - 5835 @ 40), (30)
@@ -619,7 +619,7 @@ country PH: DFS-FCC
(5490 - 5710 @ 80), (24), DFS
(5735 - 5835 @ 80), (30)
-country PK:
+country PK: DFS-JP
(2402 - 2482 @ 40), (20)
(5735 - 5835 @ 40), (30)
@@ -646,7 +646,7 @@ country PR: DFS-FCC
(5490 - 5710 @ 80), (24), DFS
(5735 - 5835 @ 80), (30)
-country QA:
+country QA: DFS-JP
(2402 - 2482 @ 40), (20)
(5735 - 5835 @ 40), (30)
@@ -725,7 +725,7 @@ country SV: DFS-FCC
country SY:
(2402 - 2482 @ 40), (20)
-country TW:
+country TW: DFS-JP
(2402 - 2472 @ 40), (27)
(5270 - 5330 @ 40), (17), DFS
(5490 - 5710 @ 80), (30), DFS
--
1.8.4.rc3
^ permalink raw reply related
* [PATCH 2/7] wireless-regdb: add DFS ETSI regions
From: Luis R. Rodriguez @ 2013-10-30 21:45 UTC (permalink / raw)
To: linville; +Cc: linux-wireless, wireless-regdb, Luis R. Rodriguez
In-Reply-To: <1383169509-22619-1-git-send-email-mcgrof@do-not-panic.com>
This associates the following countries to the
DFS ETSI region:
AL, AM, AN, AW, AZ, BY, EG, GE, HT,
IL, KH, KW, MA, OM, RS, RU, SA, TN,
UA, ZA, ZW
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
---
db.txt | 40 ++++++++++++++++++++--------------------
1 file changed, 20 insertions(+), 20 deletions(-)
diff --git a/db.txt b/db.txt
index 94da96a..1c20be2 100644
--- a/db.txt
+++ b/db.txt
@@ -25,15 +25,15 @@ country AE: DFS-FCC
(5490 - 5710 @ 80), (24), DFS
(5735 - 5835 @ 80), (30)
-country AL:
+country AL: DFS-ETSI
(2402 - 2482 @ 20), (20)
-country AM:
+country AM: DFS-ETSI
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 20), (18)
(5250 - 5330 @ 20), (18), DFS
-country AN:
+country AN: DFS-ETSI
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 40), (20)
(5250 - 5330 @ 40), (20), DFS
@@ -61,13 +61,13 @@ country AU:
(5490 - 5710 @ 80), (24), DFS
(5735 - 5835 @ 80), (30)
-country AW:
+country AW: DFS-ETSI/
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 40), (20)
(5250 - 5330 @ 40), (20), DFS
(5490 - 5710 @ 40), (27), DFS
-country AZ:
+country AZ: DFS-ETSI
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 40), (18)
(5250 - 5330 @ 40), (18), DFS
@@ -133,7 +133,7 @@ country BR: DFS-FCC
(5490 - 5710 @ 80), (24), DFS
(5735 - 5835 @ 80), (30)
-country BY:
+country BY: DFS-ETSI
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 40), (20)
(5250 - 5330 @ 40), (20), DFS
@@ -263,7 +263,7 @@ country EE: DFS-ETSI
# 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (40), NO-OUTDOOR
-country EG:
+country EG: DFS-ETSI
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 20), (20)
(5250 - 5330 @ 20), (20), DFS
@@ -292,7 +292,7 @@ country FR: DFS-ETSI
# 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (40), NO-OUTDOOR
-country GE:
+country GE: DFS-ETSI
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 40), (18)
(5250 - 5330 @ 40), (18), DFS
@@ -363,7 +363,7 @@ country HR: DFS-ETSI
# 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (40), NO-OUTDOOR
-country HT:
+country HT: DFS-ETSI
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 40), (20)
(5250 - 5330 @ 40), (20), DFS
@@ -390,7 +390,7 @@ country IE: DFS-ETSI
# 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (40), NO-OUTDOOR
-country IL:
+country IL: DFS-ETSI
(2402 - 2482 @ 40), (20)
(5150 - 5250 @ 80), (200 mW), NO-OUTDOOR
(5250 - 5350 @ 80), (200 mW), NO-OUTDOOR
@@ -445,7 +445,7 @@ country KE:
(2402 - 2482 @ 40), (20)
(5735 - 5835 @ 40), (30)
-country KH:
+country KH: DFS-ETSI
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 40), (20)
(5250 - 5330 @ 40), (20), DFS
@@ -519,7 +519,7 @@ country MC: DFS-ETSI
(5170 - 5250 @ 40), (18)
(5250 - 5330 @ 40), (18), DFS
-country MA:
+country MA: DFS-ETSI
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 80), (23)
(5735 - 5835 @ 80), (23)
@@ -586,7 +586,7 @@ country NZ: DFS-FCC
(5490 - 5710 @ 80), (24), DFS
(5735 - 5835 @ 80), (30)
-country OM:
+country OM: DFS-ETSI
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 40), (17)
(5250 - 5330 @ 40), (20), DFS
@@ -661,14 +661,14 @@ country RO: DFS-ETSI
# Source:
# http://www.ratel.rs/upload/documents/Plan_namene/Plan_namene-sl_glasnik.pdf
-country RS:
+country RS: DFS-ETSI
(2400 - 2483.5 @ 40), (100 mW)
(5150 - 5350 @ 40), (200 mW), NO-OUTDOOR
(5470 - 5725 @ 20), (1000 mW), DFS
# 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (40), NO-OUTDOOR
-country RU:
+country RU: DFS-ETSI
(2402 - 2482 @ 40), (20)
(5170 - 5330 @ 40), (20)
(5650 - 5710 @ 40), (30)
@@ -678,7 +678,7 @@ country RW: DFS-FCC
(2402 - 2482 @ 40), (20)
(5735 - 5835 @ 40), (30)
-country SA:
+country SA: DFS-ETSI
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 80), (17)
(5250 - 5330 @ 80), (24), DFS
@@ -745,7 +745,7 @@ country TT: DFS-FCC
(5490 - 5710 @ 40), (20), DFS
(5735 - 5835 @ 40), (30)
-country TN:
+country TN: DFS-ETSI
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 20), (20)
(5250 - 5330 @ 20), (20), DFS
@@ -765,7 +765,7 @@ country TR: DFS-ETSI
# Listed 5GHz range is a lowest common denominator for all related
# rules in the referenced laws. Such a range is used because of
# disputable definitions there.
-country UA:
+country UA: DFS-ETSI
(2400 - 2483.5 @ 40), (20), NO-OUTDOOR
(5150 - 5350 @ 40), (20), NO-OUTDOOR
# 60 gHz band channels 1-4, ref: Etsi En 302 567
@@ -811,13 +811,13 @@ country VN: DFS-FCC
country YE:
(2402 - 2482 @ 40), (20)
-country ZA:
+country ZA: DFS-ETSI
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 80), (17)
(5250 - 5330 @ 80), (24), DFS
(5490 - 5710 @ 80), (24), DFS
(5735 - 5835 @ 80), (30)
-country ZW:
+country ZW: DFS-ETSI
(2402 - 2482 @ 40), (20)
--
1.8.4.rc3
^ permalink raw reply related
* [PATCH 1/7] wireless-regdb: add DFS FCC regions
From: Luis R. Rodriguez @ 2013-10-30 21:45 UTC (permalink / raw)
To: linville; +Cc: linux-wireless, wireless-regdb, Luis R. Rodriguez
In-Reply-To: <1383169509-22619-1-git-send-email-mcgrof@do-not-panic.com>
This associates the following countries to the
DFS FCC region:
AE, AR, BB, BR, CA, CN, CO, CR, DO, EC,
GD, GT, GU, HN, JM, LB, LK, MY, MX, NZ,
PA, PE, PG, PH, PR, RW, SG, SV, TH, TT,
UY, UZ, VE, VN
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
---
db.txt | 68 +++++++++++++++++++++++++++++++++---------------------------------
1 file changed, 34 insertions(+), 34 deletions(-)
diff --git a/db.txt b/db.txt
index c938767..94da96a 100644
--- a/db.txt
+++ b/db.txt
@@ -18,7 +18,7 @@ country AD:
# 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (40), NO-OUTDOOR
-country AE:
+country AE: DFS-FCC
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 80), (17)
(5250 - 5330 @ 80), (24), DFS
@@ -39,7 +39,7 @@ country AN:
(5250 - 5330 @ 40), (20), DFS
(5490 - 5710 @ 40), (27), DFS
-country AR:
+country AR: DFS-FCC
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 80), (17)
(5250 - 5330 @ 80), (24), DFS
@@ -80,7 +80,7 @@ country BA: DFS-ETSI
# 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (40), NO-OUTDOOR
-country BB:
+country BB: DFS-FCC
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 40), (23)
(5250 - 5330 @ 40), (23), DFS
@@ -126,7 +126,7 @@ country BO:
(2402 - 2482 @ 40), (30)
(5735 - 5835 @ 40), (30)
-country BR:
+country BR: DFS-FCC
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 80), (17)
(5250 - 5330 @ 80), (24), DFS
@@ -143,7 +143,7 @@ country BZ:
(2402 - 2482 @ 40), (30)
(5735 - 5835 @ 40), (30)
-country CA:
+country CA: DFS-FCC
(2402 - 2472 @ 40), (27)
(5170 - 5250 @ 80), (17)
(5250 - 5330 @ 80), (24), DFS
@@ -164,7 +164,7 @@ country CL:
(5250 - 5330 @ 40), (20), DFS
(5735 - 5835 @ 40), (20)
-country CN:
+country CN: DFS-FCC
(2402 - 2482 @ 40), (20)
(5735 - 5835 @ 80), (30)
# 60 gHz band channels 1,4: 28dBm, channels 2,3: 44dBm
@@ -173,14 +173,14 @@ country CN:
(59400 - 63720 @ 2160), (44)
(63720 - 65880 @ 2160), (28)
-country CO:
+country CO: DFS-FCC
(2402 - 2472 @ 40), (27)
(5170 - 5250 @ 80), (17)
(5250 - 5330 @ 80), (24), DFS
(5490 - 5710 @ 80), (24), DFS
(5735 - 5835 @ 80), (30)
-country CR:
+country CR: DFS-FCC
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 80), (17)
(5250 - 5330 @ 80), (24), DFS
@@ -239,7 +239,7 @@ country DK: DFS-ETSI
# 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (40), NO-OUTDOOR
-country DO:
+country DO: DFS-FCC
(2402 - 2472 @ 40), (27)
(5170 - 5250 @ 40), (17)
(5250 - 5330 @ 40), (23), DFS
@@ -248,7 +248,7 @@ country DO:
country DZ:
(2402 - 2482 @ 40), (20)
-country EC:
+country EC: DFS-FCC
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 80), (17)
(5250 - 5330 @ 80), (24), DFS
@@ -307,7 +307,7 @@ country GB: DFS-ETSI
# 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (40), NO-OUTDOOR
-country GD:
+country GD: DFS-FCC
(2402 - 2472 @ 40), (27)
(5170 - 5250 @ 40), (17)
(5250 - 5330 @ 40), (20), DFS
@@ -328,20 +328,20 @@ country GL: DFS-ETSI
(5250 - 5330 @ 20), (20), DFS
(5490 - 5710 @ 20), (27), DFS
-country GT:
+country GT: DFS-FCC
(2402 - 2472 @ 40), (27)
(5170 - 5250 @ 40), (17)
(5250 - 5330 @ 40), (23), DFS
(5735 - 5835 @ 40), (30)
-country GU:
+country GU: DFS-FCC
(2402 - 2472 @ 40), (27)
(5170 - 5250 @ 80), (17)
(5250 - 5330 @ 80), (24), DFS
(5490 - 5710 @ 80), (24), DFS
(5735 - 5835 @ 80), (30)
-country HN:
+country HN: DFS-FCC
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 40), (17)
(5250 - 5330 @ 40), (20), DFS
@@ -421,7 +421,7 @@ country IT: DFS-ETSI
# 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (40), NO-OUTDOOR
-country JM:
+country JM: DFS-FCC
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 40), (17)
(5250 - 5330 @ 40), (20), DFS
@@ -473,7 +473,7 @@ country KW:
country KZ:
(2402 - 2482 @ 40), (20)
-country LB:
+country LB: DFS-FCC
(2402 - 2482 @ 40), (20)
(5735 - 5835 @ 40), (30)
@@ -483,7 +483,7 @@ country LI: DFS-ETSI
(5250 - 5330 @ 40), (20), DFS
(5490 - 5710 @ 40), (27), DFS
-country LK:
+country LK: DFS-FCC
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 20), (17)
(5250 - 5330 @ 20), (20), DFS
@@ -546,13 +546,13 @@ country MT: DFS-ETSI
# 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (40), NO-OUTDOOR
-country MY:
+country MY: DFS-FCC
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 80), (17)
(5250 - 5330 @ 80), (23), DFS
(5735 - 5835 @ 80), (30)
-country MX:
+country MX: DFS-FCC
(2402 - 2472 @ 40), (27)
(5170 - 5250 @ 80), (17)
(5250 - 5330 @ 80), (24), DFS
@@ -579,7 +579,7 @@ country NP:
(2402 - 2482 @ 40), (20)
(5735 - 5835 @ 40), (30)
-country NZ:
+country NZ: DFS-FCC
(2402 - 2482 @ 40), (30)
(5170 - 5250 @ 80), (17)
(5250 - 5330 @ 80), (24), DFS
@@ -593,26 +593,26 @@ country OM:
(5490 - 5710 @ 40), (20), DFS
(5735 - 5835 @ 40), (30)
-country PA:
+country PA: DFS-FCC
(2402 - 2472 @ 40), (27)
(5170 - 5250 @ 40), (17)
(5250 - 5330 @ 40), (23), DFS
(5735 - 5835 @ 40), (30)
-country PE:
+country PE: DFS-FCC
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 80), (17)
(5250 - 5330 @ 80), (24), DFS
(5490 - 5710 @ 80), (24), DFS
(5735 - 5835 @ 80), (30)
-country PG:
+country PG: DFS-FCC
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 40), (17)
(5250 - 5330 @ 40), (23), DFS
(5735 - 5835 @ 40), (30)
-country PH:
+country PH: DFS-FCC
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 80), (17)
(5250 - 5330 @ 80), (24), DFS
@@ -639,7 +639,7 @@ country PT: DFS-ETSI
# 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (40), NO-OUTDOOR
-country PR:
+country PR: DFS-FCC
(2402 - 2472 @ 40), (27)
(5170 - 5250 @ 80), (17)
(5250 - 5330 @ 80), (24), DFS
@@ -674,7 +674,7 @@ country RU:
(5650 - 5710 @ 40), (30)
(5735 - 5835 @ 40), (30)
-country RW:
+country RW: DFS-FCC
(2402 - 2482 @ 40), (20)
(5735 - 5835 @ 40), (30)
@@ -693,7 +693,7 @@ country SE: DFS-ETSI
# 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (40), NO-OUTDOOR
-country SG:
+country SG: DFS-FCC
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 80), (17)
(5250 - 5330 @ 80), (24), DFS
@@ -716,7 +716,7 @@ country SK: DFS-ETSI
# 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (40), NO-OUTDOOR
-country SV:
+country SV: DFS-FCC
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 20), (17)
(5250 - 5330 @ 20), (23), DFS
@@ -731,14 +731,14 @@ country TW:
(5490 - 5710 @ 80), (30), DFS
(5735 - 5815 @ 80), (30)
-country TH:
+country TH: DFS-FCC
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 80), (17)
(5250 - 5330 @ 80), (24), DFS
(5490 - 5710 @ 80), (24), DFS
(5735 - 5835 @ 80), (30)
-country TT:
+country TT: DFS-FCC
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 40), (17)
(5250 - 5330 @ 40), (20), DFS
@@ -783,25 +783,25 @@ country US: DFS-FCC
# channels 1,2,3, EIRP=40dBm(43dBm peak)
(57240 - 63720 @ 2160), (40)
-country UY:
+country UY: DFS-FCC
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 40), (17)
(5250 - 5330 @ 40), (20), DFS
(5490 - 5710 @ 40), (20), DFS
(5735 - 5835 @ 40), (30)
-country UZ:
+country UZ: DFS-FCC
(2402 - 2472 @ 40), (27)
(5170 - 5250 @ 40), (17)
(5250 - 5330 @ 40), (20), DFS
(5490 - 5710 @ 40), (20), DFS
(5735 - 5835 @ 40), (30)
-country VE:
+country VE: DFS-FCC
(2402 - 2482 @ 40), (20)
(5735 - 5815 @ 40), (23)
-country VN:
+country VN: DFS-FCC
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 80), (17)
(5250 - 5330 @ 80), (24), DFS
--
1.8.4.rc3
^ permalink raw reply related
* [PATCH 0/7] wireless-regdb: DFS regions and optimizations
From: Luis R. Rodriguez @ 2013-10-30 21:45 UTC (permalink / raw)
To: linville; +Cc: linux-wireless, wireless-regdb, Luis R. Rodriguez
This patch series associates a slew of countries
to DFS regions and then provides updates to 4
countries based on the new CRDA optimizer. The
optimizations have no functional changes other
than reducing the size of the regulatory domain
data strucutre that would be used to send to
the kernel.
Luis R. Rodriguez (7):
wireless-regdb: add DFS FCC regions
wireless-regdb: add DFS ETSI regions
wireless-regdb: add DFS JP regions
wireless-regdb: optimize two of DE's rules
wireless-regdb: optimize two of ES's rules
wireless-regdb: optimize two of IL's rules
wireless-regdb: optimize two of NL's rules
db.txt | 159 +++++++++++++++++++++++++++++++----------------------------------
1 file changed, 77 insertions(+), 82 deletions(-)
--
1.8.4.rc3
^ permalink raw reply
* [PATCH 9/9] iwlwifi: mvm: BT Coex - fix copy paste issue
From: Emmanuel Grumbach @ 2013-10-30 20:31 UTC (permalink / raw)
To: John Linville; +Cc: linux-wireless, Emmanuel Grumbach
In-Reply-To: <1383165097-4445-1-git-send-email-emmanuel.grumbach@intel.com>
Putting the context id of the primary phy context in
the placeholder of the secondary is obviously a bad
idea.
Spotted by smatch.
Fixes: dac94da8dba3 ("iwlwifi: mvm: new BT Coex API")
Reviewed-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
---
drivers/net/wireless/iwlwifi/mvm/bt-coex.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/wireless/iwlwifi/mvm/bt-coex.c b/drivers/net/wireless/iwlwifi/mvm/bt-coex.c
index 7444b2a..5d066cb 100644
--- a/drivers/net/wireless/iwlwifi/mvm/bt-coex.c
+++ b/drivers/net/wireless/iwlwifi/mvm/bt-coex.c
@@ -755,7 +755,7 @@ static void iwl_mvm_bt_coex_notif_handle(struct iwl_mvm *mvm)
cmd.bt_secondary_ci =
iwl_ci_mask[chan->def.chan->hw_value][ci_bw_idx];
- cmd.secondary_ch_phy_id = *((u16 *)data.primary->drv_priv);
+ cmd.secondary_ch_phy_id = *((u16 *)data.secondary->drv_priv);
}
rcu_read_unlock();
--
1.8.3.2
^ permalink raw reply related
* [PATCH 8/9] iwlwifi: remove duplicate includes
From: Emmanuel Grumbach @ 2013-10-30 20:31 UTC (permalink / raw)
To: John Linville; +Cc: linux-wireless, Michael Opdenacker, Emmanuel Grumbach
In-Reply-To: <1383165097-4445-1-git-send-email-emmanuel.grumbach@intel.com>
From: Michael Opdenacker <michael.opdenacker@free-electrons.com>
Reported by "make includecheck"
Tested that the corresponding sources still compile well on x86
Signed-off-by: Michael Opdenacker <michael.opdenacker@free-electrons.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
---
drivers/net/wireless/iwlwifi/iwl-io.c | 1 -
drivers/net/wireless/iwlwifi/mvm/mvm.h | 1 -
2 files changed, 2 deletions(-)
diff --git a/drivers/net/wireless/iwlwifi/iwl-io.c b/drivers/net/wireless/iwlwifi/iwl-io.c
index dfa4d2e..ad8e19a 100644
--- a/drivers/net/wireless/iwlwifi/iwl-io.c
+++ b/drivers/net/wireless/iwlwifi/iwl-io.c
@@ -34,7 +34,6 @@
#include "iwl-csr.h"
#include "iwl-debug.h"
#include "iwl-fh.h"
-#include "iwl-csr.h"
#define IWL_POLL_INTERVAL 10 /* microseconds */
diff --git a/drivers/net/wireless/iwlwifi/mvm/mvm.h b/drivers/net/wireless/iwlwifi/mvm/mvm.h
index 6235cb7..fed21ef 100644
--- a/drivers/net/wireless/iwlwifi/mvm/mvm.h
+++ b/drivers/net/wireless/iwlwifi/mvm/mvm.h
@@ -73,7 +73,6 @@
#include "iwl-trans.h"
#include "iwl-notif-wait.h"
#include "iwl-eeprom-parse.h"
-#include "iwl-trans.h"
#include "sta.h"
#include "fw-api.h"
#include "constants.h"
--
1.8.3.2
^ permalink raw reply related
* [PATCH 7/9] iwlwifi: warn if firmware image doesn't exist
From: Emmanuel Grumbach @ 2013-10-30 20:31 UTC (permalink / raw)
To: John Linville; +Cc: linux-wireless, Johannes Berg, Emmanuel Grumbach
In-Reply-To: <1383165097-4445-1-git-send-email-emmanuel.grumbach@intel.com>
From: Johannes Berg <johannes.berg@intel.com>
If the firmware image that we attempt to load doesn't
actually exist we have a broken firmware file or other
code not checking things correctly, so warn in such a
case. Also avoid assigning cur_ucode/ucode_loaded then.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
---
drivers/net/wireless/iwlwifi/dvm/ucode.c | 9 ++++-----
drivers/net/wireless/iwlwifi/mvm/fw.c | 8 +++-----
2 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/drivers/net/wireless/iwlwifi/dvm/ucode.c b/drivers/net/wireless/iwlwifi/dvm/ucode.c
index 86270b6..6363794 100644
--- a/drivers/net/wireless/iwlwifi/dvm/ucode.c
+++ b/drivers/net/wireless/iwlwifi/dvm/ucode.c
@@ -330,15 +330,14 @@ int iwl_load_ucode_wait_alive(struct iwl_priv *priv,
enum iwl_ucode_type old_type;
static const u8 alive_cmd[] = { REPLY_ALIVE };
- old_type = priv->cur_ucode;
- priv->cur_ucode = ucode_type;
fw = iwl_get_ucode_image(priv, ucode_type);
+ if (WARN_ON(!fw))
+ return -EINVAL;
+ old_type = priv->cur_ucode;
+ priv->cur_ucode = ucode_type;
priv->ucode_loaded = false;
- if (!fw)
- return -EINVAL;
-
iwl_init_notification_wait(&priv->notif_wait, &alive_wait,
alive_cmd, ARRAY_SIZE(alive_cmd),
iwl_alive_fn, &alive_data);
diff --git a/drivers/net/wireless/iwlwifi/mvm/fw.c b/drivers/net/wireless/iwlwifi/mvm/fw.c
index 83fc5ca..70e5297 100644
--- a/drivers/net/wireless/iwlwifi/mvm/fw.c
+++ b/drivers/net/wireless/iwlwifi/mvm/fw.c
@@ -151,13 +151,11 @@ static int iwl_mvm_load_ucode_wait_alive(struct iwl_mvm *mvm,
enum iwl_ucode_type old_type = mvm->cur_ucode;
static const u8 alive_cmd[] = { MVM_ALIVE };
- mvm->cur_ucode = ucode_type;
fw = iwl_get_ucode_image(mvm, ucode_type);
-
- mvm->ucode_loaded = false;
-
- if (!fw)
+ if (WARN_ON(!fw))
return -EINVAL;
+ mvm->cur_ucode = ucode_type;
+ mvm->ucode_loaded = false;
iwl_init_notification_wait(&mvm->notif_wait, &alive_wait,
alive_cmd, ARRAY_SIZE(alive_cmd),
--
1.8.3.2
^ permalink raw reply related
* [PATCH 6/9] iwlwifi: mvm: add missing break in debugfs
From: Emmanuel Grumbach @ 2013-10-30 20:31 UTC (permalink / raw)
To: John Linville; +Cc: linux-wireless, Johannes Berg, Emmanuel Grumbach
In-Reply-To: <1383165097-4445-1-git-send-email-emmanuel.grumbach@intel.com>
From: Johannes Berg <johannes.berg@intel.com>
When writing the disable_power_off value, the LPRX
enable value also gets written unintentionally, so
fix that by adding the missing break statement.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
---
drivers/net/wireless/iwlwifi/mvm/debugfs.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/net/wireless/iwlwifi/mvm/debugfs.c b/drivers/net/wireless/iwlwifi/mvm/debugfs.c
index 0675f0c..9864d71 100644
--- a/drivers/net/wireless/iwlwifi/mvm/debugfs.c
+++ b/drivers/net/wireless/iwlwifi/mvm/debugfs.c
@@ -342,6 +342,7 @@ static void iwl_dbgfs_update_pm(struct iwl_mvm *mvm,
case MVM_DEBUGFS_PM_DISABLE_POWER_OFF:
IWL_DEBUG_POWER(mvm, "disable_power_off=%d\n", val);
dbgfs_pm->disable_power_off = val;
+ break;
case MVM_DEBUGFS_PM_LPRX_ENA:
IWL_DEBUG_POWER(mvm, "lprx %s\n", val ? "enabled" : "disabled");
dbgfs_pm->lprx_ena = val;
--
1.8.3.2
^ permalink raw reply related
* [PATCH 5/9] iwlwifi: mvm: capture the FCS in monitor mode
From: Emmanuel Grumbach @ 2013-10-30 20:31 UTC (permalink / raw)
To: John Linville; +Cc: linux-wireless, Johannes Berg, Emmanuel Grumbach
In-Reply-To: <1383165097-4445-1-git-send-email-emmanuel.grumbach@intel.com>
From: Johannes Berg <johannes.berg@intel.com>
This can be useful when using the device as a sniffer.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
---
drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c | 8 +++++++-
drivers/net/wireless/iwlwifi/mvm/rx.c | 6 +++++-
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c b/drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c
index ab5a7ac..f41f9b0 100644
--- a/drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c
+++ b/drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c
@@ -719,7 +719,9 @@ static int iwl_mvm_mac_ctxt_cmd_listener(struct iwl_mvm *mvm,
cmd.filter_flags = cpu_to_le32(MAC_FILTER_IN_PROMISC |
MAC_FILTER_IN_CONTROL_AND_MGMT |
MAC_FILTER_IN_BEACON |
- MAC_FILTER_IN_PROBE_REQUEST);
+ MAC_FILTER_IN_PROBE_REQUEST |
+ MAC_FILTER_IN_CRC32);
+ mvm->hw->flags |= IEEE80211_HW_RX_INCLUDES_FCS;
return iwl_mvm_mac_ctxt_send_cmd(mvm, &cmd);
}
@@ -1122,6 +1124,10 @@ int iwl_mvm_mac_ctxt_remove(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
}
mvmvif->uploaded = false;
+
+ if (vif->type == NL80211_IFTYPE_MONITOR)
+ mvm->hw->flags &= ~IEEE80211_HW_RX_INCLUDES_FCS;
+
return 0;
}
diff --git a/drivers/net/wireless/iwlwifi/mvm/rx.c b/drivers/net/wireless/iwlwifi/mvm/rx.c
index a4af501..3a1f398 100644
--- a/drivers/net/wireless/iwlwifi/mvm/rx.c
+++ b/drivers/net/wireless/iwlwifi/mvm/rx.c
@@ -300,10 +300,14 @@ int iwl_mvm_rx_rx_mpdu(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb,
return 0;
}
+ /*
+ * Keep packets with CRC errors (and with overrun) for monitor mode
+ * (otherwise the firmware discards them) but mark them as bad.
+ */
if (!(rx_pkt_status & RX_MPDU_RES_STATUS_CRC_OK) ||
!(rx_pkt_status & RX_MPDU_RES_STATUS_OVERRUN_OK)) {
IWL_DEBUG_RX(mvm, "Bad CRC or FIFO: 0x%08X.\n", rx_pkt_status);
- return 0;
+ rx_status.flag |= RX_FLAG_FAILED_FCS_CRC;
}
/* This will be used in several places later */
--
1.8.3.2
^ permalink raw reply related
* [PATCH 4/9] iwlwifi: pcie: move warning message into warning
From: Emmanuel Grumbach @ 2013-10-30 20:31 UTC (permalink / raw)
To: John Linville; +Cc: linux-wireless, Johannes Berg, Emmanuel Grumbach
In-Reply-To: <1383165097-4445-1-git-send-email-emmanuel.grumbach@intel.com>
From: Johannes Berg <johannes.berg@intel.com>
Having a WARN_ON() followed by a printed message is
less useful than having the message in the warning
so move the message.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
---
drivers/net/wireless/iwlwifi/pcie/tx.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/net/wireless/iwlwifi/pcie/tx.c b/drivers/net/wireless/iwlwifi/pcie/tx.c
index b416841..cc18440 100644
--- a/drivers/net/wireless/iwlwifi/pcie/tx.c
+++ b/drivers/net/wireless/iwlwifi/pcie/tx.c
@@ -1495,12 +1495,11 @@ static int iwl_pcie_send_hcmd_sync(struct iwl_trans *trans,
IWL_DEBUG_INFO(trans, "Attempting to send sync command %s\n",
get_cmd_string(trans_pcie, cmd->id));
- if (WARN_ON(test_and_set_bit(STATUS_HCMD_ACTIVE,
- &trans_pcie->status))) {
- IWL_ERR(trans, "Command %s: a command is already active!\n",
- get_cmd_string(trans_pcie, cmd->id));
+ if (WARN(test_and_set_bit(STATUS_HCMD_ACTIVE,
+ &trans_pcie->status),
+ "Command %s: a command is already active!\n",
+ get_cmd_string(trans_pcie, cmd->id)))
return -EIO;
- }
IWL_DEBUG_INFO(trans, "Setting HCMD_ACTIVE for command %s\n",
get_cmd_string(trans_pcie, cmd->id));
--
1.8.3.2
^ permalink raw reply related
* [PATCH 3/9] iwlwifi: mvm: BT Coex fix NULL pointer dereference
From: Emmanuel Grumbach @ 2013-10-30 20:31 UTC (permalink / raw)
To: John Linville; +Cc: linux-wireless, Emmanuel Grumbach
In-Reply-To: <1383165097-4445-1-git-send-email-emmanuel.grumbach@intel.com>
When we disassociate, mac80211 removes the station and
then, it sets the bss it unsets the assoc bool in bss_info.
Since the firwmware wants it the opposite (first set the
MAC context as unassoc, and only then, remove the STA of
the API), we have a small period of time in which the STA
in firmware doesn't have a valid ieee80211_sta pointer.
During that time, iwl_mvm_vif->ap_sta_id, is still set
to the STA in firmware that represent the AP.
This avoids:
[ 4481.476246] BUG: unable to handle kernel NULL pointer dereference at 00000045
[ 4481.479521] IP: [<f8416a6a>] iwl_mvm_bt_coex_reduced_txp+0x7a/0x190 [iwlmvm]
[ 4481.482023] *pde = 00000000
[ 4481.484332] Oops: 0000 [#1] SMP DEBUG_PAGEALLOC
[ 4481.486897] Modules linked in: netconsole configfs autofs4 rfcomm(O) bnep(O) nfsd nfs_acl auth_rpcgss exportfs nfs lockd binfmt_misc sunrpc fscache arc4 iwlmvm(O) mac80211(O) btusb(O) iwlwifi(O) bluetooth(O) cfg80211(O) snd_hda_codec_hdmi coretemp dell_wmi snd_hda_codec_idt compat(O) dell_laptop aesni_intel i915 sparse_keymap dcdbas cryptd psmouse serio_raw aes_i586 microcode snd_hda_intel drm_kms_helper snd_hda_codec drm snd_pcm snd_timer i2c_algo_bit video intel_agp intel_gtt snd soundcore snd_page_alloc crc32c_intel ahci sdhci_pci libahci sdhci mmc_core e1000e xhci_hcd [last unloaded: configfs]
[ 4481.502983]
[ 4481.505599] Pid: 6507, comm: kworker/0:1 Tainted: G O 3.4.43-dev #1 Dell Inc. Latitude E6430/0CMDYV
[ 4481.508575] EIP: 0060:[<f8416a6a>] EFLAGS: 00010246 CPU: 0
[ 4481.511248] EIP is at iwl_mvm_bt_coex_reduced_txp+0x7a/0x190 [iwlmvm]
[ 4481.513947] EAX: ffffffea EBX: 00000002 ECX: 00000001 EDX: 00000001
[ 4481.516710] ESI: ec6f0f28 EDI: 00000000 EBP: e8175dfc ESP: e8175d9c
[ 4481.519445] DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068
[ 4481.522185] CR0: 8005003b CR2: 00000045 CR3: 01a5e000 CR4: 001407d0
[ 4481.524950] DR0: 00000000 DR1: 00000000 DR2: 00000000 DR3: 00000000
[ 4481.527768] DR6: ffff0ff0 DR7: 00000400
[ 4481.530565] Process kworker/0:1 (pid: 6507, ti=e8174000 task=e8032b20 task.ti=e8174000)
[ 4481.533447] Stack:
[ 4481.536379] e472439f 00003a12 e8032b20 e8033048 00000001 e8175ddc 00000246 e8033040
[ 4481.540132] 00000002 01814990 ec4d1ddc e8175dcc 00000000 00000000 00000000 00000000
[ 4481.543867] 00000000 00000000 00000001 000001c8 009b0002 ec4d1ddc ec6f0f28 00000000
[ 4481.547633] Call Trace:
[ 4481.550578] [<f8418027>] iwl_mvm_bt_rssi_event+0x197/0x220 [iwlmvm]
[ 4481.553537] [<f840919c>] iwl_mvm_stat_iterator+0xdc/0x240 [iwlmvm]
[ 4481.556582] [<f8d129c2>] __iterate_active_interfaces+0xe2/0x1f0 [mac80211]
[ 4481.559544] [<f84090c0>] ? iwl_mvm_update_smps+0x90/0x90 [iwlmvm]
[ 4481.562519] [<f84090c0>] ? iwl_mvm_update_smps+0x90/0x90 [iwlmvm]
[ 4481.565498] [<f8d12b0c>] ieee80211_iterate_active_interfaces+0x3c/0x50 [mac80211]
[ 4481.568421] [<f8409b43>] iwl_mvm_rx_statistics+0xb3/0x130 [iwlmvm]
[ 4481.571349] [<f8405431>] iwl_mvm_async_handlers_wk+0xc1/0xf0 [iwlmvm]
[ 4481.574251] [<c1052915>] ? process_one_work+0x105/0x5c0
[ 4481.577162] [<c1052991>] process_one_work+0x181/0x5c0
[ 4481.580025] [<c1052915>] ? process_one_work+0x105/0x5c0
[ 4481.582861] [<f8405370>] ? iwl_mvm_rx_fw_logs+0x20/0x20 [iwlmvm]
[ 4481.585722] [<c10530f1>] worker_thread+0x121/0x2c0
[ 4481.588536] [<c1052fd0>] ? rescuer_thread+0x1d0/0x1d0
[ 4481.591323] [<c105af0d>] kthread+0x7d/0x90
[ 4481.594059] [<c105ae90>] ? flush_kthread_worker+0x120/0x120
[ 4481.596868] [<c15b7cc2>] kernel_thread_helper+0x6/0x10
[ 4481.599605] Code: 9d de c3 c8 85 c0 74 0d 80 3d f8 ae 42 f8 00 0f 84 dc 00 00 00 8b 45 c8 0f b6 d3 31 ff 89 55 c0 8b 84 90 d8 03 00 00 0f b6 55 c7 <38> 50 5b 89 45 bc 0f 84 a8 00 00 00 a1 e4 d2 04 c2 85 c0 0f 84
[ 4481.611782] EIP: [<f8416a6a>] iwl_mvm_bt_coex_reduced_txp+0x7a/0x190 [iwlmvm] SS:ESP 0068:e8175d9c
[ 4481.614985] CR2: 0000000000000045
[ 4481.687441] ---[ end trace b11bc915fbac4412 ]---
Reviewed-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
---
drivers/net/wireless/iwlwifi/mvm/bt-coex.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/net/wireless/iwlwifi/mvm/bt-coex.c b/drivers/net/wireless/iwlwifi/mvm/bt-coex.c
index 5b630f12b..7444b2a 100644
--- a/drivers/net/wireless/iwlwifi/mvm/bt-coex.c
+++ b/drivers/net/wireless/iwlwifi/mvm/bt-coex.c
@@ -505,12 +505,16 @@ static int iwl_mvm_bt_coex_reduced_txp(struct iwl_mvm *mvm, u8 sta_id,
struct iwl_mvm_sta *mvmsta;
int ret;
- /* This can happen if the station has been removed right now */
if (sta_id == IWL_MVM_STATION_COUNT)
return 0;
sta = rcu_dereference_protected(mvm->fw_id_to_mac_id[sta_id],
lockdep_is_held(&mvm->mutex));
+
+ /* This can happen if the station has been removed right now */
+ if (IS_ERR_OR_NULL(sta))
+ return 0;
+
mvmsta = (void *)sta->drv_priv;
/* nothing to do */
--
1.8.3.2
^ permalink raw reply related
* [PATCH 2/9] iwlwifi: transport config n_no_reclaim_cmds should be unsigned
From: Emmanuel Grumbach @ 2013-10-30 20:31 UTC (permalink / raw)
To: John Linville; +Cc: linux-wireless, Johannes Berg, Emmanuel Grumbach
In-Reply-To: <1383165097-4445-1-git-send-email-emmanuel.grumbach@intel.com>
From: Johannes Berg <johannes.berg@intel.com>
The number of commands can never be negative, so it should
be using an unsigned type. This also shuts up an smatch
warning elsewhere in the code.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
---
drivers/net/wireless/iwlwifi/iwl-trans.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans.h b/drivers/net/wireless/iwlwifi/iwl-trans.h
index dd57a36..2dc64b5 100644
--- a/drivers/net/wireless/iwlwifi/iwl-trans.h
+++ b/drivers/net/wireless/iwlwifi/iwl-trans.h
@@ -344,7 +344,7 @@ struct iwl_trans_config {
u8 cmd_queue;
u8 cmd_fifo;
const u8 *no_reclaim_cmds;
- int n_no_reclaim_cmds;
+ unsigned int n_no_reclaim_cmds;
bool rx_buf_size_8k;
bool bc_table_dword;
--
1.8.3.2
^ permalink raw reply related
* [PATCH 1/9] iwlwifi: mvm: update UAPSD support TLV bits
From: Emmanuel Grumbach @ 2013-10-30 20:31 UTC (permalink / raw)
To: John Linville
Cc: linux-wireless, Alexander Bondar, David Spinadel,
Emmanuel Grumbach
In-Reply-To: <527143AA.5070900@gmail.com>
From: Alexander Bondar <alexander.bondar@intel.com>
Change old UAPSD bit to PM_CMD_SUPPORT, and add a new bit to indicate
real UAPSD support.
Don't use UAPSD when the firmware doesn't support it.
Signed-off-by: David Spinadel <david.spinadel@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
---
drivers/net/wireless/iwlwifi/iwl-fw.h | 3 ++-
drivers/net/wireless/iwlwifi/mvm/mac80211.c | 14 +++++++++-----
drivers/net/wireless/iwlwifi/mvm/ops.c | 2 +-
3 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/drivers/net/wireless/iwlwifi/iwl-fw.h b/drivers/net/wireless/iwlwifi/iwl-fw.h
index 87b66a8..75db0871 100644
--- a/drivers/net/wireless/iwlwifi/iwl-fw.h
+++ b/drivers/net/wireless/iwlwifi/iwl-fw.h
@@ -100,7 +100,7 @@ enum iwl_ucode_tlv_flag {
IWL_UCODE_TLV_FLAGS_P2P = BIT(3),
IWL_UCODE_TLV_FLAGS_DW_BC_TABLE = BIT(4),
IWL_UCODE_TLV_FLAGS_NEWBT_COEX = BIT(5),
- IWL_UCODE_TLV_FLAGS_UAPSD = BIT(6),
+ IWL_UCODE_TLV_FLAGS_PM_CMD_SUPPORT = BIT(6),
IWL_UCODE_TLV_FLAGS_SHORT_BL = BIT(7),
IWL_UCODE_TLV_FLAGS_RX_ENERGY_API = BIT(8),
IWL_UCODE_TLV_FLAGS_TIME_EVENT_API_V2 = BIT(9),
@@ -113,6 +113,7 @@ enum iwl_ucode_tlv_flag {
IWL_UCODE_TLV_FLAGS_SCHED_SCAN = BIT(17),
IWL_UCODE_TLV_FLAGS_STA_KEY_CMD = BIT(19),
IWL_UCODE_TLV_FLAGS_DEVICE_PS_CMD = BIT(20),
+ IWL_UCODE_TLV_FLAGS_UAPSD_SUPPORT = BIT(24),
};
/* The default calibrate table size if not specified by firmware file */
diff --git a/drivers/net/wireless/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
index f40685c..74bc2c8 100644
--- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
@@ -164,8 +164,7 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)
IEEE80211_HW_TIMING_BEACON_ONLY |
IEEE80211_HW_CONNECTION_MONITOR |
IEEE80211_HW_SUPPORTS_DYNAMIC_SMPS |
- IEEE80211_HW_SUPPORTS_STATIC_SMPS |
- IEEE80211_HW_SUPPORTS_UAPSD;
+ IEEE80211_HW_SUPPORTS_STATIC_SMPS;
hw->queues = mvm->first_agg_queue;
hw->offchannel_tx_hw_queue = IWL_MVM_OFFCHANNEL_QUEUE;
@@ -180,6 +179,12 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)
!iwlwifi_mod_params.sw_crypto)
hw->flags |= IEEE80211_HW_MFP_CAPABLE;
+ if (mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_UAPSD_SUPPORT) {
+ hw->flags |= IEEE80211_HW_SUPPORTS_UAPSD;
+ hw->uapsd_queues = IWL_UAPSD_AC_INFO;
+ hw->uapsd_max_sp_len = IWL_UAPSD_MAX_SP;
+ }
+
hw->sta_data_size = sizeof(struct iwl_mvm_sta);
hw->vif_data_size = sizeof(struct iwl_mvm_vif);
hw->chanctx_data_size = sizeof(u16);
@@ -204,8 +209,6 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)
hw->wiphy->max_remain_on_channel_duration = 10000;
hw->max_listen_interval = IWL_CONN_MAX_LISTEN_INTERVAL;
- hw->uapsd_queues = IWL_UAPSD_AC_INFO;
- hw->uapsd_max_sp_len = IWL_UAPSD_MAX_SP;
/* Extract MAC address */
memcpy(mvm->addresses[0].addr, mvm->nvm_data->hw_addr, ETH_ALEN);
@@ -861,7 +864,8 @@ static void iwl_mvm_bss_info_changed_station(struct iwl_mvm *mvm,
/* reset rssi values */
mvmvif->bf_data.ave_beacon_signal = 0;
- if (!(mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_UAPSD)) {
+ if (!(mvm->fw->ucode_capa.flags &
+ IWL_UCODE_TLV_FLAGS_PM_CMD_SUPPORT)) {
/* Workaround for FW bug, otherwise FW disables device
* power save upon disassociation
*/
diff --git a/drivers/net/wireless/iwlwifi/mvm/ops.c b/drivers/net/wireless/iwlwifi/mvm/ops.c
index 59b7cb3..d86083c 100644
--- a/drivers/net/wireless/iwlwifi/mvm/ops.c
+++ b/drivers/net/wireless/iwlwifi/mvm/ops.c
@@ -459,7 +459,7 @@ iwl_op_mode_mvm_start(struct iwl_trans *trans, const struct iwl_cfg *cfg,
if (err)
goto out_unregister;
- if (mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_UAPSD)
+ if (mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_PM_CMD_SUPPORT)
mvm->pm_ops = &pm_mac_ops;
else
mvm->pm_ops = &pm_legacy_ops;
--
1.8.3.2
^ permalink raw reply related
* Re: [patch v2] libertas: potential oops in debugfs
From: Dan Williams @ 2013-10-30 19:51 UTC (permalink / raw)
To: Dan Carpenter
Cc: John W. Linville, libertas-dev, linux-wireless, netdev,
linux-kernel, kernel-janitors
In-Reply-To: <20131030171251.GA4130@longonot.mountain>
On Wed, 2013-10-30 at 20:12 +0300, Dan Carpenter wrote:
> If we do a zero size allocation then it will oops. Also we can't be
> sure the user passes us a NUL terminated string so I've added a
> terminator.
>
> This code can only be triggered by root.
>
> Reported-by: Nico Golde <nico@ngolde.de>
> Reported-by: Fabian Yamaguchi <fabs@goesec.de>
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Dan Williams <dcbw@redhat.com>
>
> diff --git a/drivers/net/wireless/libertas/debugfs.c b/drivers/net/wireless/libertas/debugfs.c
> index 668dd27..1917348 100644
> --- a/drivers/net/wireless/libertas/debugfs.c
> +++ b/drivers/net/wireless/libertas/debugfs.c
> @@ -913,7 +913,10 @@ static ssize_t lbs_debugfs_write(struct file *f, const char __user *buf,
> char *p2;
> struct debug_data *d = f->private_data;
>
> - pdata = kmalloc(cnt, GFP_KERNEL);
> + if (cnt == 0)
> + return 0;
> +
> + pdata = kmalloc(cnt + 1, GFP_KERNEL);
> if (pdata == NULL)
> return 0;
>
> @@ -922,6 +925,7 @@ static ssize_t lbs_debugfs_write(struct file *f, const char __user *buf,
> kfree(pdata);
> return 0;
> }
> + pdata[cnt] = '\0';
>
> p0 = pdata;
> for (i = 0; i < num_of_items; i++) {
> --
> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ 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