Re: [PATCH] ath9k : Fix ieee80211 work while going to suspend
diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h
> b/drivers/net/wireless/ath/ath9k/ath9k.h
> index a56b241..b3088a1 100644
> --- a/drivers/net/wireless/ath/ath9k/ath9k.h
> +++ b/drivers/net/wireless/ath/ath9k/ath9k.h
> @@ -764,6 +764,7 @@ struct ath_softc {
> atomic_t wow_got_bmiss_intr;
> atomic_t wow_sleep_proc_intr; /* in the middle of WoW sleep ? */
> u32 wow_intr_before_sleep;
> + bool suspending;
> #endif
> };
>
> diff --git a/drivers/net/wireless/ath/ath9k/link.c
> b/drivers/net/wireless/ath/ath9k/link.c
> index ade3afb..fa77e19 100644
> --- a/drivers/net/wireless/ath/ath9k/link.c
> +++ b/drivers/net/wireless/ath/ath9k/link.c
> @@ -158,7 +158,8 @@ void ath_start_rx_poll(struct ath_softc *sc, u8 nbeacon)
> {
> if (!AR_SREV_9300(sc->sc_ah))
> return;
> -
> + if (sc->suspending)
> + return;
> if (!test_bit(SC_OP_PRIM_STA_VIF, &sc->sc_flags))
> return;
>
> diff --git a/drivers/net/wireless/ath/ath9k/main.c
> b/drivers/net/wireless/ath/ath9k/main.c
> index 6e66f9c..0cf88b7 100644
> --- a/drivers/net/wireless/ath/ath9k/main.c
> +++ b/drivers/net/wireless/ath/ath9k/main.c
> @@ -2150,7 +2150,7 @@ static int ath9k_suspend(struct ieee80211_hw *hw,
> int ret = 0;
>
> mutex_lock(&sc->mutex);
> -
> + sc->suspending = 1;
> ath_cancel_work(sc);
> ath_stop_ani(sc);
> del_timer_sync(&sc->rx_poll_timer);
> @@ -2288,6 +2288,7 @@ static int ath9k_resume(struct ieee80211_hw *hw)
> ath9k_start_btcoex(sc);
>
> ath9k_ps_restore(sc);
> + sc->suspending = 0;
> mutex_unlock(&sc->mutex);
>
> return 0;
--
John W. LinvilleSomeday the world will need a hero, and you
linvi...@tuxdriver.com might be all we have. Be ready.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: pull request: bluetooth 2013-03-18
On Mon, Mar 18, 2013 at 03:16:01PM -0300, Gustavo Padovan wrote: > Hi John, > > I put together 3 fixes intended for 3.9, there are support for two new devices > and a NULL dereference fix in the SCO code. > > Please pull or let me know of any problem. Thanks! > > Gustavo > > --- > The following changes since commit 94a32d10f47b637ae24b78b1ddc7ef0e8396fda4: > > Bluetooth: Device 0cf3:3008 should map AR 3012 (2013-03-11 18:04:54 -0300) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth master > > for you to fetch changes up to ebaf5795ef57a70a042ea259448a465024e2821d: > > Bluetooth: Add support for Dell[QCA 0cf3:817a] (2013-03-18 14:14:37 -0300) Pulling now... -- John W. LinvilleSomeday the world will need a hero, and you linvi...@tuxdriver.com might be all we have. Be ready. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
pull request: wireless 2013-03-20
Dave,
I present to you another batch of fixes intended for the 3.9 stream...
On the bluetooth bits, Gustavo says:
"I put together 3 fixes intended for 3.9, there are support for two
new devices and a NULL dereference fix in the SCO code."
Amitkumar Karwar fixes a command queueing race in mwifiex.
Bing Zhao provides a pair of mwifiex related to cleaning-up before
a shutdown.
Felix Fietkau provides an ath9k fix for a regression caused by an
earlier calibration fix, and another ath9k fix to avoid race conditions
that unnecessarily lead to chip resets.
Jussi Kivilinna prevents and skbuff leak in rtlwifi.
Stanislaw Gruszka corrects a length paramater for a DMA buffer mapping
operation in iwlegacy.
Please let me know if there are problems!
John
---
The following changes since commit da2191e31409d1058dcbed44e8f53e39a40e86b3:
net: fec: Define indexes as 'unsigned int' (2013-03-20 12:28:59 -0400)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git for-davem
for you to fetch changes up to b9d5319041999401d29e7efcd5d15664edfaad2e:
Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
(2013-03-20 14:26:37 -0400)
Amitkumar Karwar (1):
mwifiex: fix race when queuing commands
Bing Zhao (2):
mwifiex: skip pending commands after function shutdown
mwifiex: cancel cmd timer and free curr_cmd in shutdown process
Felix Fietkau (2):
ath9k_hw: revert chainmask to user configuration after calibration
ath9k: limit tx path hang check to normal data queues
John W. Linville (2):
Merge branch 'master' of git://git.kernel.org/.../bluetooth/bluetooth
Merge branch 'master' of git://git.kernel.org/.../linville/wireless into
for-davem
Jussi Kivilinna (1):
rtlwifi: usb: add missing freeing of skbuff
Ming Lei (2):
Bluetooth: Add support for Dell[QCA 0cf3:0036]
Bluetooth: Add support for Dell[QCA 0cf3:817a]
Stanislaw Gruszka (1):
iwl3945: fix length of dma buffers
Vinicius Costa Gomes (1):
Bluetooth: Fix not closing SCO sockets in the BT_CONNECT2 state
drivers/bluetooth/ath3k.c | 4
drivers/bluetooth/btusb.c | 2 ++
drivers/net/wireless/ath/ath9k/ar9003_calib.c | 4
drivers/net/wireless/ath/ath9k/link.c | 26 +-
drivers/net/wireless/iwlegacy/3945-mac.c | 22 --
drivers/net/wireless/mwifiex/cmdevt.c | 22 --
drivers/net/wireless/mwifiex/init.c | 8
drivers/net/wireless/mwifiex/main.h | 4 ++--
drivers/net/wireless/mwifiex/scan.c | 8
drivers/net/wireless/mwifiex/sta_ioctl.c | 10 ++
drivers/net/wireless/rtlwifi/usb.c| 1 +
net/bluetooth/sco.c | 1 +
12 files changed, 69 insertions(+), 43 deletions(-)
diff --git a/drivers/bluetooth/ath3k.c b/drivers/bluetooth/ath3k.c
index b282af1..6aab00e 100644
--- a/drivers/bluetooth/ath3k.c
+++ b/drivers/bluetooth/ath3k.c
@@ -73,9 +73,11 @@ static struct usb_device_id ath3k_table[] = {
{ USB_DEVICE(0x03F0, 0x311D) },
/* Atheros AR3012 with sflash firmware*/
+ { USB_DEVICE(0x0CF3, 0x0036) },
{ USB_DEVICE(0x0CF3, 0x3004) },
{ USB_DEVICE(0x0CF3, 0x3008) },
{ USB_DEVICE(0x0CF3, 0x311D) },
+ { USB_DEVICE(0x0CF3, 0x817a) },
{ USB_DEVICE(0x13d3, 0x3375) },
{ USB_DEVICE(0x04CA, 0x3004) },
{ USB_DEVICE(0x04CA, 0x3005) },
@@ -107,9 +109,11 @@ MODULE_DEVICE_TABLE(usb, ath3k_table);
static struct usb_device_id ath3k_blist_tbl[] = {
/* Atheros AR3012 with sflash firmware*/
+ { USB_DEVICE(0x0CF3, 0x0036), .driver_info = BTUSB_ATH3012 },
{ USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 },
{ USB_DEVICE(0x0cf3, 0x3008), .driver_info = BTUSB_ATH3012 },
{ USB_DEVICE(0x0cf3, 0x311D), .driver_info = BTUSB_ATH3012 },
+ { USB_DEVICE(0x0CF3, 0x817a), .driver_info = BTUSB_ATH3012 },
{ USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 },
{ USB_DEVICE(0x04ca, 0x3004), .driver_info = BTUSB_ATH3012 },
{ USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 },
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index e547851..2cc5f77 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -131,9 +131,11 @@ static struct usb_device_id blacklist_table[] = {
{ USB_DEVICE(0x03f0, 0x311d), .driver_info = BTUSB_IGNORE },
/* Atheros 3012 with sflash firmware */
+ { USB_DEVICE(0x0cf3, 0x0036), .driver_info = BTUSB_ATH3012 },
{ USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 },
{ USB_DEVICE(0x0cf3, 0x3008), .driver_info = BT
Re: pull request: bluetooth 2013-02-01
On Fri, Feb 01, 2013 at 03:33:02PM -0200, Gustavo Padovan wrote: > Hi John, > > Two simple fixes for 3.8. One of the patches fixes a situation where the > connection wasn't terminated if a timeout ocurrs for LE an SCO connections. > The other fixes prevent NULL dereference in the SMP code, it is a security fix > as well. > > Please pull, or let me know of any problems! > > Gustavo > > --- > The following changes since commit b7e98b5100aad9290d7f06fcb9d1e80f7f62f05f: > > Bluetooth: Check if the hci connection exists in SCO shutdown (2013-01-10 > 03:53:32 -0200) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth > for-upstream > > for you to fetch changes up to 4c02e2d444595200d0b18b889994aac3611cd288: > > Bluetooth: Fix hci_conn timeout routine (2013-01-31 15:38:02 -0200) Pulling now... -- John W. LinvilleSomeday the world will need a hero, and you linvi...@tuxdriver.com might be all we have. Be ready. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
pull request: wireless 2013-02-06
Dave,
Please consider this pull request for the 3.8 stream...
Included is a bluetooth pull. Gustavo says:
"Two simple fixes for 3.8. One of the patches fixes a situation
where the connection wasn't terminated if a timeout ocurrs for LE
an SCO connections. The other fixes prevent NULL dereference in the
SMP code, it is a security fix as well."
Along with those...
Hauke Mehrtens provides a couple of ssb and bcma bus fixes that
prevent oopses when unloading those modules.
Larry Finger provides and rtlwifi fix to avoid a "scheduling while
atomic" bug.
Last but certainly not least, Arend van Spriel bring a brcmsmac fix that
reworks the mac80211 .flush() callback in order to avoid the dreaded
brcms_c_wait_for_tx_completion warnings. This one looks a little
large, but I think it is safe and isolated to brcmsmac in any case.
Please let me know if there are problems!
Thanks,
John
---
The following changes since commit bf414b369f158bb527f9f29174ada815f961b44c:
net: usbnet: fix tx_dropped statistics (2013-02-04 13:07:31 -0500)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git for-davem
for you to fetch changes up to b3b66ae4c8aff0636521034d824b8953dc617335:
Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
(2013-02-06 13:55:44 -0500)
Andre Guedes (1):
Bluetooth: Fix hci_conn timeout routine
Arend van Spriel (1):
brcmsmac: rework of mac80211 .flush() callback operation
Hauke Mehrtens (2):
bcma: unregister gpios before unloading bcma
ssb: unregister gpios before unloading ssb
Johan Hedberg (1):
Bluetooth: Fix handling of unexpected SMP PDUs
John W. Linville (2):
Merge branch 'for-upstream' of
git://git.kernel.org/.../bluetooth/bluetooth
Merge branch 'master' of git://git.kernel.org/.../linville/wireless into
for-davem
Larry Finger (1):
rtlwifi: Fix scheduling while atomic bug
drivers/bcma/bcma_private.h| 5
drivers/bcma/driver_gpio.c | 5
drivers/bcma/main.c| 7 +
.../net/wireless/brcm80211/brcmsmac/mac80211_if.c | 35 +-
.../net/wireless/brcm80211/brcmsmac/mac80211_if.h | 3 +-
drivers/net/wireless/brcm80211/brcmsmac/main.c | 15 ++
drivers/net/wireless/brcm80211/brcmsmac/pub.h | 3 +-
drivers/net/wireless/rtlwifi/base.c| 7 +++--
drivers/ssb/driver_gpio.c | 12
drivers/ssb/main.c | 9 ++
drivers/ssb/ssb_private.h | 5
net/bluetooth/hci_conn.c | 6 ++--
net/bluetooth/smp.c| 13
13 files changed, 90 insertions(+), 35 deletions(-)
diff --git a/drivers/bcma/bcma_private.h b/drivers/bcma/bcma_private.h
index 19e3fbf..cb0c454 100644
--- a/drivers/bcma/bcma_private.h
+++ b/drivers/bcma/bcma_private.h
@@ -94,11 +94,16 @@ void bcma_core_pci_hostmode_init(struct bcma_drv_pci *pc);
#ifdef CONFIG_BCMA_DRIVER_GPIO
/* driver_gpio.c */
int bcma_gpio_init(struct bcma_drv_cc *cc);
+int bcma_gpio_unregister(struct bcma_drv_cc *cc);
#else
static inline int bcma_gpio_init(struct bcma_drv_cc *cc)
{
return -ENOTSUPP;
}
+static inline int bcma_gpio_unregister(struct bcma_drv_cc *cc)
+{
+ return 0;
+}
#endif /* CONFIG_BCMA_DRIVER_GPIO */
#endif
diff --git a/drivers/bcma/driver_gpio.c b/drivers/bcma/driver_gpio.c
index 9a6f585..71f755c 100644
--- a/drivers/bcma/driver_gpio.c
+++ b/drivers/bcma/driver_gpio.c
@@ -96,3 +96,8 @@ int bcma_gpio_init(struct bcma_drv_cc *cc)
return gpiochip_add(chip);
}
+
+int bcma_gpio_unregister(struct bcma_drv_cc *cc)
+{
+ return gpiochip_remove(&cc->gpio);
+}
diff --git a/drivers/bcma/main.c b/drivers/bcma/main.c
index 4a92f64..324f9de 100644
--- a/drivers/bcma/main.c
+++ b/drivers/bcma/main.c
@@ -268,6 +268,13 @@ int bcma_bus_register(struct bcma_bus *bus)
void bcma_bus_unregister(struct bcma_bus *bus)
{
struct bcma_device *cores[3];
+ int err;
+
+ err = bcma_gpio_unregister(&bus->drv_cc);
+ if (err == -EBUSY)
+ bcma_err(bus, "Some GPIOs are still in use.\n");
+ else if (err)
+ bcma_err(bus, "Can not unregister GPIO driver: %i\n", err);
cores[0] = bcma_find_core(bus, BCMA_CORE_MIPS_74K);
cores[1] = bcma_find_core(bus, BCMA_CORE_PCIE);
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
index 0f71d1d..e5fd209 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
@@ -36,6 +36,7 @@
#i
Re: [PATCH] drivers: net: Remove remaining alloc/OOM messages
On Thu, Feb 07, 2013 at 01:46:27PM -0800, Joe Perches wrote: > alloc failures already get standardized OOM > messages and a dump_stack. > > For the affected mallocs around these OOM messages: > > Converted kmallocs with multiplies to kmalloc_array. > Converted a kmalloc/memcpy to kmemdup. > Removed now unused stack variables. > Removed unnecessary parentheses. > Neatened alignment. > > Signed-off-by: Joe Perches No objection... Acked-by: John W. Linville -- John W. LinvilleSomeday the world will need a hero, and you linvi...@tuxdriver.com might be all we have. Be ready. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
pull request: wireless 2013-02-12
Dave,
Here is another handful of late-breaking fixes intended for the 3.8
stream... Hopefully the will still make it! :-)
There are three mac80211 fixes pulled from Johannes:
"Here are three fixes still for the 3.8 stream, the fix from Cong Ding
for the bad sizeof (Stephen Hemminger had pointed it out before but I'd
promptly forgotten), a mac80211 managed-mode channel context usage fix
where a downgrade would never stop until reaching non-HT and a bug in
the channel determination that could cause invalid channels like HT40+
on channel 11 to be used."
Also included is a mwl8k fix that avoids an oops when using mwl8k
devices that only support the 5 GHz band.
Please let me know if there are problems!
John
---
The following changes since commit 547b4e718115eea74087e28d7fa70aec619200db:
bridge: set priority of STP packets (2013-02-11 14:16:52 -0500)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git for-davem
for you to fetch changes up to 318d86dbe55cbc63a61a83b9ff6cdbc044905f5e:
Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
(2013-02-12 10:41:46 -0500)
Cong Ding (1):
mac80211: fix error in sizeof() usage
Johannes Berg (2):
mac80211: fix managed mode channel context use
mac80211: fix channel selection bug
John W. Linville (2):
Merge branch 'for-john' of git://git.kernel.org/.../jberg/mac80211
Merge branch 'master' of git://git.kernel.org/.../linville/wireless into
for-davem
Jonas Gorski (1):
mwl8k: fix band for supported channels
drivers/net/wireless/mwl8k.c | 36 ++--
net/mac80211/cfg.c | 3 ++-
net/mac80211/mlme.c | 11 +++
3 files changed, 27 insertions(+), 23 deletions(-)
diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c
index 83564d3..a00a03e 100644
--- a/drivers/net/wireless/mwl8k.c
+++ b/drivers/net/wireless/mwl8k.c
@@ -318,20 +318,20 @@ struct mwl8k_sta {
#define MWL8K_STA(_sta) ((struct mwl8k_sta *)&((_sta)->drv_priv))
static const struct ieee80211_channel mwl8k_channels_24[] = {
- { .center_freq = 2412, .hw_value = 1, },
- { .center_freq = 2417, .hw_value = 2, },
- { .center_freq = 2422, .hw_value = 3, },
- { .center_freq = 2427, .hw_value = 4, },
- { .center_freq = 2432, .hw_value = 5, },
- { .center_freq = 2437, .hw_value = 6, },
- { .center_freq = 2442, .hw_value = 7, },
- { .center_freq = 2447, .hw_value = 8, },
- { .center_freq = 2452, .hw_value = 9, },
- { .center_freq = 2457, .hw_value = 10, },
- { .center_freq = 2462, .hw_value = 11, },
- { .center_freq = 2467, .hw_value = 12, },
- { .center_freq = 2472, .hw_value = 13, },
- { .center_freq = 2484, .hw_value = 14, },
+ { .band = IEEE80211_BAND_2GHZ, .center_freq = 2412, .hw_value = 1, },
+ { .band = IEEE80211_BAND_2GHZ, .center_freq = 2417, .hw_value = 2, },
+ { .band = IEEE80211_BAND_2GHZ, .center_freq = 2422, .hw_value = 3, },
+ { .band = IEEE80211_BAND_2GHZ, .center_freq = 2427, .hw_value = 4, },
+ { .band = IEEE80211_BAND_2GHZ, .center_freq = 2432, .hw_value = 5, },
+ { .band = IEEE80211_BAND_2GHZ, .center_freq = 2437, .hw_value = 6, },
+ { .band = IEEE80211_BAND_2GHZ, .center_freq = 2442, .hw_value = 7, },
+ { .band = IEEE80211_BAND_2GHZ, .center_freq = 2447, .hw_value = 8, },
+ { .band = IEEE80211_BAND_2GHZ, .center_freq = 2452, .hw_value = 9, },
+ { .band = IEEE80211_BAND_2GHZ, .center_freq = 2457, .hw_value = 10, },
+ { .band = IEEE80211_BAND_2GHZ, .center_freq = 2462, .hw_value = 11, },
+ { .band = IEEE80211_BAND_2GHZ, .center_freq = 2467, .hw_value = 12, },
+ { .band = IEEE80211_BAND_2GHZ, .center_freq = 2472, .hw_value = 13, },
+ { .band = IEEE80211_BAND_2GHZ, .center_freq = 2484, .hw_value = 14, },
};
static const struct ieee80211_rate mwl8k_rates_24[] = {
@@ -352,10 +352,10 @@ static const struct ieee80211_rate mwl8k_rates_24[] = {
};
static const struct ieee80211_channel mwl8k_channels_50[] = {
- { .center_freq = 5180, .hw_value = 36, },
- { .center_freq = 5200, .hw_value = 40, },
- { .center_freq = 5220, .hw_value = 44, },
- { .center_freq = 5240, .hw_value = 48, },
+ { .band = IEEE80211_BAND_5GHZ, .center_freq = 5180, .hw_value = 36, },
+ { .band = IEEE80211_BAND_5GHZ, .center_freq = 5200, .hw_value = 40, },
+ { .band = IEEE80211_BAND_5GHZ, .center_freq = 5220, .hw_value = 44, },
+ { .band = IEEE80211_BAND_5GHZ, .center_freq = 5240, .hw_value = 48, },
};
static const struct ieee80211_rate mwl8k_rates_50[] = {
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 516fbc9..0479c64 100644
--- a/net/mac80211/cfg.c
+++ b
pull request: wireless 2013-04-03
Dave,
Here are some more fixes intended for the 3.9 stream...
Regarding the mac80211 bits, Johannes says:
"I had changed the idle handling to simplify it, but broken the
sequencing of commands, at least for ath9k-htc, one patch restores the
sequence. The other patch fixes a crash Jouni found while stress-testing
the remain-on-channel code, when an item is deleted the work struct can
run twice and crash the second time."
As for the iwlwifi bits, Johannes says:
"The only fix here is to the passive-no-RX firmware regulatory
enforcement driver support code to not drop auth frames in quick
succession, leading to not being able to connect to APs on passive
channels in certain circumstances."
Don't forget the NFC bits, about which Samuel says:
"This time we have:
- A crash fix for when a DGRAM LLCP socket is listening while the NFC adapter
is physically removed.
- A potential double skb free when the LLCP socket receive queue is full.
- A fix for properly handling multiple and consecutive LLCP connections, and
not trash the socket ack log.
- A build failure for the MEI microread physical layer, now that the MEI bus
APIs have been merged into char-misc-next."
On top of that, Stone Piao provides an mwifiex fix to avoid accessing
beyond the end of a buffer.
Please let me know if there are problems!
Thanks,
John
---
The following changes since commit 3658f3604066d5500ebd73a04084f127dc779441:
Merge branch 'stable' of
git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile (2013-04-01
08:17:09 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git for-davem
for you to fetch changes up to 407ad2b7efebe42f8331fd42c4576ed3a6117e29:
Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
(2013-04-03 13:50:34 -0400)
Johannes Berg (3):
mac80211: fix remain-on-channel cancel crash
mac80211: fix idle handling sequence
iwlwifi: dvm: fix the passive-no-RX workaround
John W. Linville (4):
Merge branch 'for-john' of git://git.kernel.org/.../jberg/mac80211
Merge branch 'for-john' of git://git.kernel.org/.../iwlwifi/iwlwifi-fixes
Merge tag 'nfc-fixes-3.9-2' of git://git.kernel.org/.../sameo/nfc-fixes
Merge branch 'master' of git://git.kernel.org/.../linville/wireless into
for-davem
Samuel Ortiz (3):
NFC: llcp: Detach socket from process context only when releasing the
socket
NFC: llcp: Keep the connected socket parent pointer alive
NFC: microread: Fix build failure due to a new MEI bus API
Stone Piao (1):
mwifiex: limit channel number not to overflow memory
Thierry Escande (1):
NFC: llcp: Remove possible double call to kfree_skb
drivers/net/wireless/iwlwifi/dvm/rxon.c | 18 +++-
drivers/net/wireless/iwlwifi/dvm/tx.c | 2 +-
drivers/net/wireless/mwifiex/cfg80211.c | 3 ++-
drivers/nfc/microread/mei.c | 38 +++--
net/mac80211/cfg.c | 6 --
net/mac80211/chan.c | 17 ---
net/mac80211/ieee80211_i.h | 4 +++-
net/mac80211/iface.c| 2 +-
net/mac80211/offchannel.c | 23 ++--
net/nfc/llcp/llcp.c | 8 ---
net/nfc/llcp/sock.c | 6 +++---
11 files changed, 70 insertions(+), 57 deletions(-)
diff --git a/drivers/net/wireless/iwlwifi/dvm/rxon.c
b/drivers/net/wireless/iwlwifi/dvm/rxon.c
index 23be948..a82b6b3 100644
--- a/drivers/net/wireless/iwlwifi/dvm/rxon.c
+++ b/drivers/net/wireless/iwlwifi/dvm/rxon.c
@@ -1419,6 +1419,14 @@ void iwlagn_bss_info_changed(struct ieee80211_hw *hw,
mutex_lock(&priv->mutex);
+ if (changes & BSS_CHANGED_IDLE && bss_conf->idle) {
+ /*
+* If we go idle, then clearly no "passive-no-rx"
+* workaround is needed any more, this is a reset.
+*/
+ iwlagn_lift_passive_no_rx(priv);
+ }
+
if (unlikely(!iwl_is_ready(priv))) {
IWL_DEBUG_MAC80211(priv, "leave - not ready\n");
mutex_unlock(&priv->mutex);
@@ -1450,16 +1458,6 @@ void iwlagn_bss_info_changed(struct ieee80211_hw *hw,
priv->timestamp = bss_conf->sync_tsf;
ctx->staging.filter_flags |= RXON_FILTER_ASSOC_MSK;
} else {
- /*
-* If we disassociate while there are pending
-* frames, just wake up the queues and let the
-* frames "escape" ... This shouldn't really
-* be happe
Re: pull request: bluetooth-next 2013-01-24
On Thu, Jan 24, 2013 at 01:10:52AM -0200, Gustavo Padovan wrote: > Hi John, > > This is my first pull request to 3.9. The biggest changes here are from Johan > Hedberg who made a lot of fixes in the Management interface. The issues arose > due to a new test tool we wrote and the usage of the Management interface as > default in BlueZ 5. The rest of the patches are more clean ups and small > fixes. > > Please pull! Thanks! > > > Gustavo > --- > The following changes since commit e7f767a7d9f809c494bfeda2bbdbfec110b4: > > mwifiex: use map/unmap APIs in TX and RX to reduce memcpy (2013-01-07 > 15:18:30 -0500) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next > for-upstream > > for you to fetch changes up to 9b008c0457e583e10e62d1215bed6ab26ee54906: > > Bluetooth: Add support for reading LE supported states (2013-01-23 02:09:16 > -0200) Pulling now... -- John W. LinvilleSomeday the world will need a hero, and you linvi...@tuxdriver.com might be all we have. Be ready. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] libertas sdio: remove CMD_FUNC_INIT call
On Fri, Jan 18, 2013 at 12:28:17PM -0800, Bing Zhao wrote:
> Hi Lubomir,
>
> > It actually times out on a 8688 present in GuruPlug with sd8688.bin
> > (md5=7233401e9687f8c880da547beed4324e) firmware (that's present in
> > linux-firmware tree), but the adapter works fine.
> >
> > For that firmware times out with libertas_uap [1] as well, though it
> > succeeds
> > with sd8688_ap.bin (md5=52cd8f8296b9a7e1d3835d57416256b2) that was
> > originally
> > shipped with GuruPlug. That firmware is not in linux-firmware tree and
> > btmrvl
> > driver might win the race programming the 8688 with sd8688.bin anyway.
> >
> > [1] https://github.com/lkundrak/linux/tree/libertas_uap
> > ---
> > drivers/net/wireless/libertas/if_sdio.c | 14 --
> > 1 files changed, 0 insertions(+), 14 deletions(-)
> >
> > diff --git a/drivers/net/wireless/libertas/if_sdio.c
> > b/drivers/net/wireless/libertas/if_sdio.c
> > index 2ecab49..3c4c555 100644
> > --- a/drivers/net/wireless/libertas/if_sdio.c
> > +++ b/drivers/net/wireless/libertas/if_sdio.c
> > @@ -825,20 +825,6 @@ static void if_sdio_finish_power_on(struct
> > if_sdio_card *card)
> >
> > sdio_release_host(func);
> >
> > - /*
> > -* FUNC_INIT is required for SD8688 WLAN/BT multiple functions
> > -*/
> > - if (card->model == MODEL_8688) {
> > - struct cmd_header cmd;
> > -
> > - memset(&cmd, 0, sizeof(cmd));
> > -
> > - lbs_deb_sdio("send function INIT command\n");
> > - if (__lbs_cmd(priv, CMD_FUNC_INIT, &cmd, sizeof(cmd),
> > - lbs_cmd_copyback, (unsigned long) &cmd))
> > - netdev_alert(priv->dev, "CMD_FUNC_INIT cmd failed\n");
> > - }
> > -
>
> Removing FUNC_INIT could break things in some scenarios.
> Could you please test the following case?
>
> 1. insmod liberates -> download firmware, send FUNC_INIT, ...
> 2. rmmod libertas -> send FUNC_SHUTDOWN command to firmware; BT is still
> working.
> 3. insmod libertas -> skip firmware downloading, send FUNC_INIT, ...
>
> If FUNC_INIT is removed, I don't expect step 3 to work.
>
> Thanks,
> Bing
>
> > priv->fw_ready = 1;
> > wake_up(&card->pwron_waitq);
> >
> > --
> > 1.7.1
>
Lubomir, any reply? Should I drop this one?
--
John W. LinvilleSomeday the world will need a hero, and you
linvi...@tuxdriver.com might be all we have. Be ready.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: pull request: bluetooth-next 2013-02-01
On Fri, Feb 01, 2013 at 03:54:45PM -0200, Gustavo Padovan wrote: > Hi John, > > * Gustavo Padovan [2013-02-01 15:40:19 -0200]: > > > Hi John, > > > > Here goes another batch intended for 3.9, the majority of the patch here are > > from Johan who is fixing many issues in the management interface that have > > appeared lately. The rest of the patches are just small improvements, fixes > > and clean ups. > > I had a brain shutdown moment and forgot to rebase against wireless-next. > SO the pull request is actually much smaller. > > Please pull! > > Gustavo > > --- > The following changes since commit c331997b6c9ad7f4b8075e6e60d3caa6e36f5938: > > wil6210: fix wil_vring_init_tx status (2013-01-30 15:07:19 -0500) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next > for-upstream > > for you to fetch changes up to a3d09356491d637548dbe815ddb966f52ec9e53a: > > Bluetooth: Refactor mgmt_pending_foreach (2013-02-01 15:50:18 -0200) Pulling now... -- John W. LinvilleSomeday the world will need a hero, and you linvi...@tuxdriver.com might be all we have. Be ready. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
pull request: wireless 2013-02-01
Dave,
I'm sorry you got hit by the flu! Hopefully you are fully recovered
by now? :-)
This is a small batch of fixes intended for the 3.8 stream...
There are two pulls from Johannes. Regarding mac80211, Johannes says:
"One fix from Dan for a possible memory overrun."
Regarding iwlwifi, Johannes says:
"I have one fix from Emmanuel reverting a previous fix that caused
more trouble than it's worth."
Along with those:
Arend van Spriel fixes a fatal error in brcsmac related to tx status processing.
Bing Zhao corrects a problem where mwifiex would fail to complete a scan
in the event of an IE processing error.
Larry Finger fixes a thinko in rtlwifi in which the wrong skb variable
was being used in some cases.
Rafał Miłecki fixes a thinko in an ID check in the bcma flash code.
Please let me know if there are problems!
Thanks,
John
---
The following changes since commit 66555e92fb7a619188c02cceae4bbc414f15f96d:
tcp: detect SYN/data drop when F-RTO is disabled (2013-01-31 14:20:07 -0500)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git for-davem
for you to fetch changes up to ed6882ac40552034ae6bde3e540b84c832dc8491:
Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
(2013-02-01 13:43:25 -0500)
Arend van Spriel (1):
brcmsmac: fix tx status processing
Bing Zhao (1):
mwifiex: fix incomplete scan in case of IE parsing error
Dan Carpenter (1):
cfg80211: off by one in ieee80211_bss()
Emmanuel Grumbach (1):
Revert "iwlwifi: fix the reclaimed packet tracking upon flush queue"
John W. Linville (3):
Merge branch 'for-john' of git://git.kernel.org/.../jberg/mac80211
Merge branch 'for-john' of git://git.kernel.org/.../iwlwifi/iwlwifi-fixes
Merge branch 'master' of git://git.kernel.org/.../linville/wireless into
for-davem
Larry Finger (1):
rtlwifi: Fix the usage of the wrong variable in usb.c
Rafał Miłecki (1):
bcma: fix NAND flash validation
drivers/bcma/driver_chipcommon_nflash.c| 2 +-
drivers/net/wireless/brcm80211/brcmsmac/main.c | 25 +
drivers/net/wireless/iwlwifi/dvm/tx.c | 24 +++-
drivers/net/wireless/mwifiex/scan.c| 9 +
drivers/net/wireless/rtlwifi/usb.c | 4 ++--
net/wireless/scan.c| 2 +-
6 files changed, 25 insertions(+), 41 deletions(-)
diff --git a/drivers/bcma/driver_chipcommon_nflash.c
b/drivers/bcma/driver_chipcommon_nflash.c
index dbda91e..1f0b83e 100644
--- a/drivers/bcma/driver_chipcommon_nflash.c
+++ b/drivers/bcma/driver_chipcommon_nflash.c
@@ -21,7 +21,7 @@ int bcma_nflash_init(struct bcma_drv_cc *cc)
struct bcma_bus *bus = cc->core->bus;
if (bus->chipinfo.id != BCMA_CHIP_ID_BCM4706 &&
- cc->core->id.rev != 0x38) {
+ cc->core->id.rev != 38) {
bcma_err(bus, "NAND flash on unsupported board!\n");
return -ENOTSUPP;
}
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/main.c
b/drivers/net/wireless/brcm80211/brcmsmac/main.c
index 17594de..9f3d7e9 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/main.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c
@@ -1027,7 +1027,6 @@ brcms_c_dotxstatus(struct brcms_c_info *wlc, struct
tx_status *txs)
static bool
brcms_b_txstatus(struct brcms_hardware *wlc_hw, bool bound, bool *fatal)
{
- bool morepending = false;
struct bcma_device *core;
struct tx_status txstatus, *txs;
u32 s1, s2;
@@ -1041,23 +1040,20 @@ brcms_b_txstatus(struct brcms_hardware *wlc_hw, bool
bound, bool *fatal)
txs = &txstatus;
core = wlc_hw->d11core;
*fatal = false;
- s1 = bcma_read32(core, D11REGOFFS(frmtxstatus));
- while (!(*fatal)
- && (s1 & TXS_V)) {
- /* !give others some time to run! */
- if (n >= max_tx_num) {
- morepending = true;
- break;
- }
+ while (n < max_tx_num) {
+ s1 = bcma_read32(core, D11REGOFFS(frmtxstatus));
if (s1 == 0x) {
brcms_err(core, "wl%d: %s: dead chip\n", wlc_hw->unit,
__func__);
*fatal = true;
return false;
}
- s2 = bcma_read32(core, D11REGOFFS(frmtxstatus2));
+ /* only process when valid */
+ if (!(s1 & TXS_V))
+ break;
+ s2 = bcma_read32(core, D11REGOFFS(frmtxstatus2));
txs->status
pull request: wireless 2013-02-25
Dave,
This is a batch of fixes intended for the 3.9 stream...
Avinash Patil gives us a mwifiex fix to prevent a system freeze when
that driver is unloaded.
Daniel Drake brings a patch to avoid dropping the carrier flag across a
suspend. This prevents improper packet drops.
Wei Yongjun delivers a brcmfmac for a lock leak on an error path.
Please let me know if there are problems!
Thanks,
John
---
The following changes since commit ea5cdccc46d392b73d941c723630d37094e8e8ea:
net/pasemi: Fix missing coding style (2013-02-24 21:22:47 -0500)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git for-davem
for you to fetch changes up to 6d6436fbcbc43febe2481d3488f3bb5271ec2eb0:
Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
(2013-02-25 14:50:31 -0500)
Avinash Patil (1):
mwifiex: fix system freeze while reloading driver
Daniel Drake (1):
mwifiex: don't drop carrier flag over suspend
John W. Linville (1):
Merge branch 'master' of git://git.kernel.org/.../linville/wireless into
for-davem
Wei Yongjun (1):
brcmfmac: fix missing unlock on error in brcmf_notify_vif_event()
.../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 4 +++-
drivers/net/wireless/mwifiex/pcie.c | 21 ++---
drivers/net/wireless/mwifiex/sdio.c | 9 -
3 files changed, 5 insertions(+), 29 deletions(-)
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
index cecc3ef..2af9c0f 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
@@ -4615,8 +4615,10 @@ static s32 brcmf_notify_vif_event(struct brcmf_if *ifp,
switch (ifevent->action) {
case BRCMF_E_IF_ADD:
/* waiting process may have timed out */
- if (!cfg->vif_event.vif)
+ if (!cfg->vif_event.vif) {
+ mutex_unlock(&event->vif_event_lock);
return -EBADF;
+ }
ifp->vif = vif;
vif->ifp = ifp;
diff --git a/drivers/net/wireless/mwifiex/pcie.c
b/drivers/net/wireless/mwifiex/pcie.c
index 4b54bcf..35c7972 100644
--- a/drivers/net/wireless/mwifiex/pcie.c
+++ b/drivers/net/wireless/mwifiex/pcie.c
@@ -171,7 +171,7 @@ static int mwifiex_pcie_suspend(struct pci_dev *pdev,
pm_message_t state)
{
struct mwifiex_adapter *adapter;
struct pcie_service_card *card;
- int hs_actived, i;
+ int hs_actived;
if (pdev) {
card = (struct pcie_service_card *) pci_get_drvdata(pdev);
@@ -191,9 +191,6 @@ static int mwifiex_pcie_suspend(struct pci_dev *pdev,
pm_message_t state)
/* Indicate device suspended */
adapter->is_suspended = true;
- for (i = 0; i < adapter->priv_num; i++)
- netif_carrier_off(adapter->priv[i]->netdev);
-
return 0;
}
@@ -209,7 +206,6 @@ static int mwifiex_pcie_resume(struct pci_dev *pdev)
{
struct mwifiex_adapter *adapter;
struct pcie_service_card *card;
- int i;
if (pdev) {
card = (struct pcie_service_card *) pci_get_drvdata(pdev);
@@ -231,10 +227,6 @@ static int mwifiex_pcie_resume(struct pci_dev *pdev)
adapter->is_suspended = false;
- for (i = 0; i < adapter->priv_num; i++)
- if (adapter->priv[i]->media_connected)
- netif_carrier_on(adapter->priv[i]->netdev);
-
mwifiex_cancel_hs(mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_STA),
MWIFIEX_ASYNC_CMD);
@@ -916,17 +908,8 @@ static int mwifiex_pcie_delete_sleep_cookie_buf(struct
mwifiex_adapter *adapter)
static int mwifiex_clean_pcie_ring_buf(struct mwifiex_adapter *adapter)
{
struct pcie_service_card *card = adapter->card;
- const struct mwifiex_pcie_card_reg *reg = card->pcie.reg;
- u32 rdptr;
-
- /* Read the TX ring read pointer set by firmware */
- if (mwifiex_read_reg(adapter, reg->tx_rdptr, &rdptr)) {
- dev_err(adapter->dev,
- "Flush TXBD: failed to read reg->tx_rdptr\n");
- return -1;
- }
- if (!mwifiex_pcie_txbd_empty(card, rdptr)) {
+ if (!mwifiex_pcie_txbd_empty(card, card->txbd_rdptr)) {
card->txbd_flush = 1;
/* write pointer already set at last send
* send dnld-rdy intr again, wait for completion.
diff --git a/drivers/net/wireless/mwifiex/sdio.c
b/drivers/net/wireless/mwifiex/sdio.c
index e63f646..363ba31 100644
--- a/drivers/net/wireless/mwifiex/sdio.c
+++ b/driv
Re: pull request: bluetooth 2013-03-11
On Mon, Mar 11, 2013 at 06:20:33PM -0300, Gustavo Padovan wrote: > Hi John, > > I have these two patches for 3.9, these add support for two more devices to > the bluetooth drivers. Please pull. Thanks. > > Gustavo > -- > The following changes since commit d786f67e5c587a4de8245336cb64cf4dd06871a7: > > mwl8k: fix band for supported channels (2013-02-11 14:31:36 -0500) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth > for-upstream > > for you to fetch changes up to 94a32d10f47b637ae24b78b1ddc7ef0e8396fda4: > > Bluetooth: Device 0cf3:3008 should map AR 3012 (2013-03-11 18:04:54 -0300) Pulling now... -- John W. LinvilleSomeday the world will need a hero, and you linvi...@tuxdriver.com might be all we have. Be ready. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
pull request: wireless 2013-03-15
Dave,
Please pull these fixes for the 3.9 stream.
On the NFC bits, Samuel says:
"With this one we have:
- A fix for properly decreasing socket ack log.
- A timer and works cleanup upon NFC device removal.
- A monitoroing socket cleanup round from llcp_socket_release.
- A proper error report to pending sockets upon NFC device removal."
Regarding the Bluetooth bits, Gustavo says:
"I have these two patches for 3.9, these add support for two more devices to
the bluetooth drivers."
Along with those, we have a few wireless driver fixes...
Bing Zhao provides an mwifiex to prevent an out-of-bounds memory
access.
John Crispin offers a Kconfig fix to enable some otherwise dead code
in rt2x00. The correct symbols were added in -rc1 through a different
tree, but the symbols for enabling the wireless driver didn't match.
Larry Finger brings an rtlwifi fix for a scheduling while atomic bug,
and another fix for a reassociation problem caused by failing to
clear the BSSID after a disconnect.
Please let me know if there are problems!
Thanks,
John
---
The following changes since commit aaa0c23cb90141309f5076ba5e3bfbd39544b985:
Fix dst_neigh_lookup/dst_neigh_lookup_skb return value handling bug
(2013-03-15 09:06:58 -0400)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git for-davem
for you to fetch changes up to f3a3440063d6b01470507ecde9cf8ed0b033362a:
Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
(2013-03-15 10:44:36 -0400)
Bing Zhao (1):
mwifiex: fix potential out-of-boundary access to ibss rate table
John Crispin (1):
rt2x00: fix rt2x00 to work with the new ralink SoC config symbols
John W. Linville (3):
Merge tag 'nfc-fixes-3.9-1' of git://git.kernel.org/.../sameo/nfc-fixes
Merge branch 'for-upstream' of
git://git.kernel.org/.../bluetooth/bluetooth
Merge branch 'master' of git://git.kernel.org/.../linville/wireless into
for-davem
Josh Boyer (1):
Bluetooth: Add support for atheros 04ca:3004 device to ath3k
Larry Finger (2):
rtlwifi: rtl8192cu: Fix schedule while atomic bug splat
rtlwifi: rtl8192cu: Fix problem that prevents reassociation
Samuel Ortiz (4):
NFC: llcp: Decrease socket ack log when accepting a connection
NFC: llcp: Clean local timers and works when removing a device
NFC: llcp: Clean raw sockets from nfc_llcp_socket_release
NFC: llcp: Report error to pending sockets when a device is removed
Sunguk Lee (1):
Bluetooth: Device 0cf3:3008 should map AR 3012
drivers/bluetooth/ath3k.c | 4 ++
drivers/bluetooth/btusb.c | 2 +
drivers/net/wireless/mwifiex/join.c | 7 +--
drivers/net/wireless/rt2x00/Kconfig | 4 +-
drivers/net/wireless/rt2x00/rt2800pci.c | 14 ++---
drivers/net/wireless/rtlwifi/rtl8192cu/hw.c | 89 -
net/nfc/llcp/llcp.c | 62 +---
net/nfc/llcp/sock.c | 2 +
8 files changed, 108 insertions(+), 76 deletions(-)
diff --git a/drivers/bluetooth/ath3k.c b/drivers/bluetooth/ath3k.c
index a8a41e07..b282af1 100644
--- a/drivers/bluetooth/ath3k.c
+++ b/drivers/bluetooth/ath3k.c
@@ -74,8 +74,10 @@ static struct usb_device_id ath3k_table[] = {
/* Atheros AR3012 with sflash firmware*/
{ USB_DEVICE(0x0CF3, 0x3004) },
+ { USB_DEVICE(0x0CF3, 0x3008) },
{ USB_DEVICE(0x0CF3, 0x311D) },
{ USB_DEVICE(0x13d3, 0x3375) },
+ { USB_DEVICE(0x04CA, 0x3004) },
{ USB_DEVICE(0x04CA, 0x3005) },
{ USB_DEVICE(0x04CA, 0x3006) },
{ USB_DEVICE(0x04CA, 0x3008) },
@@ -106,8 +108,10 @@ static struct usb_device_id ath3k_blist_tbl[] = {
/* Atheros AR3012 with sflash firmware*/
{ USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 },
+ { USB_DEVICE(0x0cf3, 0x3008), .driver_info = BTUSB_ATH3012 },
{ USB_DEVICE(0x0cf3, 0x311D), .driver_info = BTUSB_ATH3012 },
{ USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 },
+ { USB_DEVICE(0x04ca, 0x3004), .driver_info = BTUSB_ATH3012 },
{ USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 },
{ USB_DEVICE(0x04ca, 0x3006), .driver_info = BTUSB_ATH3012 },
{ USB_DEVICE(0x04ca, 0x3008), .driver_info = BTUSB_ATH3012 },
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index 7e351e3..e547851 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -132,8 +132,10 @@ static struct usb_device_id blacklist_table[] = {
/* Atheros 3012 with sflash firmware */
{ USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 },
+ { USB_DEVICE(0x0cf3, 0x3008), .driver_info = BTUSB_ATH3012 },
Re: pull request: bluetooth 2012-09-08
On Sat, Sep 08, 2012 at 06:59:56PM -0300, Gustavo Padovan wrote: > Hi John, > > A few more fixes to 3.6, here we have four important fix to the MGMT > interface, > two from Johan Hedberg and Andrzej Kaczmarek. Andrei fixed a free on > uninitialized memory and I added support for Broadcom/Foxconn devices. "Bluetooth: mgmt: Implement support for passkey notification" doesn't look like a fix at all. "Bluetooth: Update management interface revision" is suspect. It kinda makes sense, but if it is so important than it should have been merged much earlier, no? "Bluetooth: Add USB_VENDOR_AND_INTERFACE_INFO() for Broadcom/Foxconn" might normally be OK, but it is getting late enough in the cycle that I would prefer to delay any device ID patches until the next merge window. The others look fine. Do you want me to merge them directly? Or would you rather respin your pull request? John > Please pull, or let me know of any problems. Thanks. > > Gustavo > > The following changes since commit f10723841e624c0726c70356b31d91befed01dd6: > > libertas sdio: fix suspend when interface is down (2012-09-05 14:53:36 > -0400) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth master > > for you to fetch changes up to b6f04c364ef853d8baa8949be20ef708000bcb97: > > Bluetooth: Fix freeing uninitialized delayed works (2012-09-08 17:27:52 > -0300) > > > Andrei Emeltchenko (1): > Bluetooth: Fix freeing uninitialized delayed works > > Andrzej Kaczmarek (2): > Bluetooth: mgmt: Fix enabling SSP while powered off > Bluetooth: mgmt: Fix enabling LE while powered off > > Gustavo Padovan (1): > Bluetooth: Add USB_VENDOR_AND_INTERFACE_INFO() for Broadcom/Foxconn > > Johan Hedberg (2): > Bluetooth: mgmt: Implement support for passkey notification > Bluetooth: Update management interface revision > > drivers/bluetooth/btusb.c| 2 +- > include/net/bluetooth/hci.h | 18 > include/net/bluetooth/hci_core.h | 5 > include/net/bluetooth/mgmt.h | 7 + > net/bluetooth/hci_event.c| 67 > ++ > net/bluetooth/l2cap_core.c | 2 +- > net/bluetooth/mgmt.c | 35 +- > 7 files changed, 133 insertions(+), 3 deletions(-) > -- John W. LinvilleSomeday the world will need a hero, and you linvi...@tuxdriver.com might be all we have. Be ready. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
pull request: wireless 2012-09-14
commit 7a253c2954dad9d70fa2e07b45b55ea4bee6c6c7
Dave,
This is a batch of fixes intended for the 3.6 stream.
Arend van Spriel sends a simple thinko fix to correct a constant,
preventing the setting of an invalid power level.
Colin Ian King gives us a simple allocation failure check to avoid a
NULL pointer dereference.
Felix Fietkau sends another ath9k tx power patch, this time disabling a
feature that has been reported to cause rx problems.
Hante Meuleman provides a pair of endian fixes for brcmfmac.
Larry Finger offers an rtlwifi fix that avoids a system lockup related
to loading the wrong firmware for RTL8188CE devices.
These have been in linux-next for a few days and I think they should be
included in the final 3.6 kernel if possible.
Please let me know if there are problems!
Thanks,
John
---
The following changes since commit 6af773e786ad617b0264ebe06ba60675c01f3e51:
pktgen: fix crash with vlan and packet size less than 46 (2012-09-13 17:10:00
-0400)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git for-davem
for you to fetch changes up to 7a253c2954dad9d70fa2e07b45b55ea4bee6c6c7:
Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
(2012-09-14 11:39:39 -0400)
Arend van Spriel (1):
brcmsmac: fix mismatch in number of custom regulatory rules
Colin Ian King (1):
brcm80211: fix missing allocation failure check
Felix Fietkau (1):
ath9k: make PA linearization optional, disabled by default and fix checks
Hante Meuleman (2):
brcmfmac: fix big endian bug in i-scan.
brcmfmac: Fix big endian host configuration data.
John W. Linville (1):
Merge branch 'master' of git://git.kernel.org/.../linville/wireless into
for-davem
Larry Finger (1):
rtlwifi: rtl8192ce: Log message that B_CUT device may not work
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 4
drivers/net/wireless/ath/ath9k/debug.c | 2 ++
drivers/net/wireless/ath/ath9k/hw.c| 4
drivers/net/wireless/ath/ath9k/hw.h| 3 +--
drivers/net/wireless/ath/ath9k/link.c | 2 +-
.../net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 2 ++
.../net/wireless/brcm80211/brcmfmac/dhd_common.c | 26 +-
.../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 6 +++--
drivers/net/wireless/brcm80211/brcmsmac/channel.c | 2 +-
drivers/net/wireless/rtlwifi/rtl8192ce/def.h | 1 +
drivers/net/wireless/rtlwifi/rtl8192ce/hw.c| 12 --
drivers/net/wireless/rtlwifi/rtl8192ce/sw.c| 6 +++--
12 files changed, 46 insertions(+), 24 deletions(-)
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
index 2588848..d066f25 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
@@ -2982,6 +2982,10 @@ static u32 ath9k_hw_ar9300_get_eeprom(struct ath_hw *ah,
case EEP_RX_MASK:
return pBase->txrxMask & 0xf;
case EEP_PAPRD:
+ if (AR_SREV_9462(ah))
+ return false;
+ if (!ah->config.enable_paprd);
+ return false;
return !!(pBase->featureEnable & BIT(5));
case EEP_CHAIN_MASK_REDUCE:
return (pBase->miscConfiguration >> 0x3) & 0x1;
diff --git a/drivers/net/wireless/ath/ath9k/debug.c
b/drivers/net/wireless/ath/ath9k/debug.c
index 68b643c..c8ef301 100644
--- a/drivers/net/wireless/ath/ath9k/debug.c
+++ b/drivers/net/wireless/ath/ath9k/debug.c
@@ -1577,6 +1577,8 @@ int ath9k_init_debug(struct ath_hw *ah)
sc->debug.debugfs_phy, sc, &fops_tx_chainmask);
debugfs_create_file("disable_ani", S_IRUSR | S_IWUSR,
sc->debug.debugfs_phy, sc, &fops_disable_ani);
+ debugfs_create_bool("paprd", S_IRUSR | S_IWUSR, sc->debug.debugfs_phy,
+ &sc->sc_ah->config.enable_paprd);
debugfs_create_file("regidx", S_IRUSR | S_IWUSR, sc->debug.debugfs_phy,
sc, &fops_regidx);
debugfs_create_file("regval", S_IRUSR | S_IWUSR, sc->debug.debugfs_phy,
diff --git a/drivers/net/wireless/ath/ath9k/hw.c
b/drivers/net/wireless/ath/ath9k/hw.c
index 48af401..4faf0a3 100644
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -2497,10 +2497,6 @@ int ath9k_hw_fill_cap_info(struct ath_hw *ah)
pCap->rx_status_len = sizeof(struct ar9003_rxs);
pCap->tx_desc_len = sizeof(struct ar9003_txc);
pCap->txs_len = sizeof(struct ar9003_txs);
-
Re: Silent crash witk 2-6.24-rc8-git4
On Thu, Jan 31, 2008 at 08:13:31PM +, Chris Clayton wrote: > Hi John, > > On Wednesday 23 January 2008, John W. Linville wrote: > > On Wed, Jan 23, 2008 at 04:42:58PM +, Chris Clayton wrote: > > > On Wednesday 23 January 2008, Chris Clayton wrote: > > > > Hi again. > > > > > > > > On Tuesday 22 January 2008, Chris Clayton wrote: > > > > > Hi, > > > > > > and here's another, slightly more complete, one, this time from > > > 2.6.24-rc8-git6 > > > (the none I sent earlier was from -git4, by the way) > > > > > > Call Trace: > > > [] __update_rq_clock+0x1a/0xf0 > > > [] rt2x00lib_txdone+0x9d/0xd0 [rt2x00lib] > > > [] rt61pci_txdone+0x153/0x1f0 [rt61pci] > > > [] rt61pci_interrupt+0x9d/0xb0 [rt61pci] > > > > I suspect this could relate to this commit: > > > > commit 62bc060b8ed5fcdafd87da5ab17bdd59a39ebcc9 > > Author: Mattias Nissler <[EMAIL PROTECTED]> > > Date: Mon Nov 12 15:03:12 2007 +0100 > > > > rt2x00: Allow rt61 to catch up after a missing tx report > > > > Could you revert that patch, rebuild, and try to recreate the problem? > > As you will have seen, Matthias doubted whether his patch would be at the root > of the problem I am seeing. I noticed you posted some patches earlier this > week. > Would any combination of those be likely to fix the bug, please? The patch > http://www.kernel.org/pub/linux/kernel/people/linville/wireless-2.6/upstream/0001-rt61pci-fix-up-merge-damage.patch > applies cleanly to 2.6.24 but the build fails :( This patch is not intended for 2.6.24, so that won't help. :-) I saw Mattias's reply, but I didn't see him suggest any other fixes... :-( I'm wondering if maybe you tried reverting it anyway? I only ask because the call trace references symbols that would seem to relate to the patch. So even if _why_ it might break things isn't obvious, it still might be worth trying a revert "just in case". :-) > It seems that it may take a little while to get to the bottom of this bug. > Should > I raise an incident on bugzilla? I've seen other reports of rt61 working fine with 2.6.24. So I suppose you should open a bug. Thanks! John -- John W. Linville [EMAIL PROTECTED] -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] wireless/ath5k: renamed to ath5k_pci_driver to fix Section mismatch warnings
On Sat, Feb 02, 2008 at 10:55:10AM +0800, Denis Cheng wrote: > the struct pci_driver refered ath5k_pci_id_table which in __devinit section, > the sparse tool suggest this renamed to "*driver", kills mismatch warnings. > > Signed-off-by: Denis Cheng <[EMAIL PROTECTED]> Sorry, I beat you to it on Friday... :-) John -- John W. Linville [EMAIL PROTECTED] -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: Announce: Linux-next (Or Andrew's dream :-))
On Tue, Feb 12, 2008 at 11:31:48AM -0500, Jeff Garzik wrote: > David Miller wrote: >> I rebase my tree all the time, at least once or twice per >> week. Why? > FWIW, that is annoying and painful for us downstream jobbers, since it > isn't really how git was meant to be used. You use it more like a patch > queue, where commits are very fluid. > I understand the desire to want a nice and clean history, but the frequency > here really has a negative impact on your downstreams. FWIW, I definitely have a (vocal minority) group of contributors who resent all the rebasing. There may be a few cases of 'vanity' represented here, but there are definitely reasonable complaints about not being able to do simple pulls to stay up-to-date and/or having to rebase before they can send patches to me. FWIW, I think it might save a bit of my time as well, although I have become pretty good and "riding the tide" of rebasing... :-( Unfortunately, I don't have any good suggestions to remedy the issue. One strategy might be a third layer of trees, e.g.: net-2.6 fixes for the current release net-2.6.26 updates certain to go to the next release net-2.6.26-maybeupdates that might not make it to the next release Of course, managing what goes moves-up from -maybe is probably a big headache, and just sucks-up more of Dave's time. And, of course, virtually no one will run the -maybe tree... Just my $0.02... John -- John W. Linville [EMAIL PROTECTED] -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: Announce: Linux-next (Or Andrew's dream :-))
On Tue, Feb 12, 2008 at 06:47:30PM -0800, Joel Becker wrote: > Make the distinction earlier. With ocfs2 and configfs (we got > this scheme from Jeff), we keep the topic branches as "unsafe" - that > is, officially rebaseable . We merge them all into a big "ALL" branch, > which is also "unsafe". Andrew pulls this for -mm, and it gets tested > here. If there is a brown-paper-bag problem, we can tell the original > author to fix it. Then we re-pull the topic - effectively a rebase. > The ALL is also rebased. But that's Ok, it will never go towards Linus. > When a topic is considered worthy of going upstream, we pull it > to a branch called "upstream-linus". This branch is *NEVER* rebased. > Now that the topic is in upstream-linus, the original topic branch can't > be rebased either. So any fixes to that topic going forward will stay > in the history. Since that topic was pulled into ALL for testing, we > are using the identical commits that got tested. This is essentially the same process I've been using in wireless-2.6 with the (regularly rebased) 'everything' branch. Still I find that it causes lots of confusion and complaining. Perhaps I am not communicating clearly enough... :-) Do you find that people are happy with that process? Forgive me for not knowing, but how many developers are actively (or occasionaly) involved in ocfs2 and configfs? How many 'normal' users pull your tree looking for 'latest and greatest' code? John -- John W. Linville [EMAIL PROTECTED] -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
pull request: wireless 2012-10-31
commit 06272911485850b4a336122958c50af0f8ea7c13 Dave, This is a batch of fixes intended for 3.7... The biggest portion of this is a pull request from Johannes Berg: "Please pull my mac80211.git tree per below to get a number of fixes. I have included a patch from Antonio to fix a memcpy overrun, Felix's patches for the antenna gain/tx power issues, a few mesh-related fixes from Javier for mac80211 and my own patches to not access data that might not be present in an skb at all as well as a patch (the duplicate IE check one) to make mac80211 forward-compatible with potential future spec extensions that use the same IE multiple times. It's a bit bigger than I'd like maybe, but I think all of these are worthwhile fixes at this point." In addition... Felix Fietkau fixes an ath9k use-after-free issue. Stanislaw Gruszka adds a valid value check to rt2800. Sven Eckelmann adds a check to only check a TID value in a BlockAck, for frames that could be either a BlockAck or a normal Ack. Please let me know if there are problems! John P.S. Stay safe in NYC! It must be tough there right now. Let me know if I can somehow be helpful to you! Anyway, I wanted to go ahead and post this now for when you do find the means to process pull requests. If you would prefer that I do something else, then please let me know! --- The following changes since commit e657e078d3dfa9f96976db7a2b5fd7d7c9f1f1a6: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (2012-10-26 15:00:48 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git for-davem for you to fetch changes up to 06272911485850b4a336122958c50af0f8ea7c13: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem (2012-10-31 13:10:01 -0400) Antonio Quartulli (1): mac80211: fix SSID copy on IBSS JOIN Felix Fietkau (3): cfg80211: fix antenna gain handling cfg80211: fix initialization of chan->max_reg_power ath9k: fix stale pointers potentially causing access to free'd skbs Javier Cardona (3): mac80211: Only process mesh config header on frames that RA_MATCH mac80211: Don't drop frames received with mesh ttl == 1 mac80211: don't inspect Sequence Control field on control frames Johannes Berg (5): mac80211: use blacklist for duplicate IE check wireless: drop invalid mesh address extension frames mac80211: check management frame header length mac80211: verify that skb data is present mac80211: make sure data is accessible in EAPOL check John W. Linville (2): Merge branch 'for-john' of git://git.kernel.org/.../jberg/mac80211 Merge branch 'master' of git://git.kernel.org/.../linville/wireless into for-davem Stanislaw Gruszka (1): rt2800: validate step value for temperature compensation Sven Eckelmann (1): ath9k: Test for TID only in BlockAcks while checking tx status drivers/net/wireless/ath/ath9k/xmit.c | 10 - drivers/net/wireless/rt2x00/rt2800lib.c | 2 +- include/net/cfg80211.h | 9 net/mac80211/ibss.c | 2 +- net/mac80211/rx.c | 74 + net/mac80211/util.c | 42 +++ net/wireless/core.c | 3 +- net/wireless/reg.c | 5 ++- net/wireless/util.c | 14 --- 9 files changed, 122 insertions(+), 39 deletions(-) diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c index 378bd70..741918a 100644 --- a/drivers/net/wireless/ath/ath9k/xmit.c +++ b/drivers/net/wireless/ath/ath9k/xmit.c @@ -312,6 +312,7 @@ static struct ath_buf *ath_tx_get_buffer(struct ath_softc *sc) } bf = list_first_entry(&sc->tx.txbuf, struct ath_buf, list); + bf->bf_next = NULL; list_del(&bf->list); spin_unlock_bh(&sc->tx.txbuflock); @@ -393,7 +394,7 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq, u16 seq_st = 0, acked_cnt = 0, txfail_cnt = 0, seq_first; u32 ba[WME_BA_BMP_SIZE >> 5]; int isaggr, txfail, txpending, sendbar = 0, needreset = 0, nbad = 0; - bool rc_update = true; + bool rc_update = true, isba; struct ieee80211_tx_rate rates[4]; struct ath_frame_info *fi; int nframes; @@ -437,13 +438,17 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq, tidno = ieee80211_get_qos_ctl(hdr)[0] & IEEE80211_QOS_CTL_TID_MASK; tid = ATH_AN_2_TID(an, tidno); seq_first = tid->seq_start; + isba = ts->ts_flags & ATH9K_TX_BA; /* * The hardware occasi
pull request: wireless 2012-07-27
commit 28ea499ac5b90f6266a24b826c6d469fc503758c
Dave,
These fixes are intended for the 3.6 stream.
Hauke Mehrtens provides a pair of bcma fixes, one to fix a build
regression on mips and another to correct a pair of missing iounmap
calls.
Thomas Huehn offers a mac80211_hwsim fix to avoid a possible
use-after-free bug.
Please let me know if there are problems!
Thanks,
John
---
The following changes since commit 6ee127b7dd63afe4d6d0a58293786bf4bf336850:
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc (2012-07-26
18:14:11 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git for-davem
for you to fetch changes up to 28ea499ac5b90f6266a24b826c6d469fc503758c:
Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
(2012-07-27 11:15:03 -0400)
Hauke Mehrtens (2):
bcma: fix regression in interrupt assignment on mips
bcma: add missing iounmap on error path
John W. Linville (1):
Merge branch 'master' of git://git.kernel.org/.../linville/wireless into
for-davem
Thomas Huehn (1):
mac80211_hwsim: fix possible race condition in usage of info->control.sta
& control.vif
drivers/bcma/driver_mips.c|6 +++---
drivers/bcma/scan.c | 15 ++-
drivers/net/wireless/mac80211_hwsim.c |5 -
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/drivers/bcma/driver_mips.c b/drivers/bcma/driver_mips.c
index b013b04..cc65b45 100644
--- a/drivers/bcma/driver_mips.c
+++ b/drivers/bcma/driver_mips.c
@@ -131,7 +131,7 @@ static void bcma_core_mips_set_irq(struct bcma_device *dev,
unsigned int irq)
/* backplane irq line is in use, find out who uses
* it and set user to irq 0
*/
- list_for_each_entry_reverse(core, &bus->cores, list) {
+ list_for_each_entry(core, &bus->cores, list) {
if ((1 << bcma_core_mips_irqflag(core)) ==
oldirqflag) {
bcma_core_mips_set_irq(core, 0);
@@ -161,7 +161,7 @@ static void bcma_core_mips_dump_irq(struct bcma_bus *bus)
{
struct bcma_device *core;
- list_for_each_entry_reverse(core, &bus->cores, list) {
+ list_for_each_entry(core, &bus->cores, list) {
bcma_core_mips_print_irq(core, bcma_core_mips_irq(core));
}
}
@@ -224,7 +224,7 @@ void bcma_core_mips_init(struct bcma_drv_mips *mcore)
mcore->assigned_irqs = 1;
/* Assign IRQs to all cores on the bus */
- list_for_each_entry_reverse(core, &bus->cores, list) {
+ list_for_each_entry(core, &bus->cores, list) {
int mips_irq;
if (core->irq)
continue;
diff --git a/drivers/bcma/scan.c b/drivers/bcma/scan.c
index 5672b13..8d0b571 100644
--- a/drivers/bcma/scan.c
+++ b/drivers/bcma/scan.c
@@ -462,8 +462,10 @@ int bcma_bus_scan(struct bcma_bus *bus)
while (eromptr < eromend) {
struct bcma_device *other_core;
struct bcma_device *core = kzalloc(sizeof(*core), GFP_KERNEL);
- if (!core)
- return -ENOMEM;
+ if (!core) {
+ err = -ENOMEM;
+ goto out;
+ }
INIT_LIST_HEAD(&core->list);
core->bus = bus;
@@ -478,7 +480,7 @@ int bcma_bus_scan(struct bcma_bus *bus)
} else if (err == -ESPIPE) {
break;
}
- return err;
+ goto out;
}
core->core_index = core_num++;
@@ -494,10 +496,12 @@ int bcma_bus_scan(struct bcma_bus *bus)
list_add_tail(&core->list, &bus->cores);
}
+ err = 0;
+out:
if (bus->hosttype == BCMA_HOSTTYPE_SOC)
iounmap(eromptr);
- return 0;
+ return err;
}
int __init bcma_bus_scan_early(struct bcma_bus *bus,
@@ -537,7 +541,7 @@ int __init bcma_bus_scan_early(struct bcma_bus *bus,
else if (err == -ESPIPE)
break;
else if (err < 0)
- return err;
+ goto out;
core->core_index = core_num++;
bus->nr_cores++;
@@ -551,6 +555,7 @@ int __init bcma_bus_scan_early(struct bcma_bus *bus,
break;
}
+out:
if (bus->hosttype == BCMA_HOSTTYPE_SOC)
iounmap(eromptr);
diff --git a/drivers/net/wireless/mac80211_hwsim.c
b/dri
pull request: wireless 2012-09-22
commit 112df2417dc9a1db1b19930ea4d0a697a61e
Dave,
Please pull this last(?) batch of fixes intended for 3.6...
For the Bluetooth bits, Gustavo says this:
"Here goes probably my last update to 3.6. It includes the two patches
you were ok last week(from Andrzej Kaczmarek), those are critical
ones, and two other fixes one for a system crash and the other for
a missing lockdep annotation."
The referenced fixes from Andrzej prevent attempts to configure devices
that are powered-off.
Along with the Bluetooth fixes, there are a couple of 802.11 fixes.
Emmanuel Grumbach gives us an iwlwifi fix to prevent releasing an
interrupt twice. Luis R. Rodriguez provides a fix for a possible
circular lock dependency in the cfg80211 regulatory enforcement code.
All of these have been in linux-next for a few days. I hope they are
not too late to make the 3.6 release!
Thanks,
John
---
The following changes since commit abef3bd71029b80ec1bdd6c6244b5b0b99f56633:
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (2012-09-21
14:32:55 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git for-davem
for you to fetch changes up to 112df2417dc9a1db1b19930ea4d0a697a61e:
Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
(2012-09-22 12:19:22 -0400)
Andrei Emeltchenko (1):
Bluetooth: Fix freeing uninitialized delayed works
Andrzej Kaczmarek (2):
Bluetooth: mgmt: Fix enabling SSP while powered off
Bluetooth: mgmt: Fix enabling LE while powered off
Emmanuel Grumbach (1):
iwlwifi: don't double free the interrupt in failure path
John W. Linville (1):
Merge branch 'master' of git://git.kernel.org/.../linville/wireless into
for-davem
Luis R. Rodriguez (1):
cfg80211: fix possible circular lock on reg_regdb_search()
Vinicius Costa Gomes (1):
Bluetooth: Fix not removing power_off delayed work
drivers/net/wireless/iwlwifi/pcie/trans.c | 1 +
net/bluetooth/hci_core.c | 2 ++
net/bluetooth/l2cap_core.c| 2 +-
net/bluetooth/mgmt.c | 16
net/wireless/reg.c| 12 +---
5 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/drivers/net/wireless/iwlwifi/pcie/trans.c
b/drivers/net/wireless/iwlwifi/pcie/trans.c
index 1e86ea2..dbeebef 100644
--- a/drivers/net/wireless/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
@@ -1442,6 +1442,7 @@ static int iwl_trans_pcie_start_hw(struct iwl_trans
*trans)
return err;
err_free_irq:
+ trans_pcie->irq_requested = false;
free_irq(trans_pcie->irq, trans);
error:
iwl_free_isr_ict(trans);
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index d4de5db..0b997c8 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -734,6 +734,8 @@ static int hci_dev_do_close(struct hci_dev *hdev)
cancel_work_sync(&hdev->le_scan);
+ cancel_delayed_work(&hdev->power_off);
+
hci_req_cancel(hdev, ENODEV);
hci_req_lock(hdev);
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index 4ea1710..38c00f1 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -1008,7 +1008,7 @@ static void l2cap_send_disconn_req(struct l2cap_conn
*conn, struct l2cap_chan *c
if (!conn)
return;
- if (chan->mode == L2CAP_MODE_ERTM) {
+ if (chan->mode == L2CAP_MODE_ERTM && chan->state == BT_CONNECTED) {
__clear_retrans_timer(chan);
__clear_monitor_timer(chan);
__clear_ack_timer(chan);
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index ad6613d..eba022d 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -2875,6 +2875,22 @@ int mgmt_powered(struct hci_dev *hdev, u8 powered)
if (scan)
hci_send_cmd(hdev, HCI_OP_WRITE_SCAN_ENABLE, 1, &scan);
+ if (test_bit(HCI_SSP_ENABLED, &hdev->dev_flags)) {
+ u8 ssp = 1;
+
+ hci_send_cmd(hdev, HCI_OP_WRITE_SSP_MODE, 1, &ssp);
+ }
+
+ if (test_bit(HCI_LE_ENABLED, &hdev->dev_flags)) {
+ struct hci_cp_write_le_host_supported cp;
+
+ cp.le = 1;
+ cp.simul = !!(hdev->features[6] & LMP_SIMUL_LE_BR);
+
+ hci_send_cmd(hdev, HCI_OP_WRITE_LE_HOST_SUPPORTED,
+sizeof(cp), &cp);
+ }
+
update_class(hdev);
update_name(hdev, hdev->dev_name);
update_eir(hdev);
diff --git a/net/wireles
Re: pull request: bluetooth-next 2012-09-18
On Mon, Sep 24, 2012 at 03:46:22PM -0300, Gustavo Padovan wrote: > * Luis R. Rodriguez [2012-09-21 18:06:42 -0700]: > > > On Tue, Sep 18, 2012 at 6:31 PM, Gustavo Padovan > > wrote: > > > > > Johan Hedberg (2): > > > Bluetooth: mgmt: Implement support for passkey notification > > > > Too late now... but why did we allow this a stable fix? I get its a > > feature that is important and likely overlooked / someone had a brain > > fart, but from what I gather this is not on v3.5.4 and yet may make it > > to v3.5.5. At least for backporting this was a bitch: > Yes, this patch is wrongly marked as stable, it is not even going to 3.5. I'm > just removing the tag from it and resending the pull request to John. Hmmm...well, I already pulled it, and I just pushed it out. Can we live with it? John -- John W. LinvilleSomeday the world will need a hero, and you linvi...@tuxdriver.com might be all we have. Be ready. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
pull request: wireless 2012-10-26
commit 330ee00412bbaefa7d0597a1bed7804e818ba91c
Dave,
This is a batch of fixes intended for the 3.7 stream.
Bing Zhao brings two mwifiex fixes, both continuing to fix some scanning
failure cases.
Christian Lamparter provides an rtlwifi fix to properly propogate an
error code.
Felix Fietkau reverts a previous fix that was improperly reducing Tx
power for some devices. This one looks big, but it is mostly just
changes to a table of initialization values.
Larry Finger provides a b43 version of an earlier b43legacy fix to
avoid and oops when removing the modules after failing to load firmware.
Mohammed Shafi Shajakhan provides a new device ID for ath9k_htc.
Stanislaw Gruszka gives us an rt2x00 fix to avoide a WARNING during
resume, as described in kernel.org bug 48041.
Yuanhan Liu fixes a potential NULL dereference in brcmfmac.
Please let me know if there are problems!
Thanks,
John
---
The following changes since commit 3da3fff8006c608f19a51859d44ba47ca8b41461:
tilegx: fix some issues in the SW TSO support (2012-10-26 03:50:08 -0400)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git for-davem
for you to fetch changes up to 330ee00412bbaefa7d0597a1bed7804e818ba91c:
Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
(2012-10-26 10:32:13 -0400)
Bing Zhao (2):
mwifiex: return -EBUSY if specific scan request cannot be honored
mwifiex: clean up scan state on error
Christian Lamparter (1):
rtlwifi: pass rx setup error code to caller
Felix Fietkau (1):
Revert "ath9k_hw: Updated AR9003 tx gain table for 5GHz"
John W. Linville (1):
Merge branch 'master' of git://git.kernel.org/.../linville/wireless into
for-davem
Larry Finger (1):
b43: Fix oops on unload when firmware not found
Mohammed Shafi Shajakhan (1):
ath9k_htc: Add PID/VID for a Ubiquiti WiFiStation
Stanislaw Gruszka (1):
rt2x00: usb: fix reset resume
Yuanhan Liu (1):
brcmfmac: fix potential NULL dereference
.../net/wireless/ath/ath9k/ar9003_2p2_initvals.h | 164 ++---
drivers/net/wireless/ath/ath9k/hif_usb.c | 1 +
drivers/net/wireless/b43/main.c| 4 +
.../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 2 +-
drivers/net/wireless/mwifiex/cfg80211.c| 7 +-
drivers/net/wireless/mwifiex/scan.c| 13 +-
drivers/net/wireless/rt2x00/rt2500usb.c| 1 +
drivers/net/wireless/rt2x00/rt2800usb.c| 1 +
drivers/net/wireless/rt2x00/rt73usb.c | 1 +
drivers/net/wireless/rtlwifi/usb.c | 2 +-
10 files changed, 102 insertions(+), 94 deletions(-)
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
b/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
index 89bf94d..6f7cf49 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
+++ b/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
@@ -534,107 +534,107 @@ static const u32 ar9300_2p2_baseband_core[][2] = {
static const u32 ar9300Modes_high_power_tx_gain_table_2p2[][5] = {
/* Addr 5G_HT20 5G_HT40 2G_HT40 2G_HT20 */
- {0xa2dc, 0x000cfff0, 0x000cfff0, 0x03aaa352, 0x03aaa352},
- {0xa2e0, 0x000f, 0x000f, 0x03ccc584, 0x03ccc584},
- {0xa2e4, 0x03f0, 0x03f0, 0x03f0f800, 0x03f0f800},
+ {0xa2dc, 0x00033800, 0x00033800, 0x03aaa352, 0x03aaa352},
+ {0xa2e0, 0x0003c000, 0x0003c000, 0x03ccc584, 0x03ccc584},
+ {0xa2e4, 0x03fc, 0x03fc, 0x03f0f800, 0x03f0f800},
{0xa2e8, 0x, 0x, 0x03ff, 0x03ff},
{0xa410, 0x50d9, 0x50d9, 0x50d9, 0x50d9},
{0xa500, 0x, 0x, 0x, 0x},
{0xa504, 0x0603, 0x0603, 0x0402, 0x0402},
{0xa508, 0x0a20, 0x0a20, 0x0804, 0x0804},
{0xa50c, 0x1023, 0x1023, 0x0b000200, 0x0b000200},
- {0xa510, 0x1528, 0x1528, 0x0f000202, 0x0f000202},
- {0xa514, 0x1b2b, 0x1b2b, 0x12000400, 0x12000400},
- {0xa518, 0x1f020028, 0x1f020028, 0x16000402, 0x16000402},
- {0xa51c, 0x2502002b, 0x2502002b, 0x19000404, 0x19000404},
- {0xa520, 0x2a04002a, 0x2a04002a, 0x1c000603, 0x1c000603},
- {0xa524, 0x2e06002a, 0x2e06002a, 0x21000a02, 0x21000a02},
- {0xa528, 0x3302202d, 0x3302202d, 0x25000a04, 0x25000a04},
- {0xa52c, 0x3804202c, 0x3804202c, 0x28000a20, 0x28000a20},
- {0xa530, 0x3c06202c, 0x3c06202c, 0x2c000e20, 0x2c000e20},
- {0xa534, 0x4108202d, 0x4108202d, 0x3e22, 0x3e22},
- {0xa538, 0x4506402d, 0x4506402d, 0x34000e24, 0x34000e24},
- {0xa53c, 0x4906222d, 0x49
pull request: wireless 2013-10-03
Dave,
Here is another batch of fixes intended for the 3.12 stream...
For the mac80211 bits, Johannes says:
"This time I have two fixes for IBSS (including one for wext, hah), a fix
for extended rates IEs, an active monitor checking fix and a sysfs
registration race fix."
On top of those...
Amitkumar Karwar brings an mwifiex fix for an interrupt loss issue
w/ SDIO devices. The problem was due to a command timeout issue
introduced by an earlier patch.
Felix Fietkau a stall in the ath9k driver. This patch fixes the
regression introduced in the commit "ath9k: use software queues for
un-aggregated data packets".
Stanislaw Gruszka reverts an rt2x00 patch that was found to cause
connection problems with some devices.
Please let me know if there are problems!
John
---
The following changes since commit 569943d0639c85a451ea853087cbd5f738247dd9:
Merge branch 'mv643xx' (2013-10-02 17:11:50 -0400)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git for-davem
for you to fetch changes up to 1eea72f03a139146f341e450cf56934b2e01a4d3:
Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
(2013-10-03 16:00:03 -0400)
Amitkumar Karwar (1):
mwifiex: fix SDIO interrupt lost issue
Bruno Randolf (1):
cfg80211: fix warning when using WEXT for IBSS
Chun-Yeow Yeoh (1):
mac80211: fix the setting of extended supported rate IE
Felix Fietkau (2):
mac80211: drop spoofed packets in ad-hoc mode
ath9k: fix powersave response handling for BA session packets
Johannes Berg (1):
cfg80211: fix sysfs registration race
John W. Linville (2):
Merge branch 'for-john' of git://git.kernel.org/.../jberg/mac80211
Merge branch 'master' of git://git.kernel.org/.../linville/wireless into
for-davem
Luciano Coelho (1):
cfg80211: use the correct macro to check for active monitor support
Stanislaw Gruszka (1):
Revert "rt2x00pci: Use PCI MSIs whenever possible"
drivers/net/wireless/ath/ath9k/xmit.c | 9 ++---
drivers/net/wireless/mwifiex/main.c | 6 --
drivers/net/wireless/rt2x00/rt2x00pci.c | 9 +
net/mac80211/rx.c | 3 +++
net/mac80211/util.c | 5 +
net/wireless/core.c | 21 +
net/wireless/ibss.c | 3 +++
net/wireless/nl80211.c | 4 ++--
8 files changed, 33 insertions(+), 27 deletions(-)
diff --git a/drivers/net/wireless/ath/ath9k/xmit.c
b/drivers/net/wireless/ath/ath9k/xmit.c
index 5ac713d..dd30452 100644
--- a/drivers/net/wireless/ath/ath9k/xmit.c
+++ b/drivers/net/wireless/ath/ath9k/xmit.c
@@ -1969,15 +1969,18 @@ static void ath_tx_txqaddbuf(struct ath_softc *sc,
struct ath_txq *txq,
static void ath_tx_send_normal(struct ath_softc *sc, struct ath_txq *txq,
struct ath_atx_tid *tid, struct sk_buff *skb)
{
+ struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);
struct ath_frame_info *fi = get_frame_info(skb);
struct list_head bf_head;
- struct ath_buf *bf;
-
- bf = fi->bf;
+ struct ath_buf *bf = fi->bf;
INIT_LIST_HEAD(&bf_head);
list_add_tail(&bf->list, &bf_head);
bf->bf_state.bf_type = 0;
+ if (tid && (tx_info->flags & IEEE80211_TX_CTL_AMPDU)) {
+ bf->bf_state.bf_type = BUF_AMPDU;
+ ath_tx_addto_baw(sc, tid, bf);
+ }
bf->bf_next = NULL;
bf->bf_lastbf = bf;
diff --git a/drivers/net/wireless/mwifiex/main.c
b/drivers/net/wireless/mwifiex/main.c
index fd77833..c2b91f5 100644
--- a/drivers/net/wireless/mwifiex/main.c
+++ b/drivers/net/wireless/mwifiex/main.c
@@ -358,10 +358,12 @@ process_start:
}
} while (true);
- if ((adapter->int_status) || IS_CARD_RX_RCVD(adapter))
+ spin_lock_irqsave(&adapter->main_proc_lock, flags);
+ if ((adapter->int_status) || IS_CARD_RX_RCVD(adapter)) {
+ spin_unlock_irqrestore(&adapter->main_proc_lock, flags);
goto process_start;
+ }
- spin_lock_irqsave(&adapter->main_proc_lock, flags);
adapter->mwifiex_processing = false;
spin_unlock_irqrestore(&adapter->main_proc_lock, flags);
diff --git a/drivers/net/wireless/rt2x00/rt2x00pci.c
b/drivers/net/wireless/rt2x00/rt2x00pci.c
index 76d95de..dc49e52 100644
--- a/drivers/net/wireless/rt2x00/rt2x00pci.c
+++ b/drivers/net/wireless/rt2x00/rt2x00pci.c
@@ -105,13 +105,11 @@ int rt2x00pci_probe(struct pci_dev *pci_dev, const struct
rt2x00_ops *ops)
goto exit_release_regions;
}
- pci_enable_msi(pci_dev);
-
hw = ieee80211
Re: pull request: bluetooth-next 2013-10-03
On Thu, Oct 03, 2013 at 02:45:24PM -0300, Gustavo Padovan wrote: > Hi John, > > A series of patches for 3.12. The big work here is from Marcel and Johan. They > did a lot of work in the L2CAP, HCI and MGMT layers. The most important ones > are the addition of a new MGMT command to enable/disable LE advertisement and > the introduction of the HCI user channel to allow applications to get directly > and exclusive access to Bluetooth devices. > > Please pull, or let me know of any issues. Thanks! > > Gustavo > > -- > The following changes since commit f4e1a4d3ecbb9e42bdf8e7869ee8a4ebfa27fb20: > > rt2800: change initialization sequence to fix system freeze (2013-09-09 > 14:44:34 -0400) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next > for-upstream > > for you to fetch changes up to 4f3e219d95a3c31b916dcd5e2631c4e440736f79: > > Bluetooth: Only one command per L2CAP LE signalling is supported > (2013-10-03 16:09:59 +0300) Pulling now... -- John W. LinvilleSomeday the world will need a hero, and you linvi...@tuxdriver.com might be all we have. Be ready. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [Ksummit-2013-discuss] When to push bug fixes to mainline
On Thu, Jul 11, 2013 at 08:50:23PM -0400, Theodore Ts'o wrote: > In any case, I've been very conservative in _not_ pushing bug fixes to > Linus after -rc3 (unless they are fixing a regression or the bug fix > is super-serious); I'd much rather have them cook in the ext4 tree > where they can get a lot more testing (a full regression test run for > ext4 takes over 24 hours), and for people trying out linux-next. > > Maybe the pendulum has swung too far in the direction of holding back > changes and trying to avoid the risk of introducing regressions; > perhaps this would be a good topic to discuss at the Kernel Summit. Yes, there does seem to be a certain ebb and flow as to how strict the rules are about what should go into stable, what fixes are "good enough" for a given -rc, how tight those rule are in -rc2 vs in -rc6, etc. If nothing else, a good repetitive flogging and a restatement of the One True Way to handle these things might be worthwhile once again... John -- John W. LinvilleSomeday the world will need a hero, and you linvi...@tuxdriver.com might be all we have. Be ready. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: RTL8187SE staging Linux driver
On Tue, Sep 10, 2013 at 05:59:54PM +0200, Andrea Merello wrote: > Hello, > > As you probably know, in the current Linux kernel there is a staging > driver for the RTL8187SE device (based on my older RTL8180/RTL8185 > Linux driver), while there also a regular (not staging) driver > supporting older RTL8185 and RTL8180 devices > (net/wireless/rtl818x/rtl8180) . > > As far as I can see, the RTL8187SE device seems not so much different > from an RTL8185 device. > I would like to try (in my spare time) to add support for RTL8187SE > device in the current RTL818x driver, in order to avoid code > duplication, remove a driver from staging, and make RTL8187SE using > mac80211. > > Do any one of you have any comment/objection/suggestions about this ? I would be extremely happy for you to tackle this. > Is it possible to get the RTL8187SE documentation to make things easier? This info used to be readily available. If you can't find a source, I probably still have a (mildly useful) datasheet somewhere in my heap... > For now I will probably keep different RF code for the two cards even > if the RTL8225 (zebra 2) radio is used by both RTL8187SE and some > RTL8185 devices, however if I could get enough documentation about it, > it would be great to try to merge also RF code.. > > Thank you, > Andrea Seems reasonable... John -- John W. LinvilleSomeday the world will need a hero, and you linvi...@tuxdriver.com might be all we have. Be ready. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
pull request: wireless 2013-09-10
1200/hwbus.h
index 8b2fc83..51dfb3a 100644
--- a/drivers/net/wireless/cw1200/hwbus.h
+++ b/drivers/net/wireless/cw1200/hwbus.h
@@ -28,6 +28,7 @@ struct hwbus_ops {
void (*unlock)(struct hwbus_priv *self);
size_t (*align_size)(struct hwbus_priv *self, size_t size);
int (*power_mgmt)(struct hwbus_priv *self, bool suspend);
+ int (*irq_enable)(struct hwbus_priv *self, int enable);
};
#endif /* CW1200_HWBUS_H */
diff --git a/drivers/net/wireless/cw1200/hwio.c
b/drivers/net/wireless/cw1200/hwio.c
index ff230b7..41bd761 100644
--- a/drivers/net/wireless/cw1200/hwio.c
+++ b/drivers/net/wireless/cw1200/hwio.c
@@ -273,6 +273,21 @@ int __cw1200_irq_enable(struct cw1200_common *priv, int
enable)
u16 val16;
int ret;
+ /* We need to do this hack because the SPI layer can sleep on I/O
+ and the general path involves I/O to the device in interrupt
+ context.
+
+ However, the initial enable call needs to go to the hardware.
+
+ We don't worry about shutdown because we do a full reset which
+ clears the interrupt enabled bits.
+ */
+ if (priv->hwbus_ops->irq_enable) {
+ ret = priv->hwbus_ops->irq_enable(priv->hwbus_priv, enable);
+ if (ret || enable < 2)
+ return ret;
+ }
+
if (HIF_8601_SILICON == priv->hw_type) {
ret = __cw1200_reg_read_32(priv, ST90TDS_CONFIG_REG_ID, &val32);
if (ret < 0) {
diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c
b/drivers/net/wireless/rt2x00/rt2800lib.c
index 95e6e61..88ce656 100644
--- a/drivers/net/wireless/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
@@ -6659,19 +6659,20 @@ int rt2800_enable_radio(struct rt2x00_dev *rt2x00dev)
rt2800_init_registers(rt2x00dev)))
return -EIO;
+ if (unlikely(rt2800_wait_bbp_rf_ready(rt2x00dev)))
+ return -EIO;
+
/*
* Send signal to firmware during boot time.
*/
rt2800_register_write(rt2x00dev, H2M_BBP_AGENT, 0);
rt2800_register_write(rt2x00dev, H2M_MAILBOX_CSR, 0);
- if (rt2x00_is_usb(rt2x00dev)) {
+ if (rt2x00_is_usb(rt2x00dev))
rt2800_register_write(rt2x00dev, H2M_INT_SRC, 0);
- rt2800_mcu_request(rt2x00dev, MCU_BOOT_SIGNAL, 0, 0, 0);
- }
+ rt2800_mcu_request(rt2x00dev, MCU_BOOT_SIGNAL, 0, 0, 0);
msleep(1);
- if (unlikely(rt2800_wait_bbp_rf_ready(rt2x00dev) ||
-rt2800_wait_bbp_ready(rt2x00dev)))
+ if (unlikely(rt2800_wait_bbp_ready(rt2x00dev)))
return -EIO;
rt2800_init_bbp(rt2x00dev);
diff --git a/drivers/net/wireless/rtl818x/rtl8187/dev.c
b/drivers/net/wireless/rtl818x/rtl8187/dev.c
index 841fb9d..9a6edb0 100644
--- a/drivers/net/wireless/rtl818x/rtl8187/dev.c
+++ b/drivers/net/wireless/rtl818x/rtl8187/dev.c
@@ -438,17 +438,16 @@ static int rtl8187_init_urbs(struct ieee80211_hw *dev)
skb_queue_tail(&priv->rx_queue, skb);
usb_anchor_urb(entry, &priv->anchored);
ret = usb_submit_urb(entry, GFP_KERNEL);
+ usb_put_urb(entry);
if (ret) {
skb_unlink(skb, &priv->rx_queue);
usb_unanchor_urb(entry);
goto err;
}
- usb_free_urb(entry);
}
return ret;
err:
- usb_free_urb(entry);
kfree_skb(skb);
usb_kill_anchored_urbs(&priv->anchored);
return ret;
@@ -956,8 +955,12 @@ static int rtl8187_start(struct ieee80211_hw *dev)
(RETRY_COUNT << 8 /* short retry limit */) |
(RETRY_COUNT << 0 /* long retry limit */) |
(7 << 21 /* MAX TX DMA */));
- rtl8187_init_urbs(dev);
- rtl8187b_init_status_urb(dev);
+ ret = rtl8187_init_urbs(dev);
+ if (ret)
+ goto rtl8187_start_exit;
+ ret = rtl8187b_init_status_urb(dev);
+ if (ret)
+ usb_kill_anchored_urbs(&priv->anchored);
goto rtl8187_start_exit;
}
@@ -966,7 +969,9 @@ static int rtl8187_start(struct ieee80211_hw *dev)
rtl818x_iowrite32(priv, &priv->map->MAR[0], ~0);
rtl818x_iowrite32(priv, &priv->map->MAR[1], ~0);
- rtl8187_init_urbs(dev);
+ ret = rtl8187_init_urbs(dev);
+ if (ret)
+ goto rtl8187_start_exit;
reg = RTL818X_RX_CONF_ONLYERLPKT |
RTL818X_RX_CONF_RX_AUTORESETPHY |
--
John W. LinvilleSomeday the world will need a hero, and you
linvi...@tuxdriver.com might be all we have. Be ready.
pgphwunqIhaXx.pgp
Description: PGP signature
Re: [PATCH 06/11] bcma: convert bus code to use dev_groups
On Sun, Oct 06, 2013 at 11:55:45PM -0700, Greg Kroah-Hartman wrote:
> The dev_attrs field of struct bus_type is going away soon, dev_groups
> should be used instead. This converts the bcma bus code to use the
> correct field.
>
> Cc: Rafał Miłecki
> Cc:
> Signed-off-by: Greg Kroah-Hartman
> ---
>
> Rafał, I can take this through my driver-core tree if you like, just let
> me know what would be the easiest for you.
Makes sense to me...
>
> drivers/bcma/main.c | 23 ---
> 1 file changed, 16 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/bcma/main.c b/drivers/bcma/main.c
> index 90ee350..e15430a 100644
> --- a/drivers/bcma/main.c
> +++ b/drivers/bcma/main.c
> @@ -30,28 +30,37 @@ static ssize_t manuf_show(struct device *dev, struct
> device_attribute *attr, cha
> struct bcma_device *core = container_of(dev, struct bcma_device, dev);
> return sprintf(buf, "0x%03X\n", core->id.manuf);
> }
> +static DEVICE_ATTR_RO(manuf);
> +
> static ssize_t id_show(struct device *dev, struct device_attribute *attr,
> char *buf)
> {
> struct bcma_device *core = container_of(dev, struct bcma_device, dev);
> return sprintf(buf, "0x%03X\n", core->id.id);
> }
> +static DEVICE_ATTR_RO(id);
> +
> static ssize_t rev_show(struct device *dev, struct device_attribute *attr,
> char *buf)
> {
> struct bcma_device *core = container_of(dev, struct bcma_device, dev);
> return sprintf(buf, "0x%02X\n", core->id.rev);
> }
> +static DEVICE_ATTR_RO(rev);
> +
> static ssize_t class_show(struct device *dev, struct device_attribute *attr,
> char *buf)
> {
> struct bcma_device *core = container_of(dev, struct bcma_device, dev);
> return sprintf(buf, "0x%X\n", core->id.class);
> }
> -static struct device_attribute bcma_device_attrs[] = {
> - __ATTR_RO(manuf),
> - __ATTR_RO(id),
> - __ATTR_RO(rev),
> - __ATTR_RO(class),
> - __ATTR_NULL,
> +static DEVICE_ATTR_RO(class);
> +
> +static struct attribute *bcma_device_attrs[] = {
> + &dev_attr_manuf.attr,
> + &dev_attr_id.attr,
> + &dev_attr_rev.attr,
> + &dev_attr_class.attr,
> + NULL,
> };
> +ATTRIBUTE_GROUPS(bcma_device);
>
> static struct bus_type bcma_bus_type = {
> .name = "bcma",
> @@ -59,7 +68,7 @@ static struct bus_type bcma_bus_type = {
> .probe = bcma_device_probe,
> .remove = bcma_device_remove,
> .uevent = bcma_device_uevent,
> - .dev_attrs = bcma_device_attrs,
> + .dev_groups = bcma_device_groups,
> };
>
> static u16 bcma_cc_core_id(struct bcma_bus *bus)
> --
> 1.8.4.6.g82e253f.dirty
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majord...@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
>
--
John W. LinvilleSomeday the world will need a hero, and you
linvi...@tuxdriver.com might be all we have. Be ready.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
pull request: wireless 2013-10-09
Dave,
Please pull this batch of fixes intended for 3.12...
Most of the bits are for iwlwifi -- Johannes says:
"I have a fix for WoWLAN/D3, a PCIe device fix, we're removing a
warning, there's a fix for RF-kill while scanning (which goes together
with a mac80211 fix) and last but not least we have many new PCI IDs."
Also for iwlwifi is a patch from Johannes to correct some merge damage
that crept into the tree before the last merge window.
On top of that, Felix Fietkau sends an ath9k patch to avoid a Tx
scheduling hang when changing channels to do a scan.
Please let me know if there are problems!
Thanks,
John
---
The following changes since commit 9684d7b0dab3cf3a897edd85dca501d413888d56:
Merge branch 'sfc-3.12' of
git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc (2013-10-08 21:56:09
-0400)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git for-davem
for you to fetch changes up to b26082b9945a9aca85d51be37824f852617c7129:
Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
(2013-10-09 11:19:05 -0400)
Alexander Bondar (1):
iwlwifi: mvm: Disable uAPSD for D3 image
Emmanuel Grumbach (4):
iwlwifi: pcie: don't reset the TX queue counter
iwlwifi: don't WARN on host commands sent when firmware is dead
iwlwifi: pcie: add SKUs for 6000, 6005 and 6235 series
iwlwifi: mvm: call ieee80211_scan_completed when needed
Felix Fietkau (1):
ath9k: fix tx queue scheduling after channel changes
Johannes Berg (1):
iwlwifi: pcie: fix merge damage
John W. Linville (2):
Merge branch 'for-john' of git://git.kernel.org/.../iwlwifi/iwlwifi-fixes
Merge branch 'master' of git://git.kernel.org/.../linville/wireless into
for-davem
Matti Gottlieb (1):
iwlwifi: pcie: add new SKUs for 7000 & 3160 NIC series
drivers/net/wireless/ath/ath9k/main.c | 23 -
drivers/net/wireless/iwlwifi/iwl-6000.c | 6 +
drivers/net/wireless/iwlwifi/iwl-config.h | 1 +
drivers/net/wireless/iwlwifi/iwl-trans.h | 6 +++--
drivers/net/wireless/iwlwifi/mvm/power.c | 5 +++-
drivers/net/wireless/iwlwifi/mvm/scan.c | 12 -
drivers/net/wireless/iwlwifi/pcie/drv.c | 42 +++
drivers/net/wireless/iwlwifi/pcie/trans.c | 8 +++---
drivers/net/wireless/iwlwifi/pcie/tx.c| 2 ++
9 files changed, 85 insertions(+), 20 deletions(-)
diff --git a/drivers/net/wireless/ath/ath9k/main.c
b/drivers/net/wireless/ath/ath9k/main.c
index e4f6590..709301f 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -208,6 +208,7 @@ static bool ath_complete_reset(struct ath_softc *sc, bool
start)
struct ath_hw *ah = sc->sc_ah;
struct ath_common *common = ath9k_hw_common(ah);
unsigned long flags;
+ int i;
if (ath_startrecv(sc) != 0) {
ath_err(common, "Unable to restart recv logic\n");
@@ -235,6 +236,15 @@ static bool ath_complete_reset(struct ath_softc *sc, bool
start)
}
work:
ath_restart_work(sc);
+
+ for (i = 0; i < ATH9K_NUM_TX_QUEUES; i++) {
+ if (!ATH_TXQ_SETUP(sc, i))
+ continue;
+
+ spin_lock_bh(&sc->tx.txq[i].axq_lock);
+ ath_txq_schedule(sc, &sc->tx.txq[i]);
+ spin_unlock_bh(&sc->tx.txq[i].axq_lock);
+ }
}
ieee80211_wake_queues(sc->hw);
@@ -539,21 +549,10 @@ chip_reset:
static int ath_reset(struct ath_softc *sc)
{
- int i, r;
+ int r;
ath9k_ps_wakeup(sc);
-
r = ath_reset_internal(sc, NULL);
-
- for (i = 0; i < ATH9K_NUM_TX_QUEUES; i++) {
- if (!ATH_TXQ_SETUP(sc, i))
- continue;
-
- spin_lock_bh(&sc->tx.txq[i].axq_lock);
- ath_txq_schedule(sc, &sc->tx.txq[i]);
- spin_unlock_bh(&sc->tx.txq[i].axq_lock);
- }
-
ath9k_ps_restore(sc);
return r;
diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c
b/drivers/net/wireless/iwlwifi/iwl-6000.c
index 30d45e2..8ac305b 100644
--- a/drivers/net/wireless/iwlwifi/iwl-6000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-6000.c
@@ -240,6 +240,12 @@ const struct iwl_cfg iwl6035_2agn_cfg = {
.ht_params = &iwl6000_ht_params,
};
+const struct iwl_cfg iwl6035_2agn_sff_cfg = {
+ .name = "Intel(R) Centrino(R) Ultimate-N 6235 AGN",
+ IWL_DEVICE_6035,
+ .ht_params = &iwl6000_ht_params,
+};
+
const struct iwl_cfg iwl1030_bgn_cfg = {
.name = "Intel(R) Centrino(R) Wireless-N 1030 BGN",
Re: [PATCH] carl9170: fix leaks at failure path in carl9170_usb_probe()
On Sat, Sep 28, 2013 at 01:16:20AM -0400, Alexey Khoroshilov wrote:
> On 28.09.2013 00:17, Fabio Estevam wrote:
> >On Sat, Sep 28, 2013 at 12:51 AM, Alexey Khoroshilov
> > wrote:
> >
> >>- return request_firmware_nowait(THIS_MODULE, 1, CARL9170FW_NAME,
> >>+ err = request_firmware_nowait(THIS_MODULE, 1, CARL9170FW_NAME,
> >> &ar->udev->dev, GFP_KERNEL, ar,
> >> carl9170_usb_firmware_step2);
> >>+ if (err) {
> >>+ usb_put_dev(udev);
> >>+ usb_put_dev(udev);
> >You are doing the same free twice.
> Yes, because it was get twice.
> >I guess you meant to also free: usb_put_dev(ar->udev)
> udev and ar->udev are equal, so technically the patch is correct.
>
> I agree that there is some inconsistency, but I would prefer to fix
> it at usb_get_dev() side with a comment about reasons for the double
> get.
What is the reason for the double get?
--
John W. LinvilleSomeday the world will need a hero, and you
linvi...@tuxdriver.com might be all we have. Be ready.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: pull request: bluetooth 2013-09-23
On Mon, Sep 23, 2013 at 06:00:49PM -0300, Gustavo Padovan wrote: > Hi John, > > First Bluetooth fixes to 3.12, it includes: > > * 3 patches to add device id for 3 new hardwares. > > * 2 patches from Johan to fix the rfkill behaviour during setup stage > > * a small clean up in the rfcomm TTY code that fixes a potential racy > condition (by Gianluca Anzolin) > > * 2 fixes to proper set encryption key size and security level in the > peripheral role of Bluetooth LE devices. (by Andre Guedes) > > * a fix for dealing devices where pairing is not necessary, we were keeping > the Bluetooth ACL connection alive for too much time. (by Syam Sidhardhan) > > Please pull or let me know of any problems! Thanks! > > > Gustavo > > --- > The following changes since commit f4e1a4d3ecbb9e42bdf8e7869ee8a4ebfa27fb20: > > rt2800: change initialization sequence to fix system freeze (2013-09-09 > 14:44:34 -0400) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth master > > for you to fetch changes up to 5bcecf325378218a8e248bb6bcae96ec7362f8ef: > > Bluetooth: btusb: Add support for Belkin F8065bf (2013-09-23 17:44:25 -0300) Pulling now... -- John W. LinvilleSomeday the world will need a hero, and you linvi...@tuxdriver.com might be all we have. Be ready. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: pull request: bluetooth 2013-09-23
On Fri, Sep 27, 2013 at 12:24:13PM -0300, Gustavo Padovan wrote: > Hi John, > > 2013-09-26 John W. Linville : > > > On Mon, Sep 23, 2013 at 06:00:49PM -0300, Gustavo Padovan wrote: > > > The following changes since commit > > > f4e1a4d3ecbb9e42bdf8e7869ee8a4ebfa27fb20: > > > > > > rt2800: change initialization sequence to fix system freeze (2013-09-09 > > > 14:44:34 -0400) > > > > > > are available in the git repository at: > > > > > > git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth master > > > > > > for you to fetch changes up to 5bcecf325378218a8e248bb6bcae96ec7362f8ef: > > > > > > Bluetooth: btusb: Add support for Belkin F8065bf (2013-09-23 17:44:25 > > > -0300) > > > > Pulling now... > > Thanks for pulling. However as Stephen pointed out in the linux-next merge > conflict email from today we have a style issue, a closing brace bad indented. > This is from conflict resolution I made last week. I fixed it when merging > bluetooth.git into bluetooth-next.git. > > So when pushing this to Dave could you please tell him about this issue and > that the fix is already provided by bluetooth-next. Do you agree with this > solution? I fixed it in my merge for Dave -- I think that will be fine. John -- John W. LinvilleSomeday the world will need a hero, and you linvi...@tuxdriver.com might be all we have. Be ready. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
pull request: wireless 2013-09-27
Dave,
Please pull this batch of fixes intended for the 3.12 stream!
Regarding the Bluetooth bits, Gustavo says:
"First Bluetooth fixes to 3.12, it includes:
* 3 patches to add device id for 3 new hardwares.
* 2 patches from Johan to fix the rfkill behaviour during setup stage
* a small clean up in the rfcomm TTY code that fixes a potential racy
condition (by Gianluca Anzolin)
* 2 fixes to proper set encryption key size and security level in the
peripheral role of Bluetooth LE devices. (by Andre Guedes)
* a fix for dealing devices where pairing is not necessary, we were keeping
the Bluetooth ACL connection alive for too much time. (by Syam Sidhardhan)"
Also, I fixed-up an curly-brace indentation problem in the Bluetooth
code while merging. On top of that...
Alexey Khoroshilov brings a p54usb fix to avoid a resource leak when
request_firmware_nowait fails.
Amitkumar Karwar fixes a firmware hang caused by too much header data
being appended for USB devices using the mwifiex driver.
Arend van Spriel provides three fixes: a brcmfmac fix to relocate some
driver code outside of an .init section; a scheduling while atomic
fix for bcma; and, another scheduling while atomic fix for brcmsmac.
Bing Zhao offers a pair of mwifiex fixes: a code change to avoid
firmware timeouts on USB; and a fix for a NULL pointer dereference.
Christian Lamparter adds a device ID to p54usb.
Felix Fietkau implements a quartet of small ath9k fixes, including
a locking fix, a list management fix, a fix to properly mark a stale
buffer, and an aggregate buffering fix.
Larry Finger champions a data alignment fix to make rtlwifi work
better with ARM builds.
Solomon Peachy reverts an earlier interrupt handling fix for cw1200
and replaces it with a new threaded oneshot irq handler implementation.
Sujith Manoharan fixes an ath9k regression by reverting an earlier
patch.
Please let me know if there are problems!
John
---
The following changes since commit f875691640cd3fa67f7ad1d3130ff9fa7fdca042:
Merge branch 'fixes-for-3.12' of git://gitorious.org/linux-can/linux-can
(2013-09-27 02:08:03 -0400)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git for-davem
for you to fetch changes up to 0a878747e18d4d14c5b772dcd86bb4c26f8f:
Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
(2013-09-27 13:11:17 -0400)
Alexey Khoroshilov (1):
p54usb: fix leak at failure path in p54u_load_firmware()
Amitkumar Karwar (1):
mwifiex: fix hang issue for USB chipsets
Andre Guedes (2):
Bluetooth: Fix security level for peripheral role
Bluetooth: Fix encryption key size for peripheral role
Arend van Spriel (3):
brcmfmac: obtain platform data upon module initialization
bcma: make bcma_core_pci_{up,down}() callable from atomic context
brcmsmac: call bcma_core_pci_power_save() from non-atomic context
Bing Zhao (2):
mwifiex: fix PCIe hs_cfg cancel cmd timeout
mwifiex: fix NULL pointer dereference in usb suspend handler
Christian Lamparter (1):
p54usb: add USB ID for Corega WLUSB2GTST USB adapter
Felix Fietkau (4):
ath9k: fix stale flag handling on buffer clone
ath9k: do not link bf_next across multiple A-MPDUs
ath9k: don't use BAW tracking on PS responses for non-AMPDU packets
ath9k: add txq locking for ath_tx_aggr_start
Gianluca Anzolin (1):
Bluetooth: don't release the port in rfcomm_dev_state_change()
Johan Hedberg (2):
Bluetooth: Introduce a new HCI_RFKILLED flag
Bluetooth: Fix rfkill functionality during the HCI setup stage
John W. Linville (2):
Merge branch 'master' of git://git.kernel.org/.../bluetooth/bluetooth
Merge branch 'master' of git://git.kernel.org/.../linville/wireless into
for-davem
Ken O'Brien (1):
Bluetooth: btusb: Add support for Belkin F8065bf
Larry Finger (1):
rtlwifi: Align private space in rtl_priv struct
Peng Chen (1):
Bluetooth: Add a new PID/VID 0cf3/e005 for AR3012.
Raphael Kubo da Costa (1):
Bluetooth: Add support for BCM20702A0 [0b05, 17cb]
Solomon Peachy (2):
Revert "cw1200: Don't perform SPI transfers in interrupt context"
cw1200: Use a threaded oneshot irq handler for cw1200_spi
Sujith Manoharan (1):
ath9k: Fix regression in LNA diversity
Syam Sidhardhan (1):
Bluetooth: Fix ACL alive for long in case of non pariable devices
drivers/bcma/driver_pci.c | 49 --
drivers/bluetooth/ath3k.c | 2 +
drivers/bluetooth/btusb.c | 5 +++
drivers/net/wireless/ath/ath9k/recv.c | 7
drivers/net/wireless/ath/ath9k/xmit.c | 17 ++--
.../net/wireless/brcm
pull request: wireless 2012-09-07
commit 861ddac1c4d48b20c0df5c0f23504bf1dc9df8b4 Dave, Please pull these fixes intended for 3.6. There are more commits here than I would like -- I got a bit behind while I was stalking Steven Rostedt in San Diego last week... I'll slow it down after this! There are a couple of pulls here. One is from Johannes: "Please pull (according to the below information) to get a few fixes. * a fix to properly disconnect in the driver when authentication or association fails * a fix to prevent invalid information about mesh paths being reported to userspace * a memory leak fix in an nl80211 error path" The other comes via Gustavo: "A few updates for the 3.6 kernel. There are two btusb patches to add more supported devices through the new USB_VENDOR_AND_INTEFACE_INFO() macro and another one that add a new device id for a Sony Vaio laptop, one fix for a user-after-free and, finally, two patches from Vinicius to fix a issue in SMP pairing." Along with those... Arend van Spriel provides a fix for a use-after-free bug in brcmfmac. Daniel Drake avoids a hang by not trying to touch the libertas hardware duing suspend if it is already powered-down. Felix Fietkau provides a batch of ath9k fixes that adress some potential problems with power settings, as well as a fix to avoid a potential interrupt storm. Gertjan van Wingerde provides a register-width fix for rt2x00, and a rt2x00 fix to prevent incorrectly detecting the rfkill status. He also provides a device ID patch. Hante Meuleman gives us three brcmfmac fixes, one that properly initializes a command structure, one that fixes a race condition that could lose usb requests, and one that removes some log spam. Marc Kleine-Budde offers an rt2x00 fix for a voltage setting on some specific devices. Mohammed Shafi Shajakhan sent an ath9k fix to avoid a crash related to using timers that aren't allocated when 2 wire bluetooth coexistence hardware is in use. Sergei Poselenov changes rt2800usb to do some validity checking for received packets, avoiding crashes on an ARM Soc. Stone Piao gives us an mwifiex fix for an incorrectly set skb length value for a command buffer. All of these are localized to their specific drivers, and relatively small. The power-related patches from Felix are bigger than I would like, but I merged them in consideration of their isolation to ath9k and the sensitive nature of power settings in wireless devices. Please let me know if there are problems! Thanks, John --- The following changes since commit b8dfc6a0a7235aed452c0e376b6feff182a86992: |PATCH] seeq: Add missing spinlock init (2012-09-07 12:56:00 -0400) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git for-davem for you to fetch changes up to 861ddac1c4d48b20c0df5c0f23504bf1dc9df8b4: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem (2012-09-07 13:33:27 -0400) Andre Guedes (1): Bluetooth: Fix use-after-free bug in SMP Arend van Spriel (1): brcmfmac: fix use of dev_kfree_skb() in irq context Daniel Drake (1): libertas sdio: fix suspend when interface is down Eliad Peller (1): mac80211: clear bssid on auth/assoc failure Felix Fietkau (6): ath9k_hw: do not enable the MIB interrupt in the interrupt mask register ath9k_hw: clear the AM2PM predistortion mask on AR933x ath9k_hw: calibrate PA input for PA predistortion ath9k_hw: disable PA linearization for AR9462 ath9k: fix PA linearization calibration related crash ath9k_hw: enable PA linearization Gertjan van Wingerde (3): rt2x00: Identify ASUS USB-N53 device. rt2x00: Fix word size of rt2500usb MAC_CSR19 register. rt2x00: Fix rfkill polling prior to interface start. Gustavo Padovan (1): Bluetooth: Use USB_VENDOR_AND_INTERFACE() for Broadcom devices Hante Meuleman (3): brcmfmac: dont use ZERO flag for usb IN brcmfmac: fix race condition for rx and tx data. brcmfmac: fix get rssi by clearing getvar struct. Henrik Rydberg (1): Bluetooth: Add support for Apple vendor-specific devices John W. Linville (3): Merge branch 'master' of git://git.kernel.org/.../bluetooth/bluetooth Merge branch 'for-john' of git://git.kernel.org/.../jberg/mac80211 Merge branch 'master' of git://git.kernel.org/.../linville/wireless into for-davem LEO Airwarosu Yoichi Shinoda (1): mac80211: Various small fixes for cfg.c: mpath_set_pinfo() Marc Kleine-Budde (1): rt2x00: fix voltage setting for RT3572/RT3592 Mohammed Shafi Shajakhan (1): ath9k: Fix a crash in 2 WIRE btcoex chipsets Sergei Poselenov (1): rt2800usb: Added rx packet length validity check Stone Piao (1): mwifiex: fix skb length issue when send a command to fi
pull request: wireless 2012-10-09
->skbs);
return -1;
@@ -1393,7 +1393,7 @@ static bool ieee80211_tx(struct ieee80211_sub_if_data
*sdata,
res_prepare = ieee80211_tx_prepare(sdata, &tx, skb);
if (unlikely(res_prepare == TX_DROP)) {
- dev_kfree_skb(skb);
+ ieee80211_free_txskb(&local->hw, skb);
goto out;
} else if (unlikely(res_prepare == TX_QUEUED)) {
goto out;
@@ -1465,7 +1465,7 @@ void ieee80211_xmit(struct ieee80211_sub_if_data *sdata,
struct sk_buff *skb)
headroom = max_t(int, 0, headroom);
if (ieee80211_skb_resize(sdata, skb, headroom, may_encrypt)) {
- dev_kfree_skb(skb);
+ ieee80211_free_txskb(&local->hw, skb);
rcu_read_unlock();
return;
}
@@ -2050,8 +2050,10 @@ netdev_tx_t ieee80211_subif_start_xmit(struct sk_buff
*skb,
head_need += IEEE80211_ENCRYPT_HEADROOM;
head_need += local->tx_headroom;
head_need = max_t(int, 0, head_need);
- if (ieee80211_skb_resize(sdata, skb, head_need, true))
- goto fail;
+ if (ieee80211_skb_resize(sdata, skb, head_need, true)) {
+ ieee80211_free_txskb(&local->hw, skb);
+ return NETDEV_TX_OK;
+ }
}
if (encaps_data) {
@@ -2184,7 +2186,7 @@ void ieee80211_tx_pending(unsigned long data)
struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
if (WARN_ON(!info->control.vif)) {
- kfree_skb(skb);
+ ieee80211_free_txskb(&local->hw, skb);
continue;
}
--
John W. LinvilleSomeday the world will need a hero, and you
linvi...@tuxdriver.com might be all we have. Be ready.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
pull request: wireless 2012-11-30
commit 9f8933e960f98d27742727445061b0ece934e5cf
Dave,
I have a couple of stragglers intended for 3.7...
The iwlwifi patch fixes a bug in CCK basic rate calculations.
The mac80211 patch removes an unnecessary function call that was
generating a lot of log SPAM.
Please let me know if there are problems!
John
---
The following changes since commit e196c0e579902f42cf72414461fb034e5a1ffbf7:
bonding: fix race condition in bonding_store_slaves_active (2012-11-29
13:13:15 -0500)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git for-davem
for you to fetch changes up to 9f8933e960f98d27742727445061b0ece934e5cf:
Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
(2012-11-30 11:27:32 -0500)
Emmanuel Grumbach (1):
iwlwifi: fix the basic CCK rates calculation
Johannes Berg (1):
mac80211: fix remain-on-channel (non-)cancelling
John W. Linville (2):
Merge branch 'for-john' of git://git.kernel.org/.../iwlwifi/iwlwifi-fixes
Merge branch 'master' of git://git.kernel.org/.../linville/wireless into
for-davem
drivers/net/wireless/iwlwifi/dvm/rxon.c | 12 ++--
net/mac80211/offchannel.c | 2 --
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/drivers/net/wireless/iwlwifi/dvm/rxon.c
b/drivers/net/wireless/iwlwifi/dvm/rxon.c
index 1089639..2830ea2 100644
--- a/drivers/net/wireless/iwlwifi/dvm/rxon.c
+++ b/drivers/net/wireless/iwlwifi/dvm/rxon.c
@@ -1012,12 +1012,12 @@ static void iwl_calc_basic_rates(struct iwl_priv *priv,
* As a consequence, it's not as complicated as it sounds, just add
* any lower rates to the ACK rate bitmap.
*/
- if (IWL_RATE_11M_INDEX < lowest_present_ofdm)
- ofdm |= IWL_RATE_11M_MASK >> IWL_FIRST_CCK_RATE;
- if (IWL_RATE_5M_INDEX < lowest_present_ofdm)
- ofdm |= IWL_RATE_5M_MASK >> IWL_FIRST_CCK_RATE;
- if (IWL_RATE_2M_INDEX < lowest_present_ofdm)
- ofdm |= IWL_RATE_2M_MASK >> IWL_FIRST_CCK_RATE;
+ if (IWL_RATE_11M_INDEX < lowest_present_cck)
+ cck |= IWL_RATE_11M_MASK >> IWL_FIRST_CCK_RATE;
+ if (IWL_RATE_5M_INDEX < lowest_present_cck)
+ cck |= IWL_RATE_5M_MASK >> IWL_FIRST_CCK_RATE;
+ if (IWL_RATE_2M_INDEX < lowest_present_cck)
+ cck |= IWL_RATE_2M_MASK >> IWL_FIRST_CCK_RATE;
/* 1M already there or needed so always add */
cck |= IWL_RATE_1M_MASK >> IWL_FIRST_CCK_RATE;
diff --git a/net/mac80211/offchannel.c b/net/mac80211/offchannel.c
index 83608ac..2c84185 100644
--- a/net/mac80211/offchannel.c
+++ b/net/mac80211/offchannel.c
@@ -458,8 +458,6 @@ void ieee80211_roc_purge(struct ieee80211_sub_if_data
*sdata)
list_move_tail(&roc->list, &tmp_list);
roc->abort = true;
}
-
- ieee80211_start_next_roc(local);
mutex_unlock(&local->mtx);
list_for_each_entry_safe(roc, tmp, &tmp_list, list) {
--
John W. LinvilleSomeday the world will need a hero, and you
linvi...@tuxdriver.com might be all we have. Be ready.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: pull request: wireless 2012-11-30
On Fri, Nov 30, 2012 at 01:40:18PM -0500, David Miller wrote: > From: "John W. Linville" > Date: Fri, 30 Nov 2012 13:25:00 -0500 > > > I have a couple of stragglers intended for 3.7... > > > > The iwlwifi patch fixes a bug in CCK basic rate calculations. > > > > The mac80211 patch removes an unnecessary function call that was > > generating a lot of log SPAM. > > Pulled, thanks John. > > I want to warn you ahead of time that these might not make it. Yes, I suspect that might be the case -- but it won't make it if I don't send it... :-) John -- John W. LinvilleSomeday the world will need a hero, and you linvi...@tuxdriver.com might be all we have. Be ready. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: pull request: bluetooth-next 2012-12-03
On Mon, Dec 03, 2012 at 04:22:08PM -0200, Gustavo Padovan wrote: > Hi John, > > A few more patches to 3.8, I hope they can still make it to mainline! > The most important ones are the socket option for the SCO protocol to allow > accept/refuse new connections from userspace. Other than that I added some > fixes and Andrei did more AMP work. > > Please pull, or let me know any concerns you have. Thanks! > > Gustavo Pulled... > --- > The following changes since commit 2b2fec4d08a0aabe20d2e749cb7978f04217af65: > > Bluetooth: Remove OOB data if device was discovered in band (2012-11-20 > 16:03:15 -0200) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next > for-upstream > > for you to fetch changes up to 0b27a4b97cb1874503c78453c0903df53c0c86b2: > > Revert "Bluetooth: Fix possible deadlock in SCO code" (2012-12-03 16:00:04 > -0200) > > > Andrei Emeltchenko (6): > Bluetooth: Refactor l2cap_send_disconn_req > Bluetooth: AMP: Mark controller radio powered down after HCIDEVDOWN > Bluetooth: AMP: Check that AMP is present and active > Bluetooth: Fix missing L2CAP EWS Conf parameter > Bluetooth: Process receiving FCS_NONE in L2CAP Conf Rsp > Bluetooth: trivial: Change NO_FCS_RECV to RECV_NO_FCS > > Frédéric Dalleau (2): > Bluetooth: Add BT_DEFER_SETUP option to sco socket > Bluetooth: Implement deferred sco socket setup > > Gustavo Padovan (4): > Bluetooth: Add missing lock nesting notation > Bluetooth: cancel power_on work when unregistering the device > Bluetooth: Move double negation to macros > Revert "Bluetooth: Fix possible deadlock in SCO code" > > include/net/bluetooth/hci_core.h | 31 ++--- > include/net/bluetooth/l2cap.h| 2 +- > net/bluetooth/hci_core.c | 5 +++ > net/bluetooth/hci_event.c| 56 --- > net/bluetooth/l2cap_core.c | 100 > + > net/bluetooth/mgmt.c | 10 ++--- > net/bluetooth/rfcomm/sock.c | 4 +- > net/bluetooth/sco.c | 86 ++- > 8 files changed, 213 insertions(+), 81 deletions(-) -- John W. LinvilleSomeday the world will need a hero, and you linvi...@tuxdriver.com might be all we have. Be ready. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
pull request: wireless 2012-10-19
commit 06f40a41b80e25e88a2b612ea3b2a94f93c94f72
Dave,
This is a batch of fixes intended for the 3.7 stream.
Dan Carpenter brings a fix for a simple signedness bug that could
prevent the proper termination of a loop.
Felix Fietkau found a few more places that need to use
ieee80211_free_txskb for properly releasing SKBs used by mac80211.
Franky Lin offers a pair of brcmfmac fixes, both fixing simple state
reporting errors.
Hante Meuleman corrects an error reporting case that wasn't handling
all types of errors properly.
Johan Hedberg offers a fix for an issue discovered at the Bluetooth
UnPlug Fest. Gustavo says "the patch fixes a failure to pair with
devices that support the LE Secure Connections feature."
Johannes Berg sends an iwlwifi fix to handle a message type that
is too large for the normal command mechanism. He also provides a
mac80211 fix to use HT20 channels when HT40 channels are not permitted.
Jouni Malinen offers a mac80211 fix for a masking error that was
incorrectly marking some frames.
Piotr Haber provides a fix to make sure bcma devices are unregistered
properly.
Stanislav Yakovlev gives us a fix for a panic in the ipw2200 driver.
Stanislaw Gruszka sends a pair of fixes: one prevents a mismatch on
connection states between cfg80211 and mac80211; the other prevents
some frame corruption related to handling encryption.
Please let me know if there are problems!
Thanks,
John
---
The following changes since commit db0fe0b2f6bba2fda939737d063db2ae14c58d71:
Merge tag 'batman-adv-fix-for-davem' of git://git.open-mesh.org/linux-merge
(2012-10-18 15:36:59 -0400)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git for-davem
for you to fetch changes up to 06f40a41b80e25e88a2b612ea3b2a94f93c94f72:
Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
(2012-10-19 13:55:42 -0400)
Dan Carpenter (1):
brcmfmac: fix end of loop check (signedness bug)
Felix Fietkau (1):
mac80211: use ieee80211_free_txskb in a few more places
Franky Lin (2):
brcmfmac: use control channel in roamed status reporting
brcmfmac: set dongle mode accordingly when interface up
Hante Meuleman (1):
brcmfmac: handle all exceptions as an error.
Johan Hedberg (1):
Bluetooth: SMP: Fix setting unknown auth_req bits
Johannes Berg (3):
Merge remote-tracking branch 'wireless/master' into mac80211
iwlwifi: fix 6000 series channel switch command
mac80211: connect with HT20 if HT40 is not permitted
John W. Linville (3):
Merge branch 'master' of git://git.kernel.org/.../bluetooth/bluetooth
Merge branch 'for-john' of git://git.kernel.org/.../jberg/mac80211
Merge branch 'master' of git://git.kernel.org/.../linville/wireless into
for-davem
Jouni Malinen (1):
mac80211: Fix FC masking in BIP AAD generation
Piotr Haber (1):
bcma: fix unregistration of cores
Stanislav Yakovlev (1):
net/wireless: ipw2200: Fix panic occurring in ipw_handle_promiscuous_tx()
Stanislaw Gruszka (2):
cfg80211/mac80211: avoid state mishmash on deauth
mac80211: check if key has TKIP type before updating IV
drivers/bcma/main.c| 5 +-
drivers/net/wireless/brcm80211/brcmfmac/usb.c | 2 +-
.../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 68 --
drivers/net/wireless/ipw2x00/ipw2200.c | 2 +-
drivers/net/wireless/iwlwifi/dvm/devices.c | 39 -
include/net/cfg80211.h | 1 +
net/bluetooth/smp.c| 6 +-
net/mac80211/iface.c | 2 +-
net/mac80211/mlme.c| 35 +++
net/mac80211/sta_info.c| 4 +-
net/mac80211/util.c| 4 +-
net/mac80211/wpa.c | 14 +++--
net/wireless/mlme.c| 12 +---
13 files changed, 99 insertions(+), 95 deletions(-)
diff --git a/drivers/bcma/main.c b/drivers/bcma/main.c
index 432aeee..d865470 100644
--- a/drivers/bcma/main.c
+++ b/drivers/bcma/main.c
@@ -158,9 +158,10 @@ static int bcma_register_cores(struct bcma_bus *bus)
static void bcma_unregister_cores(struct bcma_bus *bus)
{
- struct bcma_device *core;
+ struct bcma_device *core, *tmp;
- list_for_each_entry(core, &bus->cores, list) {
+ list_for_each_entry_safe(core, tmp, &bus->cores, list) {
+ list_del(&core->list);
if (core->dev_registered)
device_unregister(&core->dev);
}
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/usb.c
b/drivers/net/wireless/brcm80
pull request: wireless-next 2012-11-14
NULL
Bluetooth: Move bt_accept_enqueue() to l2cap_sock.c
Bluetooth: Add chan->ops->defer()
Bluetooth: Rename __l2cap_connect() to l2cap_connect()
Hante Meuleman (6):
brcmfmac: refactor firmware interface layer.
brcmfmac: remove unused iswl variable.
brcmfmac: change testmode command to use new firmware interface layer
brcmfmac: remove redundant function brcmf_c_mkiovar_bsscfg
brcmfmac: clean usb download code.
brcmfmac: use fwil for default configuration setup.
Hauke Mehrtens (14):
bcma: just do the necessary things in early register on SoCs
bcma: init sprom struct earlier
bcma: mark pflash as present when available
bcma: add and use constants for the flash windows
bcma: mark nflash if it is the boot flash
bcma: extract drv_cc in bcma_core_mips_flash_detect()
bcma: add some more flash chips for serial flash
ssb: move parallel flash config into an own struct
ssb: add attribute to indicate a parallel flash is available
bcma: use fallback sprom if sprom on card was not valid
bcma: add an extra pcie core struct
bcma: do not initialize deactivated PCIe cores
ssb: add PCI ID 0x4350
ssb: handle BCM43222 in pmu code.
Hila Gonen (1):
cfg80211: add wrappers for registered_device_ops
Jefferson Delfes (1):
Bluetooth: Force the process of unpair command if disconnect failed
Johannes Berg (16):
iwlwifi: improve oversized command warning
iwlwifi: make data frame tracing optional
iwlwifi: remove unused variables
mac80211: check channel context methods
mac80211: track whether to use channel contexts
mac80211: use channel contexts
mac80211: track needed RX chains for channel contexts
mac80211: add channel context iterator
wireless: use OR operation to set wiphy features
mac80211: remove unimplemented mesh vendor sync
mac80211: remove some unused code
mac80211: use __printf attribute in debugfs
mac80211: fix WDS channel context test
cfg80211: add tracing for P2P Device start/stop
mac80211: use non-atomic bitmap operation for local variable
mac80211: complete bss_info tracing
John W. Linville (8):
Merge branch 'master' of git://git.kernel.org/.../bluetooth/bluetooth-next
Merge branch 'for-john' of git://git.kernel.org/.../jberg/mac80211-next
Merge branch 'for-john' of git://git.kernel.org/.../iwlwifi/iwlwifi-next
Merge branch 'master' of git://git.kernel.org/.../linville/wireless
Merge branch 'for-john' of git://git.kernel.org/.../jberg/mac80211-next
Merge tag 'nfc-next-3.8-1' of git://git.kernel.org/.../sameo/nfc-3.0
Merge branch 'master' of git://git.kernel.org/.../linville/wireless
Merge branch 'master' of git://git.kernel.org/.../linville/wireless-next
into for-davem
Jouni Malinen (4):
mac80211: Take status code as parameter to ieee80211_send_auth
mac80211: Add debug print on unexpect authentication state
cfg80211: Allow user space to specify non-IEs to SAE Authentication
mac80211: Allow station mode SAE to be implemented in user space
Kees Cook (3):
NFC: Remove CONFIG_EXPERIMENTAL
NFC: Remove CONFIG_EXPERIMENTAL from the LLCP Makefile
NFC: Remove CONFIG_EXPERIMENTAL from the NCI Makefile
Larry Finger (2):
rtlwifi: rtl8192c: rtl8192ce: Add support for B-CUT version of RTL8188CE
rtlwifi: rtl8192c: rtl8192ce: rtl8192cu: rtl8192se: rtl8192de: Shorten
some variable names
Mahesh Palivela (3):
ieee80211: Rename VHT cap struct
mac80211: VHT peer STA caps
{nl,cfg}80211: Peer STA VHT caps
Marco Porsch (2):
mac80211: fix copy-paste typo in Kconfig
mac80211: make client powersave independent of interface type
Mat Martineau (2):
Bluetooth: Process create response and connect response identically
Bluetooth: Factor out common L2CAP connection code
Michal Kazior (4):
mac80211: introduce channel context skeleton code
mac80211: introduce new ieee80211_ops
mac80211: use channel context notifications
mac80211: reuse channels for channel contexts
Mohammed Shafi Shajakhan (5):
mac80211: Use appropriate debug wrapper
ath9k: Ensure we set FTP_STOMP_LOW weight when WLAN is idle
ath9k_htc: Advertise interface combinations supported
ath9k_htc: Remove interface combination specific checks
ath9k: Advertize beacon_int_infra_match
Peter Senna Tschudin (1):
ath/ath9k/ar9003_eeprom.c: Remove semicolon after if
Pontus Fuchs (1):
ar5523: Add new driver
Rajkumar Manoharan (19):
ath9k: perform ANI cycle in idle state
ath9k: Send WLAN channel info to BT
ath9k: Add concurrent WLAN and BT tx support for MCI based chips
ath9k: fill channel mode in caldata
ath9k: adjust WLAN and B
Re: pull request: bluetooth 2012-11-09
On Sat, Nov 10, 2012 at 07:24:27PM +0100, Gustavo Padovan wrote: > Hi John, > > A few important fixes to go into 3.7. There is a new hw support by Marcos > Chaparro. Johan added a memory leak fix and hci device index list fix. > Also Marcel fixed a race condition in the device set up that was prevent the > bt monitor to work properly. Last, Paulo Sérgio added a fix to the error > status when pairing for LE fails. This was prevent userspace to work to handle > the failure properly. > > Please pull! or let me know of any issues. Thanks. > > Gustavo > > --- > The following changes since commit 6fe7cc71bbf3a0bc28c9cec3c00bc11e81344412: > > ath9k: Test for TID only in BlockAcks while checking tx status (2012-10-30 > 15:58:54 -0400) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth master Pulled... > for you to fetch changes up to 482049f75750d73358e65236b933417b69f9cc25: > > Bluetooth: Fix memory leak when removing a UUID (2012-11-09 16:45:37 +0100) > > > Johan Hedberg (2): > Bluetooth: Fix having bogus entries in mgmt_read_index_list reply > Bluetooth: Fix memory leak when removing a UUID > > Marcel Holtmann (1): > Bluetooth: Notify about device registration before power on > > Marcos Chaparro (1): > Bluetooth: ath3k: Add support for VAIO VPCEH [0489:e027] > > Paulo Sérgio (1): > Bluetooth: Fix error status when pairing fails > > drivers/bluetooth/ath3k.c | 1 + > drivers/bluetooth/btusb.c | 1 + > net/bluetooth/hci_core.c | 4 ++-- > net/bluetooth/mgmt.c | 12 +++- > net/bluetooth/smp.c | 2 +- > 5 files changed, 12 insertions(+), 8 deletions(-) > -- John W. LinvilleSomeday the world will need a hero, and you linvi...@tuxdriver.com might be all we have. Be ready. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: pull request: bluetooth-next 2012-11-01
etooth/amp.h |4 + > include/net/bluetooth/hci.h |7 + > include/net/bluetooth/hci_core.h | 44 +- > include/net/bluetooth/l2cap.h| 38 +- > net/bluetooth/Kconfig|1 - > net/bluetooth/a2mp.c |4 +- > net/bluetooth/amp.c | 93 > net/bluetooth/bnep/netdev.c |1 - > net/bluetooth/cmtp/capi.c|2 +- > net/bluetooth/cmtp/sock.c|2 +- > net/bluetooth/hci_conn.c |6 + > net/bluetooth/hci_core.c | 65 +-- > net/bluetooth/hci_event.c| 309 +++-- > net/bluetooth/l2cap_core.c | 1000 > +--- > net/bluetooth/l2cap_sock.c |5 + > net/bluetooth/mgmt.c | 98 ++-- > 16 files changed, 1486 insertions(+), 193 deletions(-) -- John W. LinvilleSomeday the world will need a hero, and you linvi...@tuxdriver.com might be all we have. Be ready. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
pull request: wireless 2013-01-04
Dave, This is a batch of fixes intended for 3.8. Arend "fixes" a copyright notice in brcmsmac -- seems harmless. Christian Lamparter adds a device ID to p54usb, and changes the interface combinations reported by carl9170 in order to get it working again. Geert Uytterhoeven gives us a pair of fixes for Kconfig warnings about bcma and ssb. Hante Meuleman fixes some IE parsing to get AP mode working with WPA2 security. Jesper Juhl fixes a urb leak in rtlwifi. Jussi Kivilinna fixes some mis-usage of usb_alloc_coherent in rtlwifi, avoiding a BUG on ARM. Larry Finger provides a handful of rtlwifi fixes to avoid some log SPAM due to not checking the return of pci_map_single. Niels Ole Salscheider changes a usleep_range in brcmsmac to use udelay instead, avoiding a "BUG: scheduling while atomic". Rafał Miłecki fixes an ID for a serial flash in the bcma code. Sujith Manoharan provides a pair of ath9k fixes, one for a compilation break and one to correct some gain-related initvals. Tomasz Guszkowski adds a device ID to p54usb. Vladimir Kondratiev fixes a Kconfig problem which cause ath9k_htc not to build properly. Please let me know if there are problems! Thanks, John --- The following changes since commit fdb184d1467f9ed5b17c553b85eb1bb72bdbf62f: bridge: add empty br_mdb_init() and br_mdb_uninit() definitions. (2013-01-03 03:35:22 -0800) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git for-davem for you to fetch changes up to 7b87e573413c3d6a006f572fb4d2105ff5d97fda: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem (2013-01-04 15:22:52 -0500) Arend van Spriel (1): brcmsmac: add copyright information for Canonical Christian Lamparter (2): carl9170: fix -EINVAL bailout during init with !CONFIG_MAC80211_MESH p54usb: add USBIDs for two more p54usb devices Geert Uytterhoeven (2): bcma: BCMA_DRIVER_GPIO should depend on GPIOLIB instead of selecting it ssb: SSB_DRIVER_GPIO should depend on GPIOLIB instead of selecting it Hante Meuleman (1): brcmfmac: fix parsing rsn ie for ap mode. Jesper Juhl (1): rtlwifi: Don't leak on error in _rtl_usb_receive() John W. Linville (1): Merge branch 'master' of git://git.kernel.org/.../linville/wireless into for-davem Jussi Kivilinna (1): rtlwifi: fix incorrect use of usb_alloc_coherent with usb_control_msg Larry Finger (5): rtlwifi: Fix warning for unchecked pci_map_single() call rtlwifi: rtl8192ce: Fix warning for unchecked pci_map_single() call rtlwifi: rtl8192de: Fix warning for unchecked pci_map_single() call rtlwifi: rtl8192se: Fix warning for unchecked pci_map_single() call rtlwifi: rtl8723ae: Fix warning for unchecked pci_map_single() call Niels Ole Salscheider (1): brcmsmac: Use udelay instead of usleep_range Rafał Miłecki (1): bcma: correct M25P32 serial flash ID Sujith Manoharan (2): ath9k: Fix compilation breakage ath9k_hw: Fix RX gain initvals for AR9485 Tomasz Guszkowski (1): p54usb: add USB ID for T-Com Sinus 154 data II Vladimir Kondratiev (1): ath9k: Fix Kconfig for ATH9K_HTC drivers/bcma/Kconfig | 3 +-- drivers/bcma/driver_chipcommon_sflash.c | 2 +- drivers/net/wireless/ath/ath9k/Kconfig| 5 +++-- drivers/net/wireless/ath/ath9k/ar9003_hw.c| 2 +- drivers/net/wireless/ath/carl9170/fw.c| 6 +- drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 5 +++-- drivers/net/wireless/brcm80211/brcmsmac/debug.h | 1 + drivers/net/wireless/brcm80211/brcmsmac/phy/phy_lcn.c | 4 ++-- drivers/net/wireless/p54/p54usb.c | 4 drivers/net/wireless/rtlwifi/pci.c| 6 ++ drivers/net/wireless/rtlwifi/rtl8192ce/trx.c | 11 +++ drivers/net/wireless/rtlwifi/rtl8192de/trx.c | 10 ++ drivers/net/wireless/rtlwifi/rtl8192se/trx.c | 13 - drivers/net/wireless/rtlwifi/rtl8723ae/trx.c | 10 ++ drivers/net/wireless/rtlwifi/usb.c| 8 drivers/ssb/Kconfig | 3 +-- 16 files changed, 75 insertions(+), 18 deletions(-) diff --git a/drivers/bcma/Kconfig b/drivers/bcma/Kconfig index d7b56a8..8b4221c 100644 --- a/drivers/bcma/Kconfig +++ b/drivers/bcma/Kconfig @@ -67,8 +67,7 @@ config BCMA_DRIVER_GMAC_CMN config BCMA_DRIVER_GPIO bool "BCMA GPIO driver" - depends on BCMA - select GPIOLIB + depends on BCMA && GPIOLIB help Driver to provide access to the GPIO pins of the bcma bus. diff --git a/drivers/bcma/driver_chipcommon_sflash.c b/drivers/bcma/driver_chipc
pull request: wireless 2012-12-19
Dave, Please pull these fixes for the 3.8 stream. Gabor Juhos provides and rt2x00 fix to properly clear-out the skb->cb for reporting tx_status. Recent changes made this necessary where it previously was not. Vladimir Kondratiev gives us a fix for a build issue that caused some ath9k devices to be skipped in the build based on unrelated config choices. Please let me know if there are problems! Thanks, John --- The following changes since commit c1e37ea287979052e3eab441e58da3899a8e2389: net: fec: forbid FEC_PTP on SoCs that do not support (2012-12-18 16:26:18 -0800) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git for-davem for you to fetch changes up to d67df2b9edfc42ccc0a9ee5332e2821d487d6b3b: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem (2012-12-19 13:00:00 -0500) Gabor Juhos (1): rt2x00: zero-out rx_status John W. Linville (1): Merge branch 'master' of git://git.kernel.org/.../linville/wireless into for-davem Vladimir Kondratiev (1): wireless: fix Atheros drivers compilation drivers/net/wireless/Makefile | 2 +- drivers/net/wireless/rt2x00/rt2x00dev.c | 8 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile index 062dfdf..67156ef 100644 --- a/drivers/net/wireless/Makefile +++ b/drivers/net/wireless/Makefile @@ -47,7 +47,7 @@ obj-$(CONFIG_RT2X00) += rt2x00/ obj-$(CONFIG_P54_COMMON) += p54/ -obj-$(CONFIG_ATH_COMMON) += ath/ +obj-$(CONFIG_ATH_CARDS)+= ath/ obj-$(CONFIG_MAC80211_HWSIM) += mac80211_hwsim.o diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c index 4ffb6a5..44f8b3f 100644 --- a/drivers/net/wireless/rt2x00/rt2x00dev.c +++ b/drivers/net/wireless/rt2x00/rt2x00dev.c @@ -685,6 +685,14 @@ void rt2x00lib_rxdone(struct queue_entry *entry, gfp_t gfp) * to mac80211. */ rx_status = IEEE80211_SKB_RXCB(entry->skb); + + /* Ensure that all fields of rx_status are initialized +* properly. The skb->cb array was used for driver +* specific informations, so rx_status might contain +* garbage. +*/ + memset(rx_status, 0, sizeof(*rx_status)); + rx_status->mactime = rxdesc.timestamp; rx_status->band = rt2x00dev->curr_band; rx_status->freq = rt2x00dev->curr_freq; -- John W. LinvilleSomeday the world will need a hero, and you linvi...@tuxdriver.com might be all we have. Be ready. pgp1m5rFzEYaL.pgp Description: PGP signature
pull request: wireless 2012-11-16
commit 26c6e80892d8c160dffaba85889bd4e65b1dacf6
Dave,
This batch of fixes is intended for the 3.7 stream...
This includes a pull of the Bluetooth tree. Gustavo says:
"A few important fixes to go into 3.7. There is a new hw support by Marcos
Chaparro. Johan added a memory leak fix and hci device index list fix.
Also Marcel fixed a race condition in the device set up that was prevent the
bt monitor to work properly. Last, Paulo Sérgio added a fix to the error
status when pairing for LE fails. This was prevent userspace to work to handle
the failure properly."
Regarding the mac80211 pull, Johannes says:
"I have a locking fix for some SKB queues, a variable initialization to
avoid crashes in a certain failure case, another free_txskb fix from
Felix and another fix from him to avoid calling a stopped driver, a fix
for a (very unlikely) memory leak and a fix to not send null data
packets when resuming while not associated."
Regarding the iwlwifi pull, Johannes says:
"Two more fixes for iwlwifi ... one to use ieee80211_free_txskb(), and
one to check DMA mapping errors, please pull."
On top of that, Johannes also included a wireless regulatory fix
to allow 40 MHz on channels 12 and 13 in world roaming mode. Also,
Hauke Mehrtens fixes a #ifdef typo in brcmfmac.
Please let me know if there are problems!
Thanks,
John
---
The following changes since commit 6fc4adca6ce3e1d57a42707019dddcb883578a91:
tilegx: request_irq with a non-null device name (2012-11-16 01:40:41 -0500)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git for-davem
for you to fetch changes up to 26c6e80892d8c160dffaba85889bd4e65b1dacf6:
Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
(2012-11-16 12:59:13 -0500)
Arik Nemtsov (1):
mac80211: sync acccess to tx_filtered/ps_tx_buf queues
David Spinadel (1):
mac80211: init sched_scan_ies
Felix Fietkau (2):
mac80211: do not call ieee80211_configure_filter if no interfaces are up
mac80211: call skb_dequeue/ieee80211_free_txskb instead of
__skb_queue_purge
Hauke Mehrtens (1):
brcmfmac: fix typo in CONFIG_BRCMISCAN
Johan Hedberg (2):
Bluetooth: Fix having bogus entries in mgmt_read_index_list reply
Bluetooth: Fix memory leak when removing a UUID
Johannes Berg (5):
iwlwifi: handle DMA mapping failures
iwlwifi: use ieee80211_free_txskb
mac80211: fix memory leak in device registration error path
mac80211: don't send null data packet when not associated
wireless: allow 40 MHz on world roaming channels 12/13
John W. Linville (4):
Merge branch 'for-john' of git://git.kernel.org/.../jberg/mac80211
Merge branch 'for-john' of git://git.kernel.org/.../iwlwifi/iwlwifi-fixes
Merge branch 'master' of git://git.kernel.org/.../bluetooth/bluetooth
Merge branch 'master' of git://git.kernel.org/.../linville/wireless into
for-davem
Marcel Holtmann (1):
Bluetooth: Notify about device registration before power on
Marcos Chaparro (1):
Bluetooth: ath3k: Add support for VAIO VPCEH [0489:e027]
Paulo Sérgio (1):
Bluetooth: Fix error status when pairing fails
drivers/bluetooth/ath3k.c | 1 +
drivers/bluetooth/btusb.c | 1 +
.../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 2 +-
drivers/net/wireless/iwlwifi/dvm/mac80211.c| 2 +-
drivers/net/wireless/iwlwifi/dvm/main.c| 2 +-
drivers/net/wireless/iwlwifi/pcie/rx.c | 23 --
net/bluetooth/hci_core.c | 4 ++--
net/bluetooth/mgmt.c | 12 ++-
net/bluetooth/smp.c| 2 +-
net/mac80211/cfg.c | 3 +++
net/mac80211/ieee80211_i.h | 2 ++
net/mac80211/main.c| 6 --
net/mac80211/scan.c| 2 +-
net/mac80211/sta_info.c| 11 ---
net/mac80211/status.c | 9 +
net/mac80211/tx.c | 9 ++---
net/mac80211/util.c| 2 ++
net/wireless/reg.c | 5 ++---
18 files changed, 73 insertions(+), 25 deletions(-)
diff --git a/drivers/bluetooth/ath3k.c b/drivers/bluetooth/ath3k.c
index fc2de55..b0e 100644
--- a/drivers/bluetooth/ath3k.c
+++ b/drivers/bluetooth/ath3k.c
@@ -67,6 +67,7 @@ static struct usb_device_id ath3k_table[] = {
{ USB_DEVICE(0x13d3, 0x3304) },
{ USB_DEVICE(0x0930, 0x0215) },
{ USB_DEVICE(0x0489, 0xE03D) },
+ { USB_DEVICE(0x0489, 0xE027) },
pull request: wireless 2013-04-19
Dave, A few stragglers hoping for 3.9, somewhat delayed due to my travels... On the mac80211 bits, Johannes says: "Sadly, I have another pull request -- the idle handling fix broke LED handling in some cases." and: "Yet one more! This fixes a fairly important/annoying bug -- when roaming between multiple APs of the same network, the system could get stuck thinking it was connected to the old one while it really wasn't." On top of that... Arend sends a brcmfmac patch that removes advertising a feature that isn't actually fully supported, and a brcmsmac patch that rearranges code to request firmware at IFF_UP to play more nicely with being built into the kernel. Felix gives us a minor ath9k_htc fix to support the newly released open source firmware, and an ath9k_hw initvals fix to improve device stability. Rafał Miłecki provides a fix for an ssb regression that caused a serious performance problem with b43. Zefir Kurtisi offers an ath9k fix to change some kmalloc flags to allow the DFS detector to be called in softirq context. Please let me know if there are problems. If these don't make 3.9, I'll just pull them into wireless-next -- just let me know if you want to do it that way! John --- The following changes since commit ea2f2fa143ead1a9bf5ce87a3abe403694fe6d78: Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch (2013-04-18 00:20:57 -0400) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git for-davem for you to fetch changes up to 5a22483e5a2109cf678580d2bf769b0e69966a24: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem (2013-04-18 15:01:30 -0400) Arend van Spriel (2): brcmfmac: remove advertising P2P device support brcmsmac: request firmware in .start() callback Felix Fietkau (2): ath9k_htc: accept 1.x firmware newer than 1.3 ath9k_hw: change AR9580 initvals to fix a stability issue Johannes Berg (2): mac80211: fix LED in idle handling mac80211: fix cfg80211 interaction on auth/assoc request John W. Linville (3): Merge branch 'for-john' of git://git.kernel.org/.../jberg/mac80211 Merge branch 'for-john' of git://x-git.kernel.org/.../jberg/mac80211 Merge branch 'master' of git://git.kernel.org/.../linville/wireless into for-davem Rafał Miłecki (1): ssb: implement spurious tone avoidance Zefir Kurtisi (1): ath9k: fix DFS detector called in softirq context .../net/wireless/ath/ath9k/ar9580_1p0_initvals.h | 2 +- .../net/wireless/ath/ath9k/dfs_pattern_detector.c | 4 +- drivers/net/wireless/ath/ath9k/dfs_pri_detector.c | 4 +- drivers/net/wireless/ath/ath9k/htc_drv_init.c | 2 +- drivers/net/wireless/b43/phy_n.c | 3 +- .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 7 +- .../net/wireless/brcm80211/brcmsmac/mac80211_if.c | 264 ++--- drivers/ssb/driver_chipcommon_pmu.c| 29 +++ include/linux/ssb/ssb_driver_chipcommon.h | 2 + net/mac80211/iface.c | 27 ++- net/mac80211/mlme.c | 24 +- 11 files changed, 211 insertions(+), 157 deletions(-) -- John W. LinvilleSomeday the world will need a hero, and you linvi...@tuxdriver.com might be all we have. Be ready. pgpj1nPPAO95X.pgp Description: PGP signature
Re: pull request: bluetooth-next 2013-04-18
On Thu, Apr 18, 2013 at 01:48:36AM -0300, Gustavo Padovan wrote: > Hi John, > > A set of changes intended for 3.10. The biggest changes here are from David > Herrmann, he rewrote most of the HIDP layer making it more reliable. Marcel > added a driver setup stage for device that need special handling on their > early initialization. Other than that we have the usual clean ups, bugfixes > and small improvements. > > Please pull or let me know of any problems! Thanks! > > Gustavo > > --- > The following changes since commit 84bcc0c3c4b8ca4c0abed2d2dd63b7ce04f8be0e: > > brcmfmac: enable sk_buff queueing when credits deplete (2013-04-03 15:07:09 > -0400) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next > for-upstream > > for you to fetch changes up to 76a388beaf92cc75b829d4a0b7d69afaaeaa4b0a: > > Bluetooth: Rename LE_SCANNING_* macros (2013-04-18 01:17:27 -0300) Pulling now... -- John W. LinvilleSomeday the world will need a hero, and you linvi...@tuxdriver.com might be all we have. Be ready. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: pull request: wireless 2013-06-06
On Tue, Jun 11, 2013 at 10:27:06PM -0700, David Miller wrote: > From: "John W. Linville" > Date: Thu, 6 Jun 2013 15:09:30 -0400 > > > Johannes Berg (2): > > mac80211: constify ieee802_11_parse_elems() argument > > Such cleanups are absolutely, positively, not appropriate at this > time. > > Sorry. > > I still can't pull this. OK, a respin is coming. Note to my feeder trees, another rebase is coming... John -- John W. LinvilleSomeday the world will need a hero, and you linvi...@tuxdriver.com might be all we have. Be ready. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
pull request: wireless 2013-06-12
Dave, For now I have dropped the mac80211 tree from this request. We are developing a little backlog of fixes and I would like to avoid introducing any more uncertainty to this pull request for the 3.10 stream. All the other bits are the same as what was in the 2013-06-06 request, including the ath9k fixes intended to address the problems observed by Linus w/ his Pixel, and a CVE fix for a potential security issue in the b43 driver. Regarding the wl12xx bits, Luca says: "Here are three patches that I'd like to get into 3.10. Two of them, by me, are related to the firmware version checks in our driver. Without them, the firmwares fail to load. The other one, by Eliad, fixes a typo bug in our 5GHz scanning code." And as for the Bluetooth bits, Gustavo says: "The following patches are important bug fixes for 3.10, plus the support for a new device. We do have three fixes from Johan. The first one is a fix to avoid LE-only devices to rely on the (inexistent) extended features data. The second patch fixes length checks on incoming L2CAP signalling PDUs so we can discard PDU whose size doesn't match the one reported in the header. The last one fixes the handling of power on failures, we now report proper errors to mgmt when hci_dev_open()." Along with that... Larry Finger corrects an rtlwifi problem that caused some devices to refuse to connect to non-WPA2 networks if the device had previously assocated with a WPA2 network. He also adds a one-line fix to prevent false reports from kmemleak. Mark A. Greer fixes an out of bounds array access in mwifiex. Felix Fietkau reverts an earlier ath9k initval patch that reduced rx sensitivity in a number of ath9k devices with no corresponding benefit. Kees Cook fixes a potential uid-0 to ring-0 escalation in b43 (CVE-2013-2852). Sujith Manoharan turns-off powersave mode by default for ath9k, and also defaults ath9k to use the minstrel_ht rate control algorithm. Both of these are believed to contribute to greater stability/usability of ath9k in real-world situations. Yijing Wang fixes an iwlegacy build error for il_pm_ops if CONFIG_PM is set but CONFIG_PM_SLEEP is not set. Please let me know if there are any problems! Thanks, John --- The following changes since commit b79462a8b9f9a452edc20c64a70a89ba3b0a6a88: team: fix checks in team_get_first_port_txable_rcu() (2013-06-12 00:56:27 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git for-davem for you to fetch changes up to 42d887a68013b0a04f7b8ebfa4999a8d5df6775c: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem (2013-06-12 10:57:04 -0400) Bing Zhao (1): Bluetooth: btmrvl: support Marvell Bluetooth device SD8897 Eliad Peller (1): wl12xx/wl18xx: scan all 5ghz channels Felix Fietkau (1): Revert "ath9k_hw: Update rx gain initval to improve rx sensitivity" Johan Hedberg (3): Bluetooth: Fix checks for LE support on LE-only controllers Bluetooth: Fix missing length checks for L2CAP signalling PDUs Bluetooth: Fix mgmt handling of power on failures John W. Linville (1): Merge branch 'master' of git://git.kernel.org/.../linville/wireless into for-davem Kees Cook (1): b43: stop format string leaking into error msgs Larry Finger (2): rtlwifi: rtl8192cu: Fix problem in connecting to WEP or WPA(1) networks rtlwifi: Fix a false leak indication for PCI devices Luciano Coelho (2): wl12xx: fix minimum required firmware version for wl127x multirole wl12xx: increase minimum singlerole firmware version required Mark A. Greer (1): mwifiex: debugfs: Fix out of bounds array access Sujith Manoharan (2): ath9k: Disable PowerSave by default ath9k: Use minstrel rate control by default Yijing Wang (1): net: wireless: iwlegacy: fix build error for il_pm_ops drivers/bluetooth/Kconfig | 4 +- drivers/bluetooth/btmrvl_sdio.c| 28 + drivers/net/wireless/ath/ath9k/Kconfig | 10 +- drivers/net/wireless/ath/ath9k/Makefile| 2 +- .../net/wireless/ath/ath9k/ar9003_2p2_initvals.h | 10 +- drivers/net/wireless/ath/ath9k/init.c | 7 +- drivers/net/wireless/ath/ath9k/rc.h| 2 +- drivers/net/wireless/b43/main.c| 2 +- drivers/net/wireless/iwlegacy/common.h | 6 +- drivers/net/wireless/mwifiex/debugfs.c | 22 +++- drivers/net/wireless/rtlwifi/pci.c | 1 + drivers/net/wireless/rtlwifi/rtl8192cu/hw.c| 134 +++-- drivers/net/wireless/rtlwifi/rtl8192cu/hw.h| 4 - drivers/net/wireless/rtlwifi/rtl8192cu/mac.c | 18 ++- drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
Re: pull request: bluetooth 2013-06-13
On Thu, Jun 13, 2013 at 12:22:28PM +0100, Gustavo Padovan wrote: > Hi John, > > A few important fixes to 3.10. The first one is a crash fix and talks by > itself. > Then we have the support for a device id, it should be fine if you want to > remove this. Next there are two btmrvl fixes, one for a potential race > condition that could make its main thread never stop and the other to fix the > return code when a memory allocation fails. It was returning 0 instead of > -ENOMEM. Last is a fix to an issue that affects at least some Thinkpad X60, > Initialization on those laptops were failing due by unsupported cmd we were > sending to the device. The patch fixes this by checking if the cmd is > supported first. > > Please pull or let me know of any concerns you may have. > > Gustavo > > --- > The following changes since commit d90b9e29ec5fe7a08eb7965386ebb47615306584: > > Merge branch 'for-john' of > git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes > (2013-06-12 14:28:21 -0400) > > are available in the git repository at: > > > git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth master > > for you to fetch changes up to 0e1aba9361bf292fbdca781d419dca67d6b9911f: > > Bluetooth: btmrvl: fix thread stopping race (2013-06-13 11:48:38 +0100) > > I applied these manually to the wireless tree: > Anderson Lizardo (1): > Bluetooth: Fix crash in l2cap_build_cmd() with small MTU > > Daniel Drake (1): > Bluetooth: btmrvl: fix thread stopping race > > Johan Hedberg (1): > Bluetooth: Fix conditions for HCI_Delete_Stored_Link_Key These I will manually apply to wireless-next: > Cho, Yu-Chen (1): > Bluetooth: Add support for Mediatek Bluetooth device [0e8d:763f] > > Wei Yongjun (1): > Bluetooth: btmrvl: fix error return code in btmrvl_sdio_card_to_host() The device ID one might be OK, but it can wait for now. The error return code patch fixes the return code for a function whose return code isn't actually checked, so it doesn't seem to need a quick fix. John -- John W. LinvilleSomeday the world will need a hero, and you linvi...@tuxdriver.com might be all we have. Be ready. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: pull request: wireless 2013-06-03
On Tue, Jun 04, 2013 at 01:18:13PM -0700, David Miller wrote: > From: "John W. Linville" > Date: Mon, 3 Jun 2013 14:48:17 -0400 > > > Please let me know if there are problems! > > Sorry, the broadcom brcmfmac changes need to go. > > Some of those commits are cleanups, and some of them have the worst > commit log messages ever, the last one for example: > > 0017-brcmsmac-fix-regression-observed-in-3.10-rc1.patch > > has no explanation whatsoever of what the actual problem or regression > is, what aspect of the logic in that function is causing the problem, > and no explanation why making this function always return 'false' is a > reasonable fix. > > That entire series is of very low quality, and even if it was in good > shape, at least half the changes are not appropriate at all this late > in the -rc series. OK, sorry Dave -- I knew better... John -- John W. LinvilleSomeday the world will need a hero, and you linvi...@tuxdriver.com might be all we have. Be ready. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
pull request: wireless 2013-06-06
Dave,
This pull request includes the non-Broadcom bits of the rejected pull
request, plus a few more accumulated fixes from the past week or so.
Among the latter are a couple of ath9k fixes intended to address the
problems observed by Linus w/ his Pixel, and a CVE fix for a potential
security issue in the b43 driver.
For the mac80211 bits, Johannes says:
"Here's one more fix for mac80211 (along with a constify patch it depends
on) to work around problems with certain (broken) APs that forget to
include HT IEs in their association responses."
Regarding the wl12xx bits, Luca says:
"Here are three patches that I'd like to get into 3.10. Two of them, by
me, are related to the firmware version checks in our driver. Without
them, the firmwares fail to load. The other one, by Eliad, fixes a typo
bug in our 5GHz scanning code."
And as for the Bluetooth bits, Gustavo says:
"The following patches are important bug fixes for 3.10, plus the
support for a new device. We do have three fixes from Johan. The first
one is a fix to avoid LE-only devices to rely on the (inexistent)
extended features data. The second patch fixes length checks on
incoming L2CAP signalling PDUs so we can discard PDU whose size
doesn't match the one reported in the header. The last one fixes
the handling of power on failures, we now report proper errors to
mgmt when hci_dev_open()."
Along with that...
Larry Finger corrects an rtlwifi problem that caused some devices to
refuse to connect to non-WPA2 networks if the device had previously
assocated with a WPA2 network. He also adds a one-line fix to prevent
false reports from kmemleak.
Mark A. Greer fixes an out of bounds array access in mwifiex.
Felix Fietkau reverts an earlier ath9k initval patch that reduced rx
sensitivity in a number of ath9k devices with no corresponding benefit.
Kees Cook fixes a potential uid-0 to ring-0 escalation in b43
(CVE-2013-2852).
Sujith Manoharan turns-off powersave mode by default for ath9k, and
also defaults ath9k to use the minstrel_ht rate control algorithm.
Both of these are believed to contribute to greater stability/usability
of ath9k in real-world situations.
Yijing Wang fixes an iwlegacy build error for il_pm_ops if CONFIG_PM
is set but CONFIG_PM_SLEEP is not set.
Please let me know if there are any problems!
Thanks,
John
---
The following changes since commit 4d3797d7e1861ac1af150a6189315786c5e1c820:
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (2013-06-05
19:19:04 +0900)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git for-davem
for you to fetch changes up to 97cc281d75c6dcc7466c8d356112bc13a31300a7:
Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
(2013-06-06 09:55:08 -0400)
Bing Zhao (1):
Bluetooth: btmrvl: support Marvell Bluetooth device SD8897
Eliad Peller (1):
wl12xx/wl18xx: scan all 5ghz channels
Felix Fietkau (1):
Revert "ath9k_hw: Update rx gain initval to improve rx sensitivity"
Johan Hedberg (3):
Bluetooth: Fix checks for LE support on LE-only controllers
Bluetooth: Fix missing length checks for L2CAP signalling PDUs
Bluetooth: Fix mgmt handling of power on failures
Johannes Berg (2):
mac80211: constify ieee802_11_parse_elems() argument
mac80211: work around broken APs not including HT info
John W. Linville (2):
Merge branch 'for-john' of git://git.kernel.org/.../jberg/mac80211
Merge branch 'master' of git://git.kernel.org/.../linville/wireless into
for-davem
Kees Cook (1):
b43: stop format string leaking into error msgs
Larry Finger (2):
rtlwifi: rtl8192cu: Fix problem in connecting to WEP or WPA(1) networks
rtlwifi: Fix a false leak indication for PCI devices
Luciano Coelho (2):
wl12xx: fix minimum required firmware version for wl127x multirole
wl12xx: increase minimum singlerole firmware version required
Mark A. Greer (1):
mwifiex: debugfs: Fix out of bounds array access
Sujith Manoharan (2):
ath9k: Disable PowerSave by default
ath9k: Use minstrel rate control by default
Yijing Wang (1):
net: wireless: iwlegacy: fix build error for il_pm_ops
drivers/bluetooth/Kconfig | 4 +-
drivers/bluetooth/btmrvl_sdio.c| 28 +
drivers/net/wireless/ath/ath9k/Kconfig | 10 +-
drivers/net/wireless/ath/ath9k/Makefile| 2 +-
.../net/wireless/ath/ath9k/ar9003_2p2_initvals.h | 10 +-
drivers/net/wireless/ath/ath9k/init.c | 7 +-
drivers/net/wireless/ath/ath9k/rc.h| 2 +-
drivers/net/wireless/b43/main.c| 2 +-
drivers/net/wireless/iwlegacy/common.h | 6 +-
drivers/net/
pull request: wireless 2013-06-17
Dave, This will probably be the last batch of wireless fixes intended for 3.10. Many of these are one- or two-liners, and a couple of others are mostly relocating existing code to avoid races or to limit the code to effecting specific hardware, etc. The mac80211 fixes have a couple of exceptions to the above. Regarding those, Johannes says: "Following davem's complaint about my patch, here's a new pull request w/o the patch he was complaining about, but instead with the const fix rolled into the fix. I have a fix for radar detection, one for rate control and a workaround for broken HT APs which is a regression fix because we didn't rely on them to be correct before." Johannes also sends some iwlwifi fixes: "I picked up Nikolay's patch for the chain noise calibration bug that seems to have been there forever, a fix from Emmanuel for setting TX flags on BAR frames and a fix of my own to avoid printing request_module() errors if the kernel isn't even modular. We also have our own version of Stanislaw's fix for rate control." Along with those... Anderson Lizardo fixes a Bluetooth memory corruption bug when an MTU value is set to too small of a value. Arend van Spriel sends a revised brcmsmac bug that fixes a regression caused by a bad return value in an earlier patch. He also sends a brcmfmac fix to avoid an oops when loading the driver at boot. Daniel Drake fixes a race condition in btmrvl that causes hangs on suspend for OLPC hardware. Johan Hedberg adds a check to avoid sending a HCI_Delete_Stored_Link_Key command to devices that don't support them, avoiding some scary looking log spam. Stanislaw Gruszka gives us a fix for iwlegacy to be able to use rates higher than 1Mb/s on older wireless networks. He also sends an rt2x00 fix to reinstate older tx power handling behavior for some devices that didn't work well with the current code. Please let me know if there are problems! If you don't want to pull this batch for 3.10, then I will go ahead and pull them into wireless-next... John --- The following changes since commit 8177a9d79c0e942dcac3312f15585d0344d505a5: lseek(fd, n, SEEK_END) does *not* go to eof - n (2013-06-16 08:10:53 -1000) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git for-davem for you to fetch changes up to 722a300bf84ebebe21da164e75024c0ce7ca1868: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem (2013-06-17 13:44:01 -0400) Anderson Lizardo (1): Bluetooth: Fix crash in l2cap_build_cmd() with small MTU Arend van Spriel (2): brcmsmac: disable power-save related functions brcmfmac: free primary net_device when brcmf_bus_start() fails Daniel Drake (1): Bluetooth: btmrvl: fix thread stopping race Emmanuel Grumbach (1): iwlwifi: mvm: correctly set the flags for BAR Johan Hedberg (1): Bluetooth: Fix conditions for HCI_Delete_Stored_Link_Key Johannes Berg (2): iwlwifi: don't print module loading error if not modular mac80211: work around broken APs not including HT info John W. Linville (3): Merge branch 'for-john' of git://git.kernel.org/.../jberg/mac80211 Merge branch 'for-john' of git://git.kernel.org/.../iwlwifi/iwlwifi-fixes Merge branch 'master' of git://git.kernel.org/.../linville/wireless into for-davem Moshe Benji (1): iwlwifi: fix rate control regression Nikolay Martynov (1): iwlwifi: dvm: fix chain noise calibration Simon Wunderlich (2): mac80211: abort CAC in stop_ap() mac80211: Fix rate control mask matching call Stanislaw Gruszka (2): iwlegacy: fix rate control regression rt2800: fix RT5390 & RT3290 TX power settings regression drivers/bluetooth/btmrvl_main.c| 9 +-- .../net/wireless/brcm80211/brcmfmac/dhd_linux.c| 4 + drivers/net/wireless/brcm80211/brcmsmac/main.c | 17 + drivers/net/wireless/iwlegacy/3945-rs.c| 1 + drivers/net/wireless/iwlegacy/4965-rs.c| 2 +- drivers/net/wireless/iwlwifi/dvm/rs.c | 2 +- drivers/net/wireless/iwlwifi/dvm/rxon.c| 2 +- drivers/net/wireless/iwlwifi/iwl-drv.c | 2 + drivers/net/wireless/iwlwifi/mvm/rs.c | 1 + drivers/net/wireless/iwlwifi/mvm/tx.c | 3 +- drivers/net/wireless/rt2x00/rt2800lib.c| 29 +--- net/bluetooth/hci_core.c | 15 ++-- net/bluetooth/l2cap_core.c | 3 + net/mac80211/cfg.c | 6 ++ net/mac80211/ieee80211_i.h | 5 +- net/mac80211/mlme.c| 87 -- net/mac80211/rate.c
pull request: wireless 2013-06-19
Dave,
One more late-breaking fix in the nl80211 code, the fix for the
nl80211_fam.attrbuf race Linus ran into and analysed. Hopefully it
looks familiar... :-)
Let me know if there are problems!
John
---
The following changes since commit eb064c3b49931dc73bba59887019c7f5cb97d322:
vxlan: fix check for migration of static entry (2013-06-19 00:50:58 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git for-davem
for you to fetch changes up to 4067c666f2dccf56f5db5c182713e68c40d46013:
Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
(2013-06-19 15:24:36 -0400)
Johannes Berg (1):
nl80211: fix attrbuf access race by allocating a separate one
John W. Linville (2):
Merge branch 'for-john' of git://git.kernel.org/.../jberg/mac80211
Merge branch 'master' of git://git.kernel.org/.../linville/wireless into
for-davem
net/wireless/nl80211.c | 11 +--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index d5aed3b..b14b7e3 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -1564,12 +1564,17 @@ static int nl80211_dump_wiphy(struct sk_buff *skb,
struct netlink_callback *cb)
struct cfg80211_registered_device *dev;
s64 filter_wiphy = -1;
bool split = false;
- struct nlattr **tb = nl80211_fam.attrbuf;
+ struct nlattr **tb;
int res;
+ /* will be zeroed in nlmsg_parse() */
+ tb = kmalloc(sizeof(*tb) * (NL80211_ATTR_MAX + 1), GFP_KERNEL);
+ if (!tb)
+ return -ENOMEM;
+
mutex_lock(&cfg80211_mutex);
res = nlmsg_parse(cb->nlh, GENL_HDRLEN + nl80211_fam.hdrsize,
- tb, nl80211_fam.maxattr, nl80211_policy);
+ tb, NL80211_ATTR_MAX, nl80211_policy);
if (res == 0) {
split = tb[NL80211_ATTR_SPLIT_WIPHY_DUMP];
if (tb[NL80211_ATTR_WIPHY])
@@ -1583,6 +1588,7 @@ static int nl80211_dump_wiphy(struct sk_buff *skb, struct
netlink_callback *cb)
netdev = dev_get_by_index(sock_net(skb->sk), ifidx);
if (!netdev) {
mutex_unlock(&cfg80211_mutex);
+ kfree(tb);
return -ENODEV;
}
if (netdev->ieee80211_ptr) {
@@ -1593,6 +1599,7 @@ static int nl80211_dump_wiphy(struct sk_buff *skb, struct
netlink_callback *cb)
dev_put(netdev);
}
}
+ kfree(tb);
list_for_each_entry(dev, &cfg80211_rdev_list, list) {
if (!net_eq(wiphy_net(&dev->wiphy), sock_net(skb->sk)))
--
John W. LinvilleSomeday the world will need a hero, and you
linvi...@tuxdriver.com might be all we have. Be ready.
pgp2PuksPWZf5.pgp
Description: PGP signature
pull request: wireless 2013-05-29
Dave, Please pull this batch of fixes intended for the 3.10 stream... Regarding the NFC bits, Samuel says: "This is the first batch of NFC fixes for 3.10, and it contains: - 3 fixes for the NFC MEI support: * We now depend on the correct Kconfig symbol. * We register an MEI event callback whenever we enable an NFC device, otherwise we fail to read anything after an enable/disable cycle. * We only disable an MEI device from its disable mey_phy_ops, preventing useless consecutive disable calls. - An NFC Makefile cleanup, as I forgot to remove a commented out line when moving the LLCP code to the NFC top level directory." As for the mac80211 bits, Johannes says: "This time I have a fix from Stanislaw for a stupid mistake I made in the auth/assoc timeout changes, a fix from Felix for 64-bit traffic counters and one from Helmut for address mask handling in mac80211. I also have a few fixes myself for four different crashes reported by a few people." And Johannes says this about the iwlwifi bit: "This fixes a brown paper-bag bug that we really should've caught in review. More details in the changelog for the fix." On top of that... Arend van Spriel and Hante Meuleman cooperate to send a series of AP and P2P mode fixes for brcmfmac. Gabor Juhos corrects a register offset for AR9550, avoiding a bus error. Dan Carpenter provides a fixup to some dmesg output in the atmel driver. And, finally... Felix Fietkau not only gives us a trio of small AR934x fixes, but also refactors the ath9k aggregation session start/stop handling (using the generic mac80211 support) in order to avoid a deadlock. Please let me know if there are problems! Thanks, John --- The following changes since commit 8e6d91ae0917bf934ed86411148f79d904728d51: tuntap: forbid changing mq flag for persistent device (2013-05-29 00:21:32 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git for-davem for you to fetch changes up to 50cc1cab4cfc8ab32dc6ae470c271cdf65e82de3: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem (2013-05-29 10:59:35 -0400) Arend van Spriel (3): brcmfmac: add additional parameter to brcmf_free_vif() brcmfmac: free net device when registration fails brcmfmac: use struct net_device::destructor to remove interfaces Dan Carpenter (1): atmel: printing bogus information Emmanuel Grumbach (1): iwlwifi: dvm: fix zero LQ CMD sending avoidance Felix Fietkau (5): ath9k: prevent aggregation session deadlocks cfg80211: fix reporting 64-bit station info tx bytes ath9k_hw: fix spur mitigation issues on AR934x ath9k_hw: fix host interface reset on AR934x ath9k_hw: improve performance for AR934x v1.3+ Gabor Juhos (1): ath9k: use correct OTP register offsets for AR9550 Hante Meuleman (4): brcmfmac: Turn off ARP offloading when configured for AP. brcmfmac: Fix p2p setup when connected to ap on 5G. brcmfmac: Add multi channel support for P2P. brcmfmac: Disable powersave mode for P2P link. Helmut Schaa (1): mac80211: Allow single vif mac address change with addr_mask Johannes Berg (4): cfg80211: check wdev->netdev in connection work mac80211: fix queue handling crash mac80211: assign AP_VLAN hw queues correctly mac80211: close AP_VLAN interfaces before unregistering all John W. Linville (4): Samuel Ortiz says: Merge branch 'for-john' of git://git.kernel.org/.../jberg/mac80211 Merge branch 'for-john' of git://git.kernel.org/.../iwlwifi/iwlwifi-fixes Merge branch 'master' of git://git.kernel.org/.../linville/wireless into for-davem Paul Bolle (1): NFC: Remove commented out LLCP related Makefile line Samuel Ortiz (3): NFC: mei_phy depends on INTEL_MEI NFC: mei_phy: Register event callback when enabling the device NFC: mei: Do not disable MEI devices from their remove routine Stanislaw Gruszka (1): mac80211: fix direct probe auth drivers/net/wireless/ath/ath9k/ar9003_eeprom.h | 9 +- drivers/net/wireless/ath/ath9k/ar9003_phy.c| 3 +- drivers/net/wireless/ath/ath9k/ath9k.h | 14 +-- drivers/net/wireless/ath/ath9k/hw.c| 25 ++-- drivers/net/wireless/ath/ath9k/mac.c | 2 +- drivers/net/wireless/ath/ath9k/main.c | 3 +- drivers/net/wireless/ath/ath9k/rc.c| 5 +- drivers/net/wireless/ath/ath9k/reg.h | 11 ++ drivers/net/wireless/ath/ath9k/xmit.c | 138 ++--- drivers/net/wireless/atmel.c | 2 +- .../net/wireless/brcm80211/brcmfmac/dhd_common.c | 18 --- .../net/wireless/brcm80
Re: pull request: bluetooth 2013-05-30
On Thu, May 30, 2013 at 07:52:32PM -0300, Gustavo Padovan wrote: > Hi John, > > The following patches are important bug fixes for 3.10, plus the support for a > new device. We do have three fixes from Johan. The first one is a fix to avoid > LE-only devices to rely on the (inexistent) extended features data. The second > patch fixes length checks on incoming L2CAP signalling PDUs so we can discard > PDU whose size doesn't match the one reported in the header. > The last one fixes the handling of power on failures, we now report proper > errors to mgmt when hci_dev_open(). > > Please pull or let me know of any issues! Thanks. > > Gustavo > > --- > > The following changes since commit f942d116b80feb3ae618a0d8ce2df6e853526d3c: > > brcmsmac: fix regression observed in 3.10-rc1 (2013-05-29 14:46:51 -0400) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth master > > for you to fetch changes up to 0f9e216b0e12971af8a1d39c98c353c76533283b: > > Bluetooth: Fix mgmt handling of power on failures (2013-05-30 18:36:08 > -0300) Pulling now... -- John W. LinvilleSomeday the world will need a hero, and you linvi...@tuxdriver.com might be all we have. Be ready. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: pull request: bluetooth 2013-06-23
On Sun, Jun 23, 2013 at 03:13:51AM +0100, Gustavo Padovan wrote: > Hi John, > > A important fix to 3.10, this patch fixes an issues that was preventing the > l2cap info response command to be handled properly. Please pull. Thanks! > > Gustavo > > --- > The following changes since commit fcb3701849957917a234a61b58ad70ed35c83eda: > > brcmfmac: free primary net_device when brcmf_bus_start() fails (2013-06-13 > 13:24:12 -0400) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth master > > for you to fetch changes up to 3f6fa3d489e127ca5a5b298eabac3ff5dbe0e112: > > Bluetooth: Fix invalid length check in l2cap_information_rsp() (2013-06-23 > 00:24:58 +0100) > > > Jaganath Kanakkassery (1): > Bluetooth: Fix invalid length check in l2cap_information_rsp() > > net/bluetooth/l2cap_core.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Pulling now... -- John W. LinvilleSomeday the world will need a hero, and you linvi...@tuxdriver.com might be all we have. Be ready. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: pull request: bluetooth-next 2013-06-23
On Sun, Jun 23, 2013 at 03:23:56AM +0100, Gustavo Padovan wrote: > Hi John, > > Here goes a set of patches to 3.11. The biggest work here is from Andre Guedes > on the move of the Discovery to use the new request framework. Other than that > Johan provided a bunch of fixes to the L2CAP code. The rest are just small > fixes and clean ups. > > Please pull or let me know of any problem! Thanks. > > Gustavo > > --- > The following changes since commit b887664d882ee4f6a67e0bf05e5f141d32fcc067: > > mwifiex: channel switch handling for station (2013-06-19 15:28:43 -0400) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next > for-upstream > > for you to fetch changes up to b8f4e068004859eefac7b1ced59ddb67ca6d2d80: > > Bluetooth: Improve comments on the HCI_Delete_Store_Link_Key issue > (2013-06-23 03:05:47 +0100) Pulling now... -- John W. LinvilleSomeday the world will need a hero, and you linvi...@tuxdriver.com might be all we have. Be ready. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
pull request: wireless 2013-06-25
Dave, A few more late-breaking fixes hoping for 3.10... Regarding the Bluetooth fix, Gustavo says: "A important fix to 3.10, this patch fixes an issues that was preventing the l2cap info response command to be handled properly." Also for that Bluetooth fix, Johan adds: "Once the code gives up parsing this PDU it also gives up essential parts of the L2CAP connection creation process, i.e. without this patch the stack will fail to establish connections properly." Moving onto ath9k, Felix Fietkau fixes an RCU locking issue in the transmit path. As for ath9k_htc, Sujith Manoharan fixes some authentication timeouts by ensuring that a chip reset is done when IDLE is turned off. I think these are all micro-fixes that shouldn't cause any trouble. Please let me know if there are problems! John --- The following changes since commit f57da7a65b386dd4535daa4f7a3773a025fbb022: qlcnic: Do not sleep while holding spinlock (2013-06-24 00:28:28 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git for-davem for you to fetch changes up to 9d5c34f568a8d80cb69cc89ebb426ceb1d1f4737: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem (2013-06-25 13:24:12 -0400) Felix Fietkau (1): ath9k: fix an RCU issue in calling ieee80211_get_tx_rates Jaganath Kanakkassery (1): Bluetooth: Fix invalid length check in l2cap_information_rsp() John W. Linville (2): Merge branch 'master' of git://git.kernel.org/.../bluetooth/bluetooth Merge branch 'master' of git://git.kernel.org/.../linville/wireless into for-davem Sujith Manoharan (1): ath9k_htc: Handle IDLE state transition properly drivers/net/wireless/ath/ath9k/htc_drv_main.c | 2 +- drivers/net/wireless/ath/ath9k/xmit.c | 6 +- net/bluetooth/l2cap_core.c| 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_main.c b/drivers/net/wireless/ath/ath9k/htc_drv_main.c index 0743a47..62f1b76 100644 --- a/drivers/net/wireless/ath/ath9k/htc_drv_main.c +++ b/drivers/net/wireless/ath/ath9k/htc_drv_main.c @@ -1174,7 +1174,7 @@ static int ath9k_htc_config(struct ieee80211_hw *hw, u32 changed) mutex_lock(&priv->htc_pm_lock); priv->ps_idle = !!(conf->flags & IEEE80211_CONF_IDLE); - if (priv->ps_idle) + if (!priv->ps_idle) chip_reset = true; mutex_unlock(&priv->htc_pm_lock); diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c index 1c9b1ba..83ab6be 100644 --- a/drivers/net/wireless/ath/ath9k/xmit.c +++ b/drivers/net/wireless/ath/ath9k/xmit.c @@ -1570,6 +1570,8 @@ void ath_txq_schedule(struct ath_softc *sc, struct ath_txq *txq) txq->axq_ampdu_depth >= ATH_AGGR_MIN_QDEPTH) return; + rcu_read_lock(); + ac = list_first_entry(&txq->axq_acq, struct ath_atx_ac, list); last_ac = list_entry(txq->axq_acq.prev, struct ath_atx_ac, list); @@ -1608,8 +1610,10 @@ void ath_txq_schedule(struct ath_softc *sc, struct ath_txq *txq) if (ac == last_ac || txq->axq_ampdu_depth >= ATH_AGGR_MIN_QDEPTH) - return; + break; } + + rcu_read_unlock(); } /***/ diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index 4be6a26..68843a2 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c @@ -4333,7 +4333,7 @@ static inline int l2cap_information_rsp(struct l2cap_conn *conn, struct l2cap_info_rsp *rsp = (struct l2cap_info_rsp *) data; u16 type, result; - if (cmd_len != sizeof(*rsp)) + if (cmd_len < sizeof(*rsp)) return -EPROTO; type = __le16_to_cpu(rsp->type); -- John W. LinvilleSomeday the world will need a hero, and you linvi...@tuxdriver.com might be all we have. Be ready. pgpefUn5m6qwJ.pgp Description: PGP signature
pull request: wireless-next 2013-06-28
es from the correct offset rt2x00: rt2800pci: don't use TXWI_DESC_SIZE directly rt2x00: rt2800: unify [RT]XWI_SIZE defines rt2x00: rt2800: increase EEPROM_SIZE to 512 bytes rt2x00: rt2800lib: turn on secondary PAs/LNAs for 3T/3R devices rt2x00: rt2800lib: turn on tertiary PAs/LNAs for 3T/3R devices rt2x00: rt2800lib: fix default TX power check for RT55xx Gustavo Padovan (1): Bluetooth: Improve comments on the HCI_Delete_Store_Link_Key issue Ilan Peer (2): mac80211: Fix VHT bandwidth change event iwlwifi: mvm: Change the settings of AP beacon time Jaganath Kanakkassery (1): Bluetooth: Fix invalid length check in l2cap_information_rsp() Johan Hedberg (12): Bluetooth: Handle LE L2CAP signalling in its own function Bluetooth: Rename L2CAP_CID_LE_DATA to L2CAP_CID_ATT Bluetooth: Fix LE vs BR/EDR selection when connecting Bluetooth: Fix EBUSY condition test in l2cap_chan_connect Bluetooth: Fix hardcoding ATT CID in __l2cap_chan_add() Bluetooth: Add clarifying comment to l2cap_conn_ready() Bluetooth: Fix duplicate call to l2cap_chan_ready() Bluetooth: Remove useless sk variable in l2cap_le_conn_ready Bluetooth: Remove unnecessary L2CAP channel state check Bluetooth: Simplify hci_conn_hold/drop logic for L2CAP Bluetooth: Remove useless hci_conn disc_timeout setting Bluetooth: Fix multiple LE socket handling Johannes Berg (12): mac80211: fix TX aggregation TID struct leak iwlwifi: bump required firmware API version for 3160/7260 iwlwifi: mvm: allow firmware crashes to wake system for debug iwlwifi: remove testmode Merge remote-tracking branch 'mac80211/master' into HEAD nl80211: use small state buffer for wiphy_dump cfg80211: require passing BSS struct back to cfg80211_assoc_timeout cfg80211: hold BSS over association process iwlwifi: pcie: rework RX buffer list init and freeing iwlwifi: always use 'rxq' as RX queue struct name iwlwifi: always use 'trans_pcie' name Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next John W. Linville (7): Merge branch 'master' of git://git.kernel.org/.../bluetooth/bluetooth Merge branch 'for-john' of git://git.kernel.org/.../jberg/mac80211-next Merge branch 'for-upstream' of git://git.kernel.org/.../bluetooth/bluetooth-next Merge branch 'master' of git://git.kernel.org/.../linville/wireless Merge branch 'for-john' of git://git.kernel.org/.../iwlwifi/iwlwifi-next ath10k: minimally handle new channel width enumeration values Merge branch 'master' of git://git.kernel.org/.../linville/wireless-next into for-davem Kirshenbaum Erez (2): wil6210: set vring index for all descriptors wil6210: add HW write-back option in TX descriptor Larry Finger (1): rtlwifi: rtl8723ae: Fix typo in firmware names Michal Kazior (3): ath10k: fix MSI-X setup failpath ath10k: fix 5ghz channel definitions ath10k: leave MMIC generation to the HW Rafał Miłecki (2): b43: replace B43_BCMA_EXTRA with modparam allhwsupport bcma: add support for BCM43142 Shuah Khan (1): Bluetooth: Add missing reset_resume dev_pm_ops Simon Wunderlich (5): nl80211: use attributes to parse beacons nl80211/cfg80211: add 5 and 10 MHz defines and wiphy flag nl80211: add rate flags for 5/10 Mhz channels mac80211: fix various components for the new 5 and 10 MHz widths mac80211: change IBSS channel state to chandef Solomon Peachy (1): cw1200: Fix up a large pile of sparse warnings Sujith Manoharan (7): ath9k_htc: Handle IDLE state transition properly ath9k: Enable WoW only for supported models ath9k: Add version macros for AR9462 2.1 ath9k: Add initvals for AR9462 2.1 ath9k: Program initvals for AR9462 2.1 ath9k: Add support for AR9462 2.1 ath9k: Add mix tx gain table for AR9462 2.0 Thomas Pedersen (4): mac80211: update mesh beacon on workqueue mac80211: allow self-protected frame tx without sta mac80211: initialize power mode for mesh STAs ath9k_htc: ifdef out IFTYPE_MESH advertisement Wei Yongjun (1): ipw2200: fix error return code in ipw_load() eytan lifshitz (1): iwlwifi: mvm: add thermal throttling debugging drivers/bcma/bcma_private.h|2 + drivers/bcma/driver_chipcommon.c | 11 +- drivers/bcma/driver_chipcommon_pmu.c | 123 ++ drivers/bcma/host_pci.c|1 + drivers/bcma/main.c| 19 + drivers/bcma/sprom.c |1 + drivers/bluetooth/btusb.c |1 + drivers/net/wireless/ath/ath10k/mac.c | 53 +-
Re: [PATCH regression/bisected] Revert "brcmsmac: support 4313iPA"
On Mon, Mar 18, 2013 at 02:58:08PM +0100, David Herrmann wrote: > Hi Piotr > > On Mon, Mar 18, 2013 at 2:49 PM, Piotr Haber wrote: > > On 03/18/13 11:45, David Herrmann wrote: > >> This reverts commit b6fc28a158076ca2764edc9a6d1e1402f56e1c0c. It breaks > >> wireless AP reconnection on: (14e4:4727) > >> Broadcom Corporation BCM4313 802.11b/g/n Wireless LAN Controller > >> > >> Any attempt to reconnect to an AP results in timeouts no matter how near > >> to the > >> AP I am: > >> 00:10:40 $nb kernel: wlan0: authenticate with 00:18:39:0a:8e:23 > >> 00:10:40 $nb kernel: wlan0: direct probe to 00:18:39:0a:8e:23 (try 1/3) > >> 00:10:40 $nb kernel: wlan0: direct probe to 00:18:39:0a:8e:23 (try 2/3) > >> 00:10:41 $nb kernel: wlan0: direct probe to 00:18:39:0a:8e:23 (try 3/3) > >> 00:10:41 $nb kernel: wlan0: authentication with 00:18:39:0a:8e:23 timed > >> out > >> --- > >> Hi > >> > >> I tried coming up with a fix instead of reverting this commit, but the > >> commit is > >> way to big for me to understand what's going on. Sorry. > >> > >> With linux-3.8 connecting to an AP broke on my machine. I could connect to > >> an AP > >> one time, but any further attempt resulted in: > >> 00:10:40 $nb kernel: wlan0: authenticate with 00:18:39:0a:8e:23 > >> 00:10:40 $nb kernel: wlan0: direct probe to 00:18:39:0a:8e:23 (try 1/3) > >> 00:10:40 $nb kernel: wlan0: direct probe to 00:18:39:0a:8e:23 (try 2/3) > >> 00:10:41 $nb kernel: wlan0: direct probe to 00:18:39:0a:8e:23 (try 3/3) > >> 00:10:41 $nb kernel: wlan0: authentication with 00:18:39:0a:8e:23 timed > >> out > >> > >> Even sitting right next to the AP didn't help so I started bisecting and it > >> turned out to be: > >> "brcmsmac: support 4313iPA" b6fc28a158076ca2764edc9a6d1e1402f56e1c0c > >> Please revert it. > >> > >> Thanks > >> David > >> > > Hi, > > unfortunately this is not a first report of this patch breaking 4313 for > > some users. > > I'm pretty confident that it is hardware revision related as we have > > 4313ePA and iPA boards running > > successfully in our test setup. > > Could you aid us in effort of finding the problem by supplying the contents > > of this debugfs file: > > /brcmsmac/bcma0:0/hardware > > Hi > > $ cat /sys/kernel/debug/brcmsmac/bcma0\:0/hardware > board vendor: 185f > board type: 51a > board revision: 1408 > board flags: 8402a01 > board flags2: 880 > firmware revision: 262032b > > I can also try partial reverts of that commit, but I really don't know > which parts might be important. Are we going to see a fix for this (very) soon? Or should I just go ahead and revert this patch? -- John W. LinvilleSomeday the world will need a hero, and you linvi...@tuxdriver.com might be all we have. Be ready. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: pull request: bluetooth-next 2013-03-21
On Thu, Mar 21, 2013 at 07:24:08PM -0300, Gustavo Padovan wrote: > Hi John, > > This is our first batch of patches for 3.10. The biggest changes of this pull > request are from Johan Hedberg, he implemented a HCI request framework to make > life easier when we have to send many HCI commands and a block and wait for > all of the to finish, we were able to fix a few issues in stack with the > introduction of this framework. > > Other than that Dean Jenkins did a good work cleaning the RFCOMM code, the > refcnt infrastructure was removed and now we use NULL pointer checks to know > when a object was freed or not. That code was buggy and now it looks a way > better. > > The rest of changes are clean ups, fixes and small improvements all over the > Bluetooth subsystem. > > Please pull, or let me know of any issues! Thanks. > > Gustavo > > --- > The following changes since commit 7da060c1c01b103d181dba39bce9bd141a945f99: > > mwifiex: add WOWLAN support (2013-03-06 16:29:17 -0500) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next > for-upstream > > for you to fetch changes up to 0227c7b56959cd8f5edd20b6a47db86fa553e91a: > > Bluetooth: fix error return code in rfcomm_add_listener() (2013-03-20 > 14:17:52 -0300) Pulling now... -- John W. LinvilleSomeday the world will need a hero, and you linvi...@tuxdriver.com might be all we have. Be ready. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
UEFI Plugfest 2013 -- New Orleans
All, The Linux Foundation and The UEFI Forum are hosting a UEFI Plugfest event in New Orleans on September 19-20, 2013. This event will run concurrent with Linux Plumbers Conference, just after LinuxCon at the Hyatt Regency New Orleans. This event is intended to provide the Linux community with an opportunity to conduct interoperability testing with a variety of UEFI implementations. Additionally, the event will feature technical presentations related to UEFI advancements and key technology insights. More information is available from the UEFI Events page: http://www.uefi.org/events Participants in this event must join the UEFI at the Adopter level or above (gratis): http://www.uefi.org/join Registration for this event is available here: https://www.regonline.com/register/login.aspx?eventID=1219264&MethodId=0&EventsessionId= Registration closes on Sunday, September 1, 2013 -- don't delay! Thanks, John -- John W. LinvilleSomeday the world will need a hero, and you linvi...@tuxdriver.com might be all we have. Be ready. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
pull request: wireless 2013-08-19
Dave, This is a batch of fixes intended for the 3.11 stream... Regarding the iwlwifi bits, Johannes says: "We revert an rfkill bugfix that unfortunately caused more bugs, shuffle some code to avoid touching the PCIe device before it's enabled and disconnect if firmware fails to do our bidding. I also have Stanislaw's fix to not crash in some channel switch scenarios." As for the mac80211 bits, Johannes says: "This time, I have one fix from Dan Carpenter for users of nl80211hdr_put(), and one fix from myself fixing a regression with the libertas driver." Along with the above... Dan Carpenter fixes some incorrectly placed "address of" operators in hostap that caused copying of junk data. Jussi Kivilinna corrects zd1201 to use an allocated buffer rather than the stack for a URB operation. Please let me know if there are problems! Thanks, John --- The following changes since commit 0f7dd1aa8f959216f1faa71513b9d3c1a9065e5a: Merge tag 'clk-fixes-for-linus' of git://git.linaro.org/people/mturquette/linux (2013-08-16 10:00:18 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git for-davem for you to fetch changes up to 22f0d2d1e7e76758f75887e616f2976323f85c26: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem (2013-08-19 14:24:45 -0400) Dan Carpenter (2): Hostap: copying wrong data prism2_ioctl_giwaplist() nl80211: nl80211hdr_put() doesn't return an ERR_PTR Emmanuel Grumbach (1): iwlwifi: pcie: disable L1 Active after pci_enable_device Guy Cohen (1): Revert "iwlwifi: pcie: clear RFKILL interrupt in AMPG" Johannes Berg (2): iwlwifi: mvm: disconnect if time event scheduling fails cfg80211: don't request disconnect if not connected John W. Linville (3): Merge branch 'for-john' of git://git.kernel.org/.../iwlwifi/iwlwifi-fixes Merge branch 'for-john' of git://git.kernel.org/.../jberg/mac80211 Merge branch 'master' of git://git.kernel.org/.../linville/wireless into for-davem Jussi Kivilinna (1): zd1201: do not use stack as URB transfer_buffer Stanislaw Gruszka (1): iwlwifi: dvm: fix calling ieee80211_chswitch_done() with NULL drivers/net/wireless/hostap/hostap_ioctl.c| 4 ++-- drivers/net/wireless/iwlwifi/dvm/mac80211.c | 5 +++- drivers/net/wireless/iwlwifi/iwl-prph.h | 2 -- drivers/net/wireless/iwlwifi/mvm/time-event.c | 33 +++ drivers/net/wireless/iwlwifi/pcie/rx.c| 8 --- drivers/net/wireless/iwlwifi/pcie/trans.c | 10 drivers/net/wireless/zd1201.c | 4 +++- net/wireless/nl80211.c| 22 +- net/wireless/sme.c| 10 9 files changed, 52 insertions(+), 46 deletions(-) diff --git a/drivers/net/wireless/hostap/hostap_ioctl.c b/drivers/net/wireless/hostap/hostap_ioctl.c index ac07473..e509030 100644 --- a/drivers/net/wireless/hostap/hostap_ioctl.c +++ b/drivers/net/wireless/hostap/hostap_ioctl.c @@ -523,9 +523,9 @@ static int prism2_ioctl_giwaplist(struct net_device *dev, data->length = prism2_ap_get_sta_qual(local, addr, qual, IW_MAX_AP, 1); - memcpy(extra, &addr, sizeof(struct sockaddr) * data->length); + memcpy(extra, addr, sizeof(struct sockaddr) * data->length); data->flags = 1; /* has quality information */ - memcpy(extra + sizeof(struct sockaddr) * data->length, &qual, + memcpy(extra + sizeof(struct sockaddr) * data->length, qual, sizeof(struct iw_quality) * data->length); kfree(addr); diff --git a/drivers/net/wireless/iwlwifi/dvm/mac80211.c b/drivers/net/wireless/iwlwifi/dvm/mac80211.c index 822f1a0..3193872 100644 --- a/drivers/net/wireless/iwlwifi/dvm/mac80211.c +++ b/drivers/net/wireless/iwlwifi/dvm/mac80211.c @@ -1068,7 +1068,10 @@ void iwl_chswitch_done(struct iwl_priv *priv, bool is_success) if (test_bit(STATUS_EXIT_PENDING, &priv->status)) return; - if (test_and_clear_bit(STATUS_CHANNEL_SWITCH_PENDING, &priv->status)) + if (!test_and_clear_bit(STATUS_CHANNEL_SWITCH_PENDING, &priv->status)) + return; + + if (ctx->vif) ieee80211_chswitch_done(ctx->vif, is_success); } diff --git a/drivers/net/wireless/iwlwifi/iwl-prph.h b/drivers/net/wireless/iwlwifi/iwl-prph.h index a70c7b9..ff8cc75 100644 --- a/drivers/net/wireless/iwlwifi/iwl-prph.h +++ b/drivers/net/wireless/iwlwifi/iwl-prph.h @@ -97,8 +97,6 @@ #define APMG_PCIDEV_STT_VAL_L1_ACT_DIS (0x0800) -#define APMG_RTC_INT_STT_RFKILL(0x1000) - /* Device system time */ #defin
Re: [Ksummit-2013-discuss] KS Topic request: Handling the Stable kernel, let's dump the cc: stable tag
On Tue, Jul 16, 2013 at 11:43:36AM +0400, James Bottomley wrote: > On Mon, 2013-07-15 at 23:20 -0700, Greg KH wrote: > > > I think the real stable issue that _everyone_ keeps ignoring, is my > > original complaint, in that people are using the -rc1 merge window to > > get fixes in they should have sent to Linus for .0. > > You mean we delay fixes to the merge window (tagged for stable) because > we can't get them into Linus' tree at -rc5 on? Guilty ... that's > because the friction for getting stuff in rises. It's a big fight to > get something marginal in after -rc5 ... it's easy to silently tag it > for stable (did I mention that I think the tag part enables this > behaviour?). I'll just chime-in here and agree that I have delayed minor fixes, preventing them from being merged during an -rc6 or -rc7 but tagging them for -stable. It has long been 'tradition' (at least in the networking space) that fixes so late in the cycle should tend to be really small (i.e. "one-liners") and/or really, really, important. In other words, they need to avoid potentially delaying a release unless they are absolutely necessary. Fixes merged early in the next release cycle at least have a fighting chance of getting some testing before getting into the hands of the unwashed masses. If they have problems in 3..1 then they can still be reverted in -stable, but they can never be removed from the .0 release -- does this matter? I'm not sure. Is having a flood of fixes in x.y.1 any worse than having to got to an -rc8 or an -rc9? John -- John W. LinvilleSomeday the world will need a hero, and you linvi...@tuxdriver.com might be all we have. Be ready. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [Ksummit-2013-discuss] [ATTEND] DT, maintainership, development process
On Mon, Jul 29, 2013 at 03:27:44PM +0200, Rafael J. Wysocki wrote: > That said we have the same issue with commits with just two SOB tags if > a maintainer applies a patch that nobody has responded to. Are they going to > be regarded as "suspicious" too now? > > And what about trusting maintainers? If Linus trusts them enough to pull from > them, why can't everybody else trust them enough to assume that they don't do > bad things on purpose? Not just Linus -- it's 'turtles all the way down' here. As someone else suggested, a Singed-off-by in the merge commit should suffice here. Although, I haven't always made a habit of adding S-o-b to merge commits either... John -- John W. LinvilleSomeday the world will need a hero, and you linvi...@tuxdriver.com might be all we have. Be ready. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: pull request: bluetooth 2013-07-25
On Thu, Jul 25, 2013 at 04:01:58PM +0100, Gustavo Padovan wrote: > Hi John, > > * Gustavo Padovan [2013-07-25 14:05:54 +0100]: > > > Hi John, > > > > A few fixes and devices ID additions for 3.11: > > > > * There are 3 new ath3k device ids > > * Fixed stack memory usage in ath3k. > > * Fixed the init process of BlueFRITZ! devices, they were failing to init > >due to an unsupported command we sent. > > * Fixed wrong use of PTR_ERR in btusb code that was preventing intel > > devices > >to work properly > > * Fixed race codition between hci_register_dev() and hci_dev_open() that > >could cause a NULL pointer dereference. > > Marcel just raised the comment that we need to add more information to > the BlueFRITZ! fixes so I'm steping back with it. So just ignore it for > now. > > Gustavo Is a new version of this request still coming? -- John W. LinvilleSomeday the world will need a hero, and you linvi...@tuxdriver.com might be all we have. Be ready. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [Ksummit-2013-discuss] DT bindings as ABI [was: Do we have people interested in device tree janitoring / cleanup?]
On Tue, Jul 30, 2013 at 10:30:45AM -0600, Stephen Warren wrote: > On 07/29/2013 08:15 PM, jonsm...@gmail.com wrote: > > On Mon, Jul 29, 2013 at 9:44 PM, David Gibson > > wrote: > ... > >> I also think we should consider the option of having a simple and > >> straightforward schema language which handles, say, 80% of cases with > >> a fall back to C for the 20% of curly cases. That might actually be > >> simpler to work with in practice than a schema language which can > >> express absolutely anything, at the cost of being awkward for simple > >> cases or difficult to get your head around. > > > > Would C++ work? You can use operating overloading and templates to > > change the syntax into something that doesn't even resemble C any > > more. > > From my perspective, that's precisely why C++ should /not/ be used. Amen. -- John W. LinvilleSomeday the world will need a hero, and you linvi...@tuxdriver.com might be all we have. Be ready. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: pull request: bluetooth 2013-07-30
On Tue, Jul 30, 2013 at 01:38:48PM +0100, Gustavo Padovan wrote: > Hi John, > > A few fixes and devices ID additions for 3.11: > > * There are 4 new ath3k device ids > * Fixed stack memory usage in ath3k. > * Fixed the init process of BlueFRITZ! devices, they were failing to init >due to an unsupported command we sent. > * Fixed wrong use of PTR_ERR in btusb code that was preventing intel devices >to work properly. > * Fixed race condition between hci_register_dev() and hci_dev_open() that >could cause a NULL pointer dereference. > * Fixed race condition that could call hci_req_cmd_complete() and make some >devices to fail as showed in the log added to the commit message. > > Please pull or let me know of any issues. Thanks. > > Gustavo > > -- > The following changes since commit 075163bbb0f51174359947e1bce84f5edb23f21e: > > ath9k_htc: Handle IDLE state transition properly (2013-06-24 13:52:52 -0400) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth master > > for you to fetch changes up to 53e21fbc288218a423959f878c86471a0e323a9a: > > Bluetooth: Fix calling request callback more than once (2013-07-29 12:28:04 > +0100) Pulling now... -- John W. LinvilleSomeday the world will need a hero, and you linvi...@tuxdriver.com might be all we have. Be ready. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
pull request: wireless 2013-08-01
Dave, This pull request is intended for the 3.11 stream. It is a bit larger than usual, as it includes pulls from most of my feeder trees as well... For the Bluetooth bits, Gustavo says: "A few fixes and devices ID additions for 3.11: * There are 4 new ath3k device ids * Fixed stack memory usage in ath3k. * Fixed the init process of BlueFRITZ! devices, they were failing to init due to an unsupported command we sent. * Fixed wrong use of PTR_ERR in btusb code that was preventing intel devices to work properly. * Fixed race condition between hci_register_dev() and hci_dev_open() that could cause a NULL pointer dereference. * Fixed race condition that could call hci_req_cmd_complete() and make some devices to fail as showed in the log added to the commit message." Regarding the NFC bits, Samuel says: "We have: 1) A build failure fix for the NCI SPI transport layer due to a missing CRC_CCITT Kconfig dependency. 2) A netlink command rename: CMD_FW_UPLOAD was merged during the 3.11 merge window but the typical terminology for loading a firmware to a target is firmware download rather than upload. In order to avoid any confusion in a file exported to userspace, we rename this command to CMD_FW_DOWNLOAD." Samuel's item #2 isn't strictly a fix, but it seems safe and should avoid confusion in the future. As for the mac80211 bits, Johannes says: "I only have three fixes this time, a fix for a suspend regression, a patch correcting the initiator in regulatory code and one fix for mesh station powersave." With respect to the iwlwifi bits, Johannes says: "We have a scan fix for passive channels, a new PCI device ID for an old device, a NIC reset fix, an RF-Kill fix, a fix for powersave when GO interfaces are present as well as an aggregation session fix (for a corner case) and a workaround for a firmware design issue - it only supports a single GTK in D3." Bringing-up the rear with the Atheros trees, Kalle says: "Geert Uytterhoeven fixed an ath10k build problem when NO_DMA=y. I added a missing MAINTAINERS entry for ath10k and updated ath6kl git tree location." Along with the above... Arend van Spriel fixes a brcmfmac WARNING when unplugging the device. Avinash Patil proves a couple of minor mwifiex fixes relating to P2P mode. Luciano Coelho updates the MAINTAINERS entry for the wilink drivers. Stanislaw Gruszka brings an rt2x00 fix for a queue start/stop problem. Stone Piao fixes another mwifiex problem, a command timeout related to P2P mode. Tomasz Moń corrects an endian problem in mwifiex. I'll remind my feeder maintainers to slowdown the patchflow. Beyond that, please let me know if there are problems! Thanks, John --- The following changes since commit b00589af3b04736376f24625ab0b394642e89e29: bridge: disable snooping if there is no querier (2013-07-31 17:40:21 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git for-davem for you to fetch changes up to 22e02a0272e5291a40ca28d2b7aea5231c832077: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem (2013-08-01 14:30:59 -0400) AceLan Kao (2): Bluetooth: Add support for Atheros [0cf3:3121] Bluetooth: Add support for Atheros [0cf3:e003] Adam Lee (1): Bluetooth: fix wrong use of PTR_ERR() in btusb Arend van Spriel (1): brcmfmac: inform cfg80211 about disconnect when device is unplugged Arik Nemtsov (1): regulatory: use correct regulatory initiator on wiphy register Avinash Patil (2): mwifiex: check for bss_role instead of bss_mode for STA operations mwifiex: fix wrong data rates in P2P client Chun-Yeow Yeoh (1): mac80211: prevent the buffering or frame transmission to non-assoc mesh STA David Spinadel (1): iwlwifi: mvm: set SSID bits for passive channels Emmanuel Grumbach (3): iwlwifi: add DELL SKU for 5150 HMC iwlwifi: pcie: reset the NIC before the bring up iwlwifi: pcie: clear RFKILL interrupt in AMPG Frederic Danis (1): NFC: Fix NCI over SPI build Geert Uytterhoeven (1): ath10k: ATH10K should depend on HAS_DMA Gustavo Padovan (1): Bluetooth: Fix race between hci_register_dev() and hci_dev_open() Ilan Peer (1): iwlwifi: mvm: Disable managed PS when GO is added Jaganath Kanakkassery (1): Bluetooth: Fix invalid length check in l2cap_information_rsp() Johan Hedberg (2): Bluetooth: Fix HCI init for BlueFRITZ! devices Bluetooth: Fix calling request callback more than once Johannes Berg (2): iwlwifi: mvm: use only a single GTK in D3 iwlwifi: mvm: fix flushing not started aggregation sessions John W. Linville (6): Merge branch 'for-linville-current' of git://github.com/kvalo/ath Merge branch
Re: pull request: bluetooth-next 2013-08-21
On Wed, Aug 21, 2013 at 06:12:18PM +0200, Gustavo Padovan wrote: > Hi John, > > Patches to 3.12, here we have: > > * implementation of a proper tty_port for RFCOMM devices, this fixes some > issues people were seeing lately in the kernel. > * Add voice_setting option for SCO, it is used for SCO Codec selection > * bugfixes, small improvements and clean ups > > Please pull, Thanks. > > Gustavo > > -- > The following changes since commit 72bb2f2678878dd4a758e628957f29ce28000d88: > > bgmac: make bgmac depend on bcm47xx (2013-07-24 11:05:19 -0400) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next > master > > for you to fetch changes up to 2dea632f9acad076370fe871d4ccc93868621403: > > Bluetooth: Add SCO connection fallback (2013-08-21 16:47:13 +0200) Pulling now... -- John W. LinvilleSomeday the world will need a hero, and you linvi...@tuxdriver.com might be all we have. Be ready. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
pull request: wireless 2013-08-23
Dave,
This is one more set of fixes intended for the 3.11 stream...
For the mac80211 bits, Johannes says:
"I have three more patches for the 3.11 stream: Felix's fix for the
fairly visible brcmsmac crash, a fix from Simon for an IBSS join bug I
found and a fix for a channel context bug in IBSS I'd introduced."
Along with those...
Sujith Manoharan makes a minor change to not use a PLL hang workaroun
for AR9550. This one-liner fixes a couple of bugs reported in the Red Hat
bugzilla.
Helmut Schaa addresses an ath9k_htc bug that mangles frame headers
during Tx. This fix is small, tested by the bug reported and isolated
to ath9k_htc.
Stanislaw Gruszka reverts a recent iwl4965 change that broke rfkill
notification to user space.
Please let me know if there are problems!
Thanks,
John
---
The following changes since commit 4a5a8aa6c966eafc106543bd955ae388230420e5:
ipv4: expose IPV4_DEVCONF (2013-08-22 20:30:15 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git for-davem
for you to fetch changes up to 81ca2ff9450c2e983ee416eca17ebe6fa9c3da4f:
Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
(2013-08-23 11:47:48 -0400)
Felix Fietkau (1):
mac80211: add a flag to indicate CCK support for HT clients
Helmut Schaa (1):
ath9k_htc: Restore skb headroom when returning skb to mac80211
Johannes Berg (1):
mac80211: add missing channel context release
John W. Linville (2):
Merge branch 'for-john' of git://git.kernel.org/.../jberg/mac80211
Merge branch 'master' of git://git.kernel.org/.../linville/wireless into
for-davem
Simon Wunderlich (1):
mac80211: ibss: fix ignored channel parameter
Stanislaw Gruszka (1):
iwl4965: fix rfkill set state regression
Sujith Manoharan (1):
ath9k: Enable PLL fix only for AR9340/AR9330
drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 10
drivers/net/wireless/ath/ath9k/init.c | 3 ++-
drivers/net/wireless/ath/ath9k/main.c | 3 +--
drivers/net/wireless/ath/carl9170/main.c | 3 ++-
drivers/net/wireless/iwlegacy/4965-mac.c | 2 +-
drivers/net/wireless/rt2x00/rt2800lib.c | 3 ++-
include/net/mac80211.h| 1 +
net/mac80211/ibss.c | 34 +++
net/mac80211/rc80211_minstrel_ht.c| 3 +++
9 files changed, 52 insertions(+), 10 deletions(-)
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
b/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
index e602c95..c028df7 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
@@ -448,6 +448,7 @@ static void ath9k_htc_tx_process(struct ath9k_htc_priv
*priv,
struct ieee80211_conf *cur_conf = &priv->hw->conf;
bool txok;
int slot;
+ int hdrlen, padsize;
slot = strip_drv_header(priv, skb);
if (slot < 0) {
@@ -504,6 +505,15 @@ send_mac80211:
ath9k_htc_tx_clear_slot(priv, slot);
+ /* Remove padding before handing frame back to mac80211 */
+ hdrlen = ieee80211_get_hdrlen_from_skb(skb);
+
+ padsize = hdrlen & 3;
+ if (padsize && skb->len > hdrlen + padsize) {
+ memmove(skb->data + padsize, skb->data, hdrlen);
+ skb_pull(skb, padsize);
+ }
+
/* Send status to mac80211 */
ieee80211_tx_status(priv->hw, skb);
}
diff --git a/drivers/net/wireless/ath/ath9k/init.c
b/drivers/net/wireless/ath/ath9k/init.c
index 16f8b20..026a2a0 100644
--- a/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
@@ -802,7 +802,8 @@ void ath9k_set_hw_capab(struct ath_softc *sc, struct
ieee80211_hw *hw)
IEEE80211_HW_PS_NULLFUNC_STACK |
IEEE80211_HW_SPECTRUM_MGMT |
IEEE80211_HW_REPORTS_TX_ACK_STATUS |
- IEEE80211_HW_SUPPORTS_RC_TABLE;
+ IEEE80211_HW_SUPPORTS_RC_TABLE |
+ IEEE80211_HW_SUPPORTS_HT_CCK_RATES;
if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_HT) {
hw->flags |= IEEE80211_HW_AMPDU_AGGREGATION;
diff --git a/drivers/net/wireless/ath/ath9k/main.c
b/drivers/net/wireless/ath/ath9k/main.c
index 1737a3e..cb5a655 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -173,8 +173,7 @@ static void ath_restart_work(struct ath_softc *sc)
{
ieee80211_queue_delayed_work(sc->hw, &sc->tx_complete_work, 0);
- if (AR_SREV_9340(sc->sc_ah) || AR_SREV_9485(sc->sc_ah) ||
- AR_SREV_9550(sc->sc_ah))
+ if (AR_SREV_9340(sc->sc_ah) || AR_SREV_9330(sc->sc_ah))
ieee80211_queue_dela
pull request: wireless 2013-08-08
Dave,
This is a batch of fixes intended for the 3.11 queue...
Regarding the mac80211 (and related) bits, Johannes says:
"I have a fix from Chris for an infinite loop along with fixes from
myself to prevent it entering the loop to start with (continue using
disabled channels, many thanks to Chris for his debug/test help) and a
workaround for broken APs that advertise a bad HT primary channel in
their beacons. Additionally, a fix for another attrbuf race in mac80211
and a fix to clean up properly while P2P GO interfaces go down."
Along with that...
Solomon Peachy corrects a range check in cw1200 that would lead to
a BUG_ON when starting AP mode.
Stanislaw Gruszka provides an iwl4965 patch to power-up the device
earlier (avoiding microcode errors), and another iwl4965 fix that
resets the firmware after turning rfkill off (resolving a bug in the
Red Hat Bugzilla).
Please let me know if there are problems!
John
---
The following changes since commit 3e3be275851bc6fc90bfdcd732cd95563acd982b:
ipv6: don't stop backtracking in fib6_lookup_1 if subtree does not match
(2013-08-07 17:17:19 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git for-davem
for you to fetch changes up to 1826ff2357d69d3a2627df51e4ba07d24087b698:
Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
(2013-08-08 13:12:42 -0400)
Chris Wright (1):
mac80211: fix infinite loop in ieee80211_determine_chantype
Johannes Berg (5):
nl80211: fix another nl80211_fam.attrbuf race
mac80211: don't wait for TX status forever
mac80211: ignore HT primary channel while connected
cfg80211: fix P2P GO interface teardown
mac80211: continue using disabled channels while connected
John W. Linville (2):
Merge branch 'for-john' of git://git.kernel.org/.../jberg/mac80211
Merge branch 'master' of git://git.kernel.org/.../linville/wireless into
for-davem
Solomon Peachy (1):
cw1200: Fix spurious BUG_ON() trigger when starting AP mode.
Stanislaw Gruszka (2):
iwl4965: set power mode early
iwl4965: reset firmware after rfkill off
drivers/net/wireless/cw1200/sta.c| 7 ++---
drivers/net/wireless/iwlegacy/4965-mac.c | 16 +-
drivers/net/wireless/iwlegacy/common.c | 1 +
net/mac80211/mlme.c | 54 +---
net/wireless/core.c | 1 +
net/wireless/nl80211.c | 6 ++--
6 files changed, 52 insertions(+), 33 deletions(-)
diff --git a/drivers/net/wireless/cw1200/sta.c
b/drivers/net/wireless/cw1200/sta.c
index 7365674..010b252 100644
--- a/drivers/net/wireless/cw1200/sta.c
+++ b/drivers/net/wireless/cw1200/sta.c
@@ -1406,11 +1406,8 @@ static void cw1200_do_unjoin(struct cw1200_common *priv)
if (!priv->join_status)
goto done;
- if (priv->join_status > CW1200_JOIN_STATUS_IBSS) {
- wiphy_err(priv->hw->wiphy, "Unexpected: join status: %d\n",
- priv->join_status);
- BUG_ON(1);
- }
+ if (priv->join_status == CW1200_JOIN_STATUS_AP)
+ goto done;
cancel_work_sync(&priv->update_filtering_work);
cancel_work_sync(&priv->set_beacon_wakeup_period_work);
diff --git a/drivers/net/wireless/iwlegacy/4965-mac.c
b/drivers/net/wireless/iwlegacy/4965-mac.c
index b9b2bb5..f2ed62e 100644
--- a/drivers/net/wireless/iwlegacy/4965-mac.c
+++ b/drivers/net/wireless/iwlegacy/4965-mac.c
@@ -4460,12 +4460,12 @@ il4965_irq_tasklet(struct il_priv *il)
* is killed. Hence update the killswitch state here. The
* rfkill handler will care about restarting if needed.
*/
- if (!test_bit(S_ALIVE, &il->status)) {
- if (hw_rf_kill)
- set_bit(S_RFKILL, &il->status);
- else
- clear_bit(S_RFKILL, &il->status);
+ if (hw_rf_kill) {
+ set_bit(S_RFKILL, &il->status);
+ } else {
+ clear_bit(S_RFKILL, &il->status);
wiphy_rfkill_set_hw_state(il->hw->wiphy, hw_rf_kill);
+ il_force_reset(il, true);
}
handled |= CSR_INT_BIT_RF_KILL;
@@ -5334,6 +5334,9 @@ il4965_alive_start(struct il_priv *il)
il->active_rate = RATES_MASK;
+ il_power_update_mode(il, true);
+ D_INFO("Updated power mode\n");
+
if (il_is_associated(il)) {
struct il_rxon_cmd *active_rxon =
(struct il_rxon_cmd *)&il->
pull request: wireless 2013-07-19
Dave,
Please accept this batch of fixes intended for the 3.11 tree...
Alexey Khoroshilov fixes a suspend-related race in ath9k_htc.
Arnd Bergmann corrects the alignment of a structure in the ssb code
to be compatible with ARM devices.
Bob Copeland provides an ath5k fix that corrects a mistaken variable
initialization.
Felix Fietkau corrects some frame accounting for dropped frames
in ath9k.
Geert Uytterhoeven brings a Kconfig fix to indicate the DMA
requirements for rt2x00.
Larry Finger offers two rtlwifi fixes: one that properly initializes
a callback; and, a scattered collection of Kconfig, Makefile, and
EXPORT_SYMBOL changes that correct some build problems.
Finally, Sujith Manoharan provides an ath9k fix to disable a feature
on a specific hardware device.
Please let me know if there are any problems!
Thanks,
John
---
The following changes since commit ecb2cf1a6b63825a258ff4fe0d7f3070fbe4676b:
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (2013-07-18
20:08:47 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git for-davem
for you to fetch changes up to 876fbb5d3ebab01685fef3839d245481c30eab5f:
Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
(2013-07-19 12:54:28 -0400)
Alexey Khoroshilov (1):
ath9k_htc: fix data race between request_firmware_nowait() callback and
suspend()
Arnd Bergmann (1):
ssb: fix alignment of struct bcma_device_id
Bob Copeland (1):
ath5k: fix extra set bit in multicast mask
Felix Fietkau (1):
ath9k: fix tx pending frames accounting for dropped packets
Geert Uytterhoeven (1):
rt2x00: RT2X00 should depend on HAS_DMA
John W. Linville (1):
Merge branch 'master' of git://git.kernel.org/.../linville/wireless into
for-davem
Larry Finger (2):
rtlwifi: Initialize power-setting callback for USB devices
rtlwifi: Fix build errors for unusual cases
Sujith Manoharan (1):
ath9k_hw: Fix multicast search for AR9002 family
drivers/net/wireless/ath/ath5k/mac80211-ops.c | 2 +-
drivers/net/wireless/ath/ath9k/ar5008_phy.c | 10 +++-
drivers/net/wireless/ath/ath9k/hif_usb.c | 9 ++--
drivers/net/wireless/ath/ath9k/xmit.c | 44 ++--
drivers/net/wireless/rt2x00/Kconfig | 2 +-
drivers/net/wireless/rtlwifi/Kconfig | 72 ++-
drivers/net/wireless/rtlwifi/Makefile | 10 ++--
drivers/net/wireless/rtlwifi/base.c | 19 +--
drivers/net/wireless/rtlwifi/base.h | 2 +-
drivers/net/wireless/rtlwifi/core.c | 1 +
drivers/net/wireless/rtlwifi/debug.c | 1 +
drivers/net/wireless/rtlwifi/efuse.c | 1 +
drivers/net/wireless/rtlwifi/pci.c| 22 +++-
drivers/net/wireless/rtlwifi/ps.c | 16 ++
drivers/net/wireless/rtlwifi/ps.h | 1 +
drivers/net/wireless/rtlwifi/usb.c| 9
include/linux/mod_devicetable.h | 5 +-
17 files changed, 154 insertions(+), 72 deletions(-)
diff --git a/drivers/net/wireless/ath/ath5k/mac80211-ops.c
b/drivers/net/wireless/ath/ath5k/mac80211-ops.c
index 81b686c..40825d4 100644
--- a/drivers/net/wireless/ath/ath5k/mac80211-ops.c
+++ b/drivers/net/wireless/ath/ath5k/mac80211-ops.c
@@ -325,7 +325,7 @@ ath5k_prepare_multicast(struct ieee80211_hw *hw,
struct netdev_hw_addr *ha;
mfilt[0] = 0;
- mfilt[1] = 1;
+ mfilt[1] = 0;
netdev_hw_addr_list_for_each(ha, mc_list) {
/* calculate XOR of eight 6-bit values */
diff --git a/drivers/net/wireless/ath/ath9k/ar5008_phy.c
b/drivers/net/wireless/ath/ath9k/ar5008_phy.c
index d1acfe9..1576d58 100644
--- a/drivers/net/wireless/ath/ath9k/ar5008_phy.c
+++ b/drivers/net/wireless/ath/ath9k/ar5008_phy.c
@@ -610,7 +610,15 @@ static void ar5008_hw_override_ini(struct ath_hw *ah,
REG_SET_BIT(ah, AR_DIAG_SW, (AR_DIAG_RX_DIS | AR_DIAG_RX_ABORT));
if (AR_SREV_9280_20_OR_LATER(ah)) {
- val = REG_READ(ah, AR_PCU_MISC_MODE2);
+ /*
+* For AR9280 and above, there is a new feature that allows
+* Multicast search based on both MAC Address and Key ID.
+* By default, this feature is enabled. But since the driver
+* is not using this feature, we switch it off; otherwise
+* multicast search based on MAC addr only will fail.
+*/
+ val = REG_READ(ah, AR_PCU_MISC_MODE2) &
+ (~AR_ADHOC_MCAST_KEYID_ENABLE);
if (!AR_SREV_9271(ah))
val &= ~AR_PCU_MISC_MODE2_HWWAR1;
diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.c
b/drivers/net/wireless/ath/ath9k/hif_usb.c
index 9e582e1..2469db5 100644
--- a/dr
pull request: wireless 2013-07-24
Dave, This is another batch of fixes intended for the 3.11 stream. FWIW, this is the first request with fixes from the mac80211 and iwlwifi trees as well. Regarding the mac80211 bits, Johannes says: "Here I have a fix for RSSI thresholds in mesh, two minstrel fixes from Felix, an nl80211 fix from Michal and four various fixes I did myself." As for the iwlwifi bits, Johannes says: "Here I have a fix for debugfs directory creation (causing a spurious error message), two scanning fixes from David Spinadel, an LED fix and two patches related to a BA session problem that eventually caused firmware crashes from Emmanuel and a small BT fix for older devices as well as a workaround for a firmware problem with APs with very small beacon intervals from myself." Along with those: Arend van Spriel addresses a lock-up and a NULL pointer dereference in brcmfmac. Daniel Drake fixes an unhandled interrupt during device tear down in mwifiex. Larry Finger corrects a wil6210 build error. Oleksij Rempel fixes two ath9k_htc problems related to keeping the driver and firmware in sync. Solomon Peachy gives us a cw1200 fix to avoid an oops in monitor mode. Please let me know if there are problems! Thanks, John --- The following changes since commit f8c0aca9fda7856a8a8d61d523ba3187affbd714: fec: Add MODULE_ALIAS (2013-07-23 17:23:16 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git for-davem for you to fetch changes up to 18e1ccb6ca35f995006749d20d9bd6ef40d736fd: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem (2013-07-24 11:50:38 -0400) Alexander Bondar (1): iwlwifi: mvm: Fix VIF specific debugfs directory creation Arend van Spriel (2): brcmfmac: decrement pending 8021x count upon tx failure brcmfmac: bail out of brcmf_txflowblock_if() for non-netdev interface Chun-Yeow Yeoh (1): nl80211: fix the setting of RSSI threshold value for mesh Daniel Drake (1): mwifiex: fix IRQ enable/disable David Spinadel (2): iwlwifi: mvm: fix bug in scan ssid iwlwifi: mvm: remove extra SSID from probe request Emmanuel Grumbach (3): iwlwifi: mvm: unregister leds when registration failed iwlwifi: mvm: fix L2P BA ressources leak iwlwifi: mvm: track the number of Rx BA sessions Felix Fietkau (2): mac80211/minstrel_ht: fix cck rate sampling mac80211/minstrel: fix NULL pointer dereference issue Johannes Berg (6): cfg80211: fix bugs in new SME implementation regulatory: add missing rtnl locking mac80211: fix ethtool stats for non-station interfaces mac80211: fix duplicate retransmission detection iwlwifi: dvm: don't send BT_CONFIG on devices w/o Bluetooth iwlwifi: mvm: refuse connection to APs with BI < 16 John W. Linville (3): Merge branch 'for-john' of git://git.kernel.org/.../jberg/mac80211 Merge branch 'for-john' of git://git.kernel.org/.../iwlwifi/iwlwifi-fixes Merge branch 'master' of git://git.kernel.org/.../linville/wireless into for-davem Larry Finger (1): ath: wil6210: Fix build error Michal Kazior (1): nl80211: fix mgmt tx status and testmode reporting for netns Oleksij Rempel (2): ath9k_htc: do some initial hardware configuration ath9k_htc: reboot firmware if it was loaded Solomon Peachy (1): cw1200: Fix OOPS in monitor mode drivers/net/wireless/ath/ath9k/hif_usb.c | 4 +- drivers/net/wireless/ath/ath9k/htc_drv_init.c | 1 + drivers/net/wireless/ath/wil6210/debugfs.c | 4 +- .../net/wireless/brcm80211/brcmfmac/dhd_linux.c| 2 +- drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c | 8 +- drivers/net/wireless/cw1200/txrx.c | 2 +- drivers/net/wireless/iwlwifi/dvm/main.c| 2 +- drivers/net/wireless/iwlwifi/mvm/debugfs.c | 6 +- drivers/net/wireless/iwlwifi/mvm/mac80211.c| 23 +- drivers/net/wireless/iwlwifi/mvm/mvm.h | 1 + drivers/net/wireless/iwlwifi/mvm/scan.c| 10 ++- drivers/net/wireless/iwlwifi/mvm/sta.c | 23 +- drivers/net/wireless/mwifiex/init.c| 10 +-- drivers/net/wireless/mwifiex/main.c| 13 +++- drivers/net/wireless/mwifiex/main.h| 1 + drivers/net/wireless/mwifiex/sdio.c| 91 ++ drivers/net/wireless/mwifiex/sdio.h| 3 - net/mac80211/cfg.c | 2 + net/mac80211/rc80211_minstrel.c| 3 +- net/mac80211/rc80211_minstrel_ht.c | 10 ++- net/mac80211/rx.c | 10 ++- net/wireless/nl80211.c | 11 ++- net/wireless/reg.c
Re: linux-next: manual merge of the wireless-next tree with the wireless tree
I think I have this slightly different in wireless-testing. Johannes,
please review and advise...
John
On Mon, Aug 12, 2013 at 11:53:27AM +1000, Stephen Rothwell wrote:
> Hi John,
>
> Today's linux-next merge of the wireless-next tree got a conflict in
> drivers/net/wireless/iwlwifi/pcie/trans.c between commit eabc4ac5d760
> ("iwlwifi: pcie: disable L1 Active after pci_enable_device") from
> thewireless tree and commit f2532b04b2ec ("iwlwifi: pcie: don't disable
> L1 for newest NICs") from the wireless-next tree.
>
> I fixed it up (maybe - see below) and can carry the fix as necessary (no
> action is required).
>
> --
> Cheers,
> Stephen Rothwells...@canb.auug.org.au
>
> diff --cc drivers/net/wireless/iwlwifi/pcie/trans.c
> index 390e2f0,e52d1ce..000
> --- a/drivers/net/wireless/iwlwifi/pcie/trans.c
> +++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
> @@@ -1502,16 -1400,22 +1400,22 @@@ struct iwl_trans *iwl_trans_pcie_alloc(
> spin_lock_init(&trans_pcie->reg_lock);
> init_waitqueue_head(&trans_pcie->ucode_write_waitq);
>
> +if (pci_enable_device(pdev)) {
> +err = -ENODEV;
> +goto out_no_pci;
> +}
> +
> - /* W/A - seems to solve weird behavior. We need to remove this if we
> - * don't want to stay in L1 all the time. This wastes a lot of power */
> - pci_disable_link_state(pdev, PCIE_LINK_STATE_L0S | PCIE_LINK_STATE_L1 |
> -PCIE_LINK_STATE_CLKPM);
> + if (!cfg->base_params->pcie_l1_allowed) {
> + /*
> + * W/A - seems to solve weird behavior. We need to remove this
> + * if we don't want to stay in L1 all the time. This wastes a
> + * lot of power.
> + */
> + pci_disable_link_state(pdev, PCIE_LINK_STATE_L0S |
> +PCIE_LINK_STATE_L1 |
> +PCIE_LINK_STATE_CLKPM);
> + }
>
> -if (pci_enable_device(pdev)) {
> -err = -ENODEV;
> -goto out_no_pci;
> -}
> -
> pci_set_master(pdev);
>
> err = pci_set_dma_mask(pdev, DMA_BIT_MASK(36));
--
John W. LinvilleSomeday the world will need a hero, and you
linvi...@tuxdriver.com might be all we have. Be ready.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
pull request: wireless 2013-03-01
Dave, This is another flurry of fixes intended for the 3.9 stream... A mac80211 pull from Johannes: "Seth fixes a stupid bug I introduced into one of his earlier patches, Chun-Yeow fixes mesh forwarding and Felix fixes monitor mode. I myself fixed a small locking issue and, the biggest change here, removed some nl80211 information with which sometimes the per wiphy information was getting too large for the typical 4k-minus-overhead. In my -next tree I have a patch to allow splitting that and add back the information removed now." An iwlwifi pull from Johannes: "I have a fix for a pretty important bug regarding DMA mapping, that could cause the DMA engine to overwrite data we wanted to send to it, so that the next time we send it it would be bad. This particularly affects calibration results. Other than that, three little fixes for the MVM driver." But wait, there's more! Avinash Patil fixes an incorrectly timed delay in mwifiex. Bing Zhao prevents a crash in SD8688 caused by failing to properly set a flag before issuing a command. Felix Fietkau is the big here this time, providing a trio of minor ath9k fixes and correcting the advertised interface combinations for rt2x00 when mesh support is disabled. Finally, Hauke Mehrtens gives us a patch that correctlin initializes a spin lock in the bcma code. Please let me know if there are problems! Thanks, John --- The following changes since commit 32fcafbcd1c9f6c7013016a22a5369b4acb93577: net/phy: micrel: Disable asymmetric pause for KSZ9021 (2013-02-28 15:37:30 -0500) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git for-davem for you to fetch changes up to 98b7ff9a4977e4f4f451c30288b197ad79e5ab7f: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem (2013-03-01 13:52:03 -0500) Avinash Patil (1): mwifiex: correct sleep delay counter Bing Zhao (1): libertas: fix crash for SD8688 Chun-Yeow Yeoh (1): mac80211: fix the problem of forwarding from DS to DS in Mesh Dor Shaish (1): iwlwifi: mvm: Remove testing of static PIC in PhyDB Felix Fietkau (6): mac80211: fix idle handling in monitor mode mac80211: fix monitor mode channel reporting ath9k: fix RSSI dummy marker value ath9k_htc: fix signal strength handling issues ath9k_hw: improve reset reliability after errors rt2x00: error in configurations with mesh support disabled Hauke Mehrtens (1): bcma: init spin lock Johannes Berg (6): mac80211: fix tim_lock locking nl80211: remove radar information nl80211: remove TCP WoWLAN information iwlwifi: always copy first 16 bytes of commands iwlwifi: mvm: fix AP/GO mode station removal iwlwifi: fix wakeup status query and packet reporting John W. Linville (2): Merge branch 'for-john' of git://git.kernel.org/.../iwlwifi/iwlwifi-fixes Merge branch 'master' of git://git.kernel.org/.../linville/wireless into for-davem Seth Forshee (1): mac80211: Ensure off-channel frames don't get queued drivers/bcma/driver_pci_host.c| 2 + drivers/net/wireless/ath/ath9k/common.h | 2 +- drivers/net/wireless/ath/ath9k/htc.h | 1 + drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 18 +++-- drivers/net/wireless/ath/ath9k/hw.c | 4 +- drivers/net/wireless/iwlwifi/iwl-devtrace.h | 10 +-- drivers/net/wireless/iwlwifi/iwl-phy-db.c | 16 drivers/net/wireless/iwlwifi/mvm/d3.c | 104 +++--- drivers/net/wireless/iwlwifi/mvm/mac80211.c | 19 +++-- drivers/net/wireless/iwlwifi/mvm/mvm.h| 4 + drivers/net/wireless/iwlwifi/pcie/internal.h | 9 +++ drivers/net/wireless/iwlwifi/pcie/tx.c| 75 ++- drivers/net/wireless/libertas/if_sdio.c | 6 +- drivers/net/wireless/mwifiex/pcie.c | 2 +- drivers/net/wireless/rt2x00/rt2x00dev.c | 8 +- net/mac80211/cfg.c| 12 ++- net/mac80211/iface.c | 2 +- net/mac80211/tx.c | 77 --- net/wireless/nl80211.c| 61 +-- 19 files changed, 258 insertions(+), 174 deletions(-) diff --git a/drivers/bcma/driver_pci_host.c b/drivers/bcma/driver_pci_host.c index d3bde6c..30629a3 100644 --- a/drivers/bcma/driver_pci_host.c +++ b/drivers/bcma/driver_pci_host.c @@ -404,6 +404,8 @@ void bcma_core_pci_hostmode_init(struct bcma_drv_pci *pc) return; } + spin_lock_init(&pc_host->cfgspace_lock); + pc->host_controller = pc_host; pc_host->pci_controller.io_resource = &pc_host->io_resource; pc_host->pci_controller.mem_resource = &pc_host->
Re: pull request: wireless 2013-03-01
Ooops! Forgot signature... On Fri, Mar 01, 2013 at 02:23:32PM -0500, John W. Linville wrote: > Dave, > > This is another flurry of fixes intended for the 3.9 stream... > > A mac80211 pull from Johannes: > > "Seth fixes a stupid bug I introduced into one of his earlier patches, > Chun-Yeow fixes mesh forwarding and Felix fixes monitor mode. I myself > fixed a small locking issue and, the biggest change here, removed some > nl80211 information with which sometimes the per wiphy information was > getting too large for the typical 4k-minus-overhead. In my -next tree I > have a patch to allow splitting that and add back the information > removed now." > > An iwlwifi pull from Johannes: > > "I have a fix for a pretty important bug regarding DMA mapping, that > could cause the DMA engine to overwrite data we wanted to send to it, so > that the next time we send it it would be bad. This particularly affects > calibration results. Other than that, three little fixes for the MVM > driver." > > But wait, there's more! > > Avinash Patil fixes an incorrectly timed delay in mwifiex. > > Bing Zhao prevents a crash in SD8688 caused by failing to properly > set a flag before issuing a command. > > Felix Fietkau is the big here this time, providing a trio of minor > ath9k fixes and correcting the advertised interface combinations for > rt2x00 when mesh support is disabled. > > Finally, Hauke Mehrtens gives us a patch that correctlin initializes > a spin lock in the bcma code. > > Please let me know if there are problems! > > Thanks, > > John > > --- > > The following changes since commit 32fcafbcd1c9f6c7013016a22a5369b4acb93577: > > net/phy: micrel: Disable asymmetric pause for KSZ9021 (2013-02-28 15:37:30 > -0500) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git > for-davem > > for you to fetch changes up to 98b7ff9a4977e4f4f451c30288b197ad79e5ab7f: > > Merge branch 'master' of > git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into > for-davem (2013-03-01 13:52:03 -0500) > > > > Avinash Patil (1): > mwifiex: correct sleep delay counter > > Bing Zhao (1): > libertas: fix crash for SD8688 > > Chun-Yeow Yeoh (1): > mac80211: fix the problem of forwarding from DS to DS in Mesh > > Dor Shaish (1): > iwlwifi: mvm: Remove testing of static PIC in PhyDB > > Felix Fietkau (6): > mac80211: fix idle handling in monitor mode > mac80211: fix monitor mode channel reporting > ath9k: fix RSSI dummy marker value > ath9k_htc: fix signal strength handling issues > ath9k_hw: improve reset reliability after errors > rt2x00: error in configurations with mesh support disabled > > Hauke Mehrtens (1): > bcma: init spin lock > > Johannes Berg (6): > mac80211: fix tim_lock locking > nl80211: remove radar information > nl80211: remove TCP WoWLAN information > iwlwifi: always copy first 16 bytes of commands > iwlwifi: mvm: fix AP/GO mode station removal > iwlwifi: fix wakeup status query and packet reporting > > John W. Linville (2): > Merge branch 'for-john' of > git://git.kernel.org/.../iwlwifi/iwlwifi-fixes > Merge branch 'master' of git://git.kernel.org/.../linville/wireless > into for-davem > > Seth Forshee (1): > mac80211: Ensure off-channel frames don't get queued > > drivers/bcma/driver_pci_host.c| 2 + > drivers/net/wireless/ath/ath9k/common.h | 2 +- > drivers/net/wireless/ath/ath9k/htc.h | 1 + > drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 18 +++-- > drivers/net/wireless/ath/ath9k/hw.c | 4 +- > drivers/net/wireless/iwlwifi/iwl-devtrace.h | 10 +-- > drivers/net/wireless/iwlwifi/iwl-phy-db.c | 16 > drivers/net/wireless/iwlwifi/mvm/d3.c | 104 > +++--- > drivers/net/wireless/iwlwifi/mvm/mac80211.c | 19 +++-- > drivers/net/wireless/iwlwifi/mvm/mvm.h| 4 + > drivers/net/wireless/iwlwifi/pcie/internal.h | 9 +++ > drivers/net/wireless/iwlwifi/pcie/tx.c| 75 ++- > drivers/net/wireless/libertas/if_sdio.c | 6 +- > drivers/net/wireless/mwifiex/pcie.c | 2 +- > drivers/net/wireless/rt2x00/rt2x00dev.c | 8 +- > net/mac80211/cfg.c| 12 ++- > net/mac80211/iface.c | 2 +- > net/mac80211/tx.c
pull request: wireless 2013-04-08
Dave,
Please consider this set of fixes for the 3.9 stream...
For the cfg80211 fix, Johannes says:
"I have another straggler for 3.9, adding locking forgotten in a previous
fix."
On top of that:
Bing Zhao provides an mwifiex fix to properly order a scan completion.
Franky Lin gives us a brcmfmac fix to fail at the firmware loading
stage if the nvram cannot be downloaded.
Gabor Juhos brings what at first looks like a rather big rt2x00 patch.
I think it is OK because it is really just reorganizing some code
within the rt2x00 driver in order to fix a build failure.
Hante Meuleman offers a trio of brcmfmac fixes related to running in
AP mode.
Robert Shade sends an ath9k fix to reenable interrupts even if a
channel change fails.
Tim Gardner gives us an rt2x00 fix to cut-down on some log SPAM.
Please let me know if there are problems!
Thanks,
John
---
The following changes since commit b50b72de2f2feed4adfbd8e18610a393b5a04cc7:
net: mvneta: enable features before registering the driver (2013-04-08
12:16:38 -0400)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git for-davem
for you to fetch changes up to 64e5751918b4d03015b185750a46ecd050e1ce77:
Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
(2013-04-08 14:26:57 -0400)
Artem Savkov (1):
cfg80211: sched_scan_mtx lock in cfg80211_conn_work()
Bing Zhao (1):
mwifiex: complete last internal scan
Franky Lin (1):
brcmfmac: do not proceed if fail to download nvram to dongle
Gabor Juhos (1):
rt2x00: rt2x00pci: fix build error on Ralink RT3x5x SoCs
Hante Meuleman (3):
brcmfmac: fix tkip mic tx/rx ap swap bug.
brcmfmac: fix stopping AP.
brcmfmac: fix returning cipher_suite for get_key operation.
John W. Linville (2):
Merge branch 'for-john' of git://git.kernel.org/.../jberg/mac80211
Merge branch 'master' of git://git.kernel.org/.../linville/wireless into
for-davem
Robert Shade (1):
ath9k: Re-enable interrupts after a channel change failure
Tim Gardner (1):
rt2x00: rt2x00pci_regbusy_read() - only print register access failure once
drivers/net/wireless/ath/ath9k/main.c | 4 +
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 6 +-
.../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 46 +++--
drivers/net/wireless/mwifiex/scan.c| 11 +-
drivers/net/wireless/rt2x00/Kconfig| 7 +
drivers/net/wireless/rt2x00/Makefile | 1 +
drivers/net/wireless/rt2x00/rt2400pci.c| 1 +
drivers/net/wireless/rt2x00/rt2500pci.c| 1 +
drivers/net/wireless/rt2x00/rt2800pci.c| 1 +
drivers/net/wireless/rt2x00/rt2x00mmio.c | 216 +
drivers/net/wireless/rt2x00/rt2x00mmio.h | 119
drivers/net/wireless/rt2x00/rt2x00pci.c| 176 -
drivers/net/wireless/rt2x00/rt2x00pci.h| 88 -
drivers/net/wireless/rt2x00/rt61pci.c | 1 +
net/wireless/sme.c | 2 +
15 files changed, 390 insertions(+), 290 deletions(-)
create mode 100644 drivers/net/wireless/rt2x00/rt2x00mmio.c
create mode 100644 drivers/net/wireless/rt2x00/rt2x00mmio.h
diff --git a/drivers/net/wireless/ath/ath9k/main.c
b/drivers/net/wireless/ath/ath9k/main.c
index 6e66f9c..988372d 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -280,6 +280,10 @@ static int ath_reset_internal(struct ath_softc *sc, struct
ath9k_channel *hchan)
if (r) {
ath_err(common,
"Unable to reset channel, reset status %d\n", r);
+
+ ath9k_hw_enable_interrupts(ah);
+ ath9k_queue_reset(sc, RESET_TYPE_BB_HANG);
+
goto out;
}
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
index 4469321..35fc68b 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
@@ -3317,15 +3317,15 @@ static int _brcmf_sdbrcm_download_firmware(struct
brcmf_sdio *bus)
goto err;
}
- /* External image takes precedence if specified */
if (brcmf_sdbrcm_download_code_file(bus)) {
brcmf_err("dongle image file download failed\n");
goto err;
}
- /* External nvram takes precedence if specified */
- if (brcmf_sdbrcm_download_nvram(bus))
+ if (brcmf_sdbrcm_download_nvram(bus)) {
brcmf_err("dongle nvram file download failed\n");
+ goto err;
+ }
/* Take arm out of reset */
if (brcmf_
pull request: wireless 2013-05-10
Dave,
Here is a batch of fixes intended for the 3.10 stream.
Amitkumar Karwar provides an mwifiex fix to plug a memory leak when
the driver is unloaded.
Bing Zhao brings an mwifiex fix for some flag handling that leads to
log spam and an unusable interface.
Daniel Drake offers an mwifiex fix for multicast filter setup, to
correctly implement wakeup behaviour for multicast WOL.
Felix Fietkau fixes an ath9k problem that produces logspam and keycache
errors due to a bad return code.
Stanislaw Gruszka produces an fix for a WARNING from ath5k, and an
iwl4965 workaround to stop advertising a feature that doesn't work with
the current mac80211 implementation.
Sujith Manoharan gives us an ath9k fix to reprogram the HW beacon timers
after a TSF update, and an initvals fix for the AR9565 device.
Thommy Jakobsson fixes an rx descriptor underrun on b43.
Please let me know if there are problems!
John
---
The following changes since commit 70eba4226d9718946941c7be0c8cb66d431e7686:
Merge tag 'please-pull-pstore' of
git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux (2013-05-09 16:42:10
-0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git for-davem
for you to fetch changes up to 4f81d715b90b7ebe049dd906511c47956086ad44:
Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
(2013-05-10 10:29:24 -0400)
Amitkumar Karwar (1):
mwifiex: fix memory leak issue when driver unload
Bing Zhao (1):
mwifiex: clear is_suspended flag when interrupt is received early
Daniel Drake (1):
mwifiex: fix setting of multicast filter
Felix Fietkau (1):
ath9k: fix key allocation error handling for powersave keys
John W. Linville (1):
Merge branch 'master' of git://git.kernel.org/.../linville/wireless into
for-davem
Stanislaw Gruszka (2):
ath5k: do not reschedule tx_complete_work on stop
iwl4965: workaround connection regression on passive channel
Sujith Manoharan (2):
ath9k: Fix beacon reconfiguration
ath9k: Update initvals for AR9565
Thommy Jakobsson (1):
B43: Handle DMA RX descriptor underrun
drivers/net/wireless/ath/ath5k/base.c | 5 +
.../net/wireless/ath/ath9k/ar9565_1p0_initvals.h | 138 +++--
drivers/net/wireless/ath/ath9k/main.c | 10 +-
drivers/net/wireless/b43/dma.c | 19 +++
drivers/net/wireless/b43/dma.h | 4 +-
drivers/net/wireless/b43/main.c| 43 +++
drivers/net/wireless/iwlegacy/4965-mac.c | 3 +-
drivers/net/wireless/mwifiex/cfg80211.c| 3 -
drivers/net/wireless/mwifiex/cmdevt.c | 1 +
drivers/net/wireless/mwifiex/main.c| 1 +
drivers/net/wireless/mwifiex/sta_ioctl.c | 21 +---
11 files changed, 131 insertions(+), 117 deletions(-)
diff --git a/drivers/net/wireless/ath/ath5k/base.c
b/drivers/net/wireless/ath/ath5k/base.c
index 9b20d9e..7f702fe 100644
--- a/drivers/net/wireless/ath/ath5k/base.c
+++ b/drivers/net/wireless/ath/ath5k/base.c
@@ -2369,6 +2369,9 @@ ath5k_tx_complete_poll_work(struct work_struct *work)
int i;
bool needreset = false;
+ if (!test_bit(ATH_STAT_STARTED, ah->status))
+ return;
+
mutex_lock(&ah->lock);
for (i = 0; i < ARRAY_SIZE(ah->txqs); i++) {
@@ -2676,6 +2679,7 @@ done:
mmiowb();
mutex_unlock(&ah->lock);
+ set_bit(ATH_STAT_STARTED, ah->status);
ieee80211_queue_delayed_work(ah->hw, &ah->tx_complete_work,
msecs_to_jiffies(ATH5K_TX_COMPLETE_POLL_INT));
@@ -2737,6 +2741,7 @@ void ath5k_stop(struct ieee80211_hw *hw)
ath5k_stop_tasklets(ah);
+ clear_bit(ATH_STAT_STARTED, ah->status);
cancel_delayed_work_sync(&ah->tx_complete_work);
if (!ath5k_modparam_no_hw_rfkill_switch)
diff --git a/drivers/net/wireless/ath/ath9k/ar9565_1p0_initvals.h
b/drivers/net/wireless/ath/ath9k/ar9565_1p0_initvals.h
index 0c2ac0c..e85a8b0 100644
--- a/drivers/net/wireless/ath/ath9k/ar9565_1p0_initvals.h
+++ b/drivers/net/wireless/ath/ath9k/ar9565_1p0_initvals.h
@@ -233,9 +233,9 @@ static const u32 ar9565_1p0_baseband_core[][2] = {
{0x9d10, 0x01834061},
{0x9d14, 0x00c00400},
{0x9d18, 0x},
- {0x9e08, 0x0078230c},
- {0x9e24, 0x990bb515},
- {0x9e28, 0x126f},
+ {0x9e08, 0x0038230c},
+ {0x9e24, 0x9907b515},
+ {0x9e28, 0x126f0600},
{0x9e30, 0x06336f77},
{0x9e34, 0x6af6532f},
{0x9e38, 0x0cc80c00},
@@ -337,7 +337,7 @@ static const u32 ar9565_1p0_baseband_core[][2] = {
static const u32 ar9565_1p0_baseband_po
pull request: wireless-next 2013-04-29
Dave, A few more stragglers intended for 3.10... For the Bluetooth bits, Gustavo says: "A few more patches intended for 3.10, the most important one is the support in btusb for fw loading for the Intel Bluetooth device. Other than that we have only fixes and clean ups." For the iwlwifi bits, Johannes says: "Here are a few more changes for the 3.10 stream, some bugfixes, adjustments to some powersave parameters and a new device ID." For the NFC bits, Samuel says: "This pull request includes Marcel's Kconfig dependency fix on top of the LLCP code move to net/nfc." On top of that...Yogesh Ashok Powar provides a few PCI-related mwifiex updates, Hauke Mehrtens provides a small ssb feature for spurious tone avoidance on a specific chip, and Larry Finger provides a small rtlwifi fix related to avoiding false detection of AP loss. Please let me know if there are problems! Thanks, John --- The following changes since commit 94dace10142790ddeb0a3a7b8b33d9540d30c79f: cxgb4vf: Support CPL_SGE_EGR_UPDATEs encapsulated in a CPL_FW4_MSG (2013-04-29 15:24:44 -0400) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next.git for-davem for you to fetch changes up to 17a2911f3395d66694fcbd2e8970015904d9b034: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem (2013-04-29 15:31:57 -0400) Alexander Bondar (2): iwlwifi: mvm: change TX/RX AM-to-PSM transition time for LP mode iwlwifi: mvm: remove usage of power_save module parameter Andreas Fenkart (2): Bluetooth: btmrvl: release lock while waiting for fw download complete Bluetooth: btmrvl: report error if verify_fw_download times out Andy Shevchenko (1): Bluetooth: btmrvl: use native helpers for debugfs Emmanuel Grumbach (4): iwlwifi: mvm: remove TODO which has been addressed iwlwifi: mvm: fix first_antenna iwlwifi: dvm: don't send zeroed LQ cmd iwlwifi: add a subdevice ID for 7000 series Fengguang Wu (1): Bluetooth: hci_get_cmd_complete() can be static Gustavo Padovan (1): Bluetooth: remove unneeded var initialization in btmrvl Hauke Mehrtens (1): ssb: implement ssb spuravoid for chipid BCM43222 Johan Hedberg (2): Bluetooth: Fix HCI command send functions to use const specifier Bluetooth: Fix sending write_le_host_supporte for LE-only controllers John W. Linville (4): Merge branch 'for-upstream' of git://git.kernel.org/.../bluetooth/bluetooth-next Merge branch 'for-john' of git://git.kernel.org/.../iwlwifi/iwlwifi-next Merge tag 'nfc-next-3.10-4' of git://git.kernel.org/.../sameo/nfc-next Merge branch 'master' of git://git.kernel.org/.../linville/wireless-next into for-davem Larry Finger (1): rtlwifi: rtl8192cu: Fix false loss of AP indication Marcel Holtmann (2): Bluetooth: Remove unneeded parameter from L2CAP ATT channel handling NFC: Add missing RFKILL dependency for Kconfig Piotr Haber (1): brcmsmac: Fix merge issue Samuel Ortiz (1): NFC: Move LLCP code to the NFC top level diirectory Stanislaw Gruszka (3): iwlwifi: fix freeing uninitialized pointer iwlwifi: remove redundant argument from iwl_dump_nic_event_log iwlwifi: remove unneeded goto from iwl_dbgfs_log_event_read Tedd Ho-Jeong An (1): Bluetooth: Add support for Intel Bluetooth device [8087:07dc] Yogesh Ashok Powar (4): mwifiex: Use pci_release_region() instead of a pci_release_regions() mwifiex: Call pci_release_region after calling pci_disable_device mwifiex: Do not kfree cmd buf while unregistering PCIe mwifiex: Correct pci_unmap_single's size drivers/bluetooth/btmrvl_debugfs.c | 266 ++- drivers/bluetooth/btmrvl_sdio.c| 41 ++- drivers/bluetooth/btusb.c | 377 + .../net/wireless/brcm80211/brcmsmac/mac80211_if.c | 1 + drivers/net/wireless/iwlwifi/dvm/agn.h | 2 +- drivers/net/wireless/iwlwifi/dvm/debugfs.c | 16 +- drivers/net/wireless/iwlwifi/dvm/main.c| 6 +- drivers/net/wireless/iwlwifi/dvm/sta.c | 5 +- drivers/net/wireless/iwlwifi/mvm/mac80211.c| 2 +- drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c| 5 - drivers/net/wireless/iwlwifi/mvm/power.c | 16 +- drivers/net/wireless/iwlwifi/mvm/utils.c | 5 +- drivers/net/wireless/iwlwifi/pcie/drv.c| 1 + drivers/net/wireless/mwifiex/pcie.c| 9 +- drivers/net/wireless/rtlwifi/usb.c | 3 + drivers/ssb/driver_chipcommon_pmu.c| 19 +- include/net/bluetooth/hci_core.h | 14 +- net/bluetooth/hci_core
pull request: wireless 2013-05-20
Dave, This pull request is intended for the 3.10 series. It contains a variety of fixes for problems discovered during the merge window and after 3.10-rc1. For the mac80211 bits, Johannes says the following: "This is what I have: * a patch from Felix to fix RCU usage in his rate table code * a patch from Ilan to add the wdev id to some notifications so they can actually be used by userspace * Sasha Levin found an issue in how hwsim handles devices * a fix for a bug in the wiphy_register() error path that's been there forever * three fixes for WoWLAN * AP mode frame matching was erroneously giving frames to all virtual AP interfaces (reported by Jouni) * a fix for HT handling in my CSA changes, found by Sujith * a fix for some locking simplifications gone wrong * Ben Greear found more cfg80211/mac80211 state confusion * and a fix for another bug found by Jouni: local state changes need to be reported by mac80211 to cfg80211 so it disconnects properly." And for the iwlwifi bits, he says: "I have fixes for a firmware crash during resume, multicast RX, aggregation and a workaround for a firmware scanning bug." Along with those... Albert Pool adds a USB ID to the rtl8192cu driver. Arend van Spriel restores a driver option support flag that had been removed from 3.9 due to a bug in that version of the driver. Felix Fietkau fixes a trio of ath9k issues with a series of small patches. Geert Uytterhoeven provides a Kconfig fix for ath9k (which you also merged, so it isn't in the diff here). Larry Finger gives us a fix for a build warning on big-endian systems for rtlwifi. Rafał Miłecki adds some core IDs to the bcma driver. Sujith Manoharan fixes a module unloading crash in ath9k, and corrects some calibration settings for AR9485. Please let me know if there are problems! Thanks, John --- The following changes since commit 057cf65e4f715f62acccbd9125cf63eddfe69d30: bnx2x: Fix GSO for 57710/57711 chips (2013-05-20 00:56:57 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git for-davem for you to fetch changes up to ba7c96bec59d1c11cf9eaf6489e70e22f53da31b: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem (2013-05-20 15:19:01 -0400) Albert Pool (1): rtlwifi: rtl8192cu: Add new USB ID Alexander Bondar (1): iwlwifi: mvm: Prevent setting assoc flag in MAC_CONTEXT_CMD Arend van Spriel (1): brcmfmac: announce P2P_DEVICE support in wiphy structure Denis Efremov (1): iwlegacy: remove inline marking of EXPORT_SYMBOL functions Emmanuel Grumbach (2): iwlwifi: mvm: tell firmware to let multicast frames in iwlwifi: mvm: fix aggregation drain flow Felix Fietkau (4): mac80211: fix spurious RCU warning and update documentation ath9k: fix aggregation stop/flush handling ath9k: fix rate handling/reporting ath9k: fix draining aggregation tid buffers Geert Uytterhoeven (1): net/wireless: ATH9K should depend on HAS_DMA Ilan Peer (2): nl80211: Add wdev identifier to some nl80211 notifications iwlwifi: mvm: Always use SCAN_TYPE_FORCED Johannes Berg (9): cfg80211: fix wiphy_register error path cfg80211: fix WoWLAN wakeup tracing mac80211: fix IEEE80211_SDATA_DISCONNECT_RESUME mac80211: fix HT beacon-based channel switch handling mac80211: use just spin_lock() in ieee80211_get_tkip_p2k() mac80211: fix AP-mode frame matching cfg80211: fix interface down/disconnect state handling mac80211: report deauth to cfg80211 for local state change cfg80211: fix sending WoWLAN TCP wakeup settings John W. Linville (2): Merge branch 'for-john' of git://git.kernel.org/.../iwlwifi/iwlwifi-fixes Merge branch 'master' of git://git.kernel.org/.../linville/wireless into for-davem Larry Finger (1): rtlwifi: rtl8188ee: Fix warning when building on big-endian systems Rafał Miłecki (1): bcma: add more core IDs Sasha Levin (1): mac80211_hwsim: correctly register the platform driver Sujith Manoharan (2): ath9k: Fix crash on module unload ath9k_hw: Enable manual peak calibration for AR9485 drivers/bcma/scan.c| 2 + drivers/net/wireless/ath/ath9k/ar9003_calib.c | 2 +- drivers/net/wireless/ath/ath9k/ar9485_initvals.h | 2 +- drivers/net/wireless/ath/ath9k/ath9k.h | 4 +- drivers/net/wireless/ath/ath9k/debug.c | 8 +++ drivers/net/wireless/ath/ath9k/debug.h | 5 ++ drivers/net/wireless/ath/ath9k/init.c | 10 ++- drivers/net/wireless/ath/ath9k/main.c | 8 ++- drivers/net/wireless/ath/ath9k/xmit.c | 74 ++ .../net/wireless/brcm80211/brcmfmac/wl
Re: [PATCH regression/bisected] Revert "brcmsmac: support 4313iPA"
On Tue, Mar 26, 2013 at 10:31:00AM +0100, Piotr Haber wrote: > On 03/25/13 19:58, John W. Linville wrote: > > On Mon, Mar 18, 2013 at 02:58:08PM +0100, David Herrmann wrote: > >> Hi Piotr > >> > >> On Mon, Mar 18, 2013 at 2:49 PM, Piotr Haber wrote: > >>> On 03/18/13 11:45, David Herrmann wrote: > >>>> This reverts commit b6fc28a158076ca2764edc9a6d1e1402f56e1c0c. It breaks > >>>> wireless AP reconnection on: (14e4:4727) > >>>> Broadcom Corporation BCM4313 802.11b/g/n Wireless LAN Controller > >>>> > >>>> Any attempt to reconnect to an AP results in timeouts no matter how near > >>>> to the > >>>> AP I am: > >>>> 00:10:40 $nb kernel: wlan0: authenticate with 00:18:39:0a:8e:23 > >>>> 00:10:40 $nb kernel: wlan0: direct probe to 00:18:39:0a:8e:23 (try 1/3) > >>>> 00:10:40 $nb kernel: wlan0: direct probe to 00:18:39:0a:8e:23 (try 2/3) > >>>> 00:10:41 $nb kernel: wlan0: direct probe to 00:18:39:0a:8e:23 (try 3/3) > >>>> 00:10:41 $nb kernel: wlan0: authentication with 00:18:39:0a:8e:23 timed > >>>> out > >>>> --- > >>>> Hi > >>>> > >>>> I tried coming up with a fix instead of reverting this commit, but the > >>>> commit is > >>>> way to big for me to understand what's going on. Sorry. > >>>> > >>>> With linux-3.8 connecting to an AP broke on my machine. I could connect > >>>> to an AP > >>>> one time, but any further attempt resulted in: > >>>> 00:10:40 $nb kernel: wlan0: authenticate with 00:18:39:0a:8e:23 > >>>> 00:10:40 $nb kernel: wlan0: direct probe to 00:18:39:0a:8e:23 (try 1/3) > >>>> 00:10:40 $nb kernel: wlan0: direct probe to 00:18:39:0a:8e:23 (try 2/3) > >>>> 00:10:41 $nb kernel: wlan0: direct probe to 00:18:39:0a:8e:23 (try 3/3) > >>>> 00:10:41 $nb kernel: wlan0: authentication with 00:18:39:0a:8e:23 timed > >>>> out > >>>> > >>>> Even sitting right next to the AP didn't help so I started bisecting and > >>>> it > >>>> turned out to be: > >>>> "brcmsmac: support 4313iPA" b6fc28a158076ca2764edc9a6d1e1402f56e1c0c > >>>> Please revert it. > >>>> > >>>> Thanks > >>>> David > >>>> > >>> Hi, > >>> unfortunately this is not a first report of this patch breaking 4313 for > >>> some users. > >>> I'm pretty confident that it is hardware revision related as we have > >>> 4313ePA and iPA boards running > >>> successfully in our test setup. > >>> Could you aid us in effort of finding the problem by supplying the > >>> contents of this debugfs file: > >>> /brcmsmac/bcma0:0/hardware > >> > >> Hi > >> > >> $ cat /sys/kernel/debug/brcmsmac/bcma0\:0/hardware > >> board vendor: 185f > >> board type: 51a > >> board revision: 1408 > >> board flags: 8402a01 > >> board flags2: 880 > >> firmware revision: 262032b > >> > >> I can also try partial reverts of that commit, but I really don't know > >> which parts might be important. > > > > Are we going to see a fix for this (very) soon? Or should I just go > > ahead and revert this patch? > > > I cannot reproduce the issue on a set of devices we have here (3 different > 4313 ePA models). > Some of the devices that are reported to be broken are being shipped to us. > So I would say we need around 2 weeks at least to resolve this (if we > reproduce the problem and find > a fix). > Not sure this is soon enough. > If not please go ahead an revert the patch. I am reverting the patch. -- John W. LinvilleSomeday the world will need a hero, and you linvi...@tuxdriver.com might be all we have. Be ready. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH regression/bisected] Revert "brcmsmac: support 4313iPA"
On Wed, Mar 27, 2013 at 04:32:28PM +0100, David Herrmann wrote: > Hi John > > On Wed, Mar 27, 2013 at 3:56 PM, John W. Linville > wrote: > > On Tue, Mar 26, 2013 at 10:31:00AM +0100, Piotr Haber wrote: > >> On 03/25/13 19:58, John W. Linville wrote: > >> > On Mon, Mar 18, 2013 at 02:58:08PM +0100, David Herrmann wrote: > >> >> Hi Piotr > >> >> > >> >> On Mon, Mar 18, 2013 at 2:49 PM, Piotr Haber > >> >> wrote: > >> >>> On 03/18/13 11:45, David Herrmann wrote: > >> >>>> This reverts commit b6fc28a158076ca2764edc9a6d1e1402f56e1c0c. It > >> >>>> breaks > >> >>>> wireless AP reconnection on: (14e4:4727) > >> >>>> Broadcom Corporation BCM4313 802.11b/g/n Wireless LAN Controller > >> >>>> > >> >>>> Any attempt to reconnect to an AP results in timeouts no matter how > >> >>>> near to the > >> >>>> AP I am: > >> >>>> 00:10:40 $nb kernel: wlan0: authenticate with 00:18:39:0a:8e:23 > >> >>>> 00:10:40 $nb kernel: wlan0: direct probe to 00:18:39:0a:8e:23 (try > >> >>>> 1/3) > >> >>>> 00:10:40 $nb kernel: wlan0: direct probe to 00:18:39:0a:8e:23 (try > >> >>>> 2/3) > >> >>>> 00:10:41 $nb kernel: wlan0: direct probe to 00:18:39:0a:8e:23 (try > >> >>>> 3/3) > >> >>>> 00:10:41 $nb kernel: wlan0: authentication with 00:18:39:0a:8e:23 > >> >>>> timed out > >> >>>> --- > >> >>>> Hi > >> >>>> > >> >>>> I tried coming up with a fix instead of reverting this commit, but > >> >>>> the commit is > >> >>>> way to big for me to understand what's going on. Sorry. > >> >>>> > >> >>>> With linux-3.8 connecting to an AP broke on my machine. I could > >> >>>> connect to an AP > >> >>>> one time, but any further attempt resulted in: > >> >>>> 00:10:40 $nb kernel: wlan0: authenticate with 00:18:39:0a:8e:23 > >> >>>> 00:10:40 $nb kernel: wlan0: direct probe to 00:18:39:0a:8e:23 (try > >> >>>> 1/3) > >> >>>> 00:10:40 $nb kernel: wlan0: direct probe to 00:18:39:0a:8e:23 (try > >> >>>> 2/3) > >> >>>> 00:10:41 $nb kernel: wlan0: direct probe to 00:18:39:0a:8e:23 (try > >> >>>> 3/3) > >> >>>> 00:10:41 $nb kernel: wlan0: authentication with 00:18:39:0a:8e:23 > >> >>>> timed out > >> >>>> > >> >>>> Even sitting right next to the AP didn't help so I started bisecting > >> >>>> and it > >> >>>> turned out to be: > >> >>>> "brcmsmac: support 4313iPA" b6fc28a158076ca2764edc9a6d1e1402f56e1c0c > >> >>>> Please revert it. > >> >>>> > >> >>>> Thanks > >> >>>> David > >> >>>> > >> >>> Hi, > >> >>> unfortunately this is not a first report of this patch breaking 4313 > >> >>> for some users. > >> >>> I'm pretty confident that it is hardware revision related as we have > >> >>> 4313ePA and iPA boards running > >> >>> successfully in our test setup. > >> >>> Could you aid us in effort of finding the problem by supplying the > >> >>> contents of this debugfs file: > >> >>> /brcmsmac/bcma0:0/hardware > >> >> > >> >> Hi > >> >> > >> >> $ cat /sys/kernel/debug/brcmsmac/bcma0\:0/hardware > >> >> board vendor: 185f > >> >> board type: 51a > >> >> board revision: 1408 > >> >> board flags: 8402a01 > >> >> board flags2: 880 > >> >> firmware revision: 262032b > >> >> > >> >> I can also try partial reverts of that commit, but I really don't know > >> >> which parts might be important. > >> > > >> > Are we going to see a fix for this (very) soon? Or should I just go > >> > ahead and revert this patch? > >> > > >> I cannot reproduce the issue on a set of devices we have here (3 different > >> 4313 ePA models). > >> Some of the devices that are reported to be broken are being shipped to us. > >> So I would say we need around 2 weeks at least to resolve this (if we > >> reproduce the problem and find > >> a fix). > >> Not sure this is soon enough. > >> If not please go ahead an revert the patch. > > > > I am reverting the patch. > > Can you CC stable? Otherwise I will try to sent it to them after you applied > it. Sorry, I already pushed it out to kernel.org. I would prefer not to modify my repository now. -- John W. LinvilleSomeday the world will need a hero, and you linvi...@tuxdriver.com might be all we have. Be ready. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [v3.8, v3.9] [Regression] brcmsmac: move PHY functions
On Fri, Mar 29, 2013 at 03:52:39PM -0400, Joseph Salisbury wrote: > Hi Piotr, > > A bug was opened against the Ubuntu kernel[0]. After a kernel > bisect, it was found that reverting the following commit resolved > this bug: > > commit b83576341664957978e125f5f5db2f15496980b1 > Author: Piotr Haber > Date: Wed Nov 28 21:44:09 2012 +0100 > > brcmsmac: move PHY functions > > The regression was introduced as of v3.8-rc1. The regression still > exists in v3.9-rc4. > > I see that you are the author of this patch, so I wanted to run this > by you. I was thinking of requesting a revert for v3.9, but I > wanted to get your feedback first. > > > Thanks, > > Joe > > [0] http://pad.lv/1131914 I recently reverted b6fc28a1, which is the follow-on to that patch. The revert is _not_ in 3.9-rc5. Could you try reverting that patch instead? Does that fix the issue for you? John -- John W. LinvilleSomeday the world will need a hero, and you linvi...@tuxdriver.com might be all we have. Be ready. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
pull request: wireless 2013-03-06
Dave, This time just passing along a big batch of fixes from Johannes... For the mac80211 bits: "Here I have fixes from Ben Greear for stray work items when deleting interfaces, another idle handling fix from Felix, a fix from Marco ro a mesh PS buffering crash and I have a fix for the VHT MCS calculation in association request frames and more nl80211 feature advertising removal as well as a workaround to increase the dump size if the SKB overhead is too large. For 3.10 I already have a complete fix queued, but that also requires (simple) userspace changes." And for the iwlwifi bits: "The patches from Dor fix a bunch of calibration issues in the new MVM driver, and Emmanuel has a number of fixes there as well. Also, we decided to disable 8k A-MSDU by default, so that's in there. My own patches are addressing an issue we found with the new devices but that seems to also exist on older ones, the DMA writeback the devices do can be delayed and cause issues. The fix is unfortunately relatively large and depends on two other changes (to not be hugely conflicting), but I think it's still worth it at this point." As Johannes says, it is a bit large. But I hope it is still early enough in the cycle to make that worthwhile. Please let me know if there are problems! John --- The following changes since commit 66d29cbc59433ba538922a9e958495156b31b83b: benet: Wait f/w POST until timeout (2013-03-06 02:47:06 -0500) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git for-davem for you to fetch changes up to 32cdd592b723fc88ecca699e550197cd48bb4ad6: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem (2013-03-06 10:21:17 -0500) Ben Greear (2): mac80211: stop timers before canceling work items mac80211: Fix crash due to un-canceled work-items Dor Shaish (3): iwlwifi: mvm: Set valid TX antennas value before calib request iwlwifi: mvm: Take the phy_cfg from the TLV value iwlwifi: mvm: Remove overriding calibrations for the 7000 family Emmanuel Grumbach (5): iwlwifi: disable 8K A-MSDU by default iwlwifi: mvm: restart the NIC of the cmd queue gets full iwlwifi: mvm: ignore STOP_AGG when restarting iwlwifi: mvm: update the rssi calculation iwlwifi: mvm: don't warn on normal BAR sending Felix Fietkau (1): mac80211: another fix for idle handling in monitor mode Johannes Berg (7): nl80211: remove channel width and extended capa advertising mac80211: really fix monitor mode channel reporting iwlwifi: don't map complete commands bidirectionally iwlwifi: rename IWL_MAX_CMD_TFDS to IWL_MAX_CMD_TBS_PER_TFD iwlwifi: use coherent DMA memory for command header nl80211: increase wiphy dump size dynamically mac80211: fix VHT MCS calculation John W. Linville (3): Merge branch 'for-john' of git://git.kernel.org/.../jberg/mac80211 Merge branch 'for-john' of git://git.kernel.org/.../iwlwifi/iwlwifi-fixes Merge branch 'master' of git://git.kernel.org/.../linville/wireless into for-davem Marco Porsch (1): mac80211: fix oops on mesh PS broadcast forwarding drivers/net/wireless/iwlwifi/dvm/sta.c | 2 +- drivers/net/wireless/iwlwifi/iwl-devtrace.h | 2 +- drivers/net/wireless/iwlwifi/iwl-drv.c | 3 +- drivers/net/wireless/iwlwifi/iwl-modparams.h | 2 +- drivers/net/wireless/iwlwifi/iwl-trans.h | 20 +- drivers/net/wireless/iwlwifi/mvm/fw-api.h| 18 +- drivers/net/wireless/iwlwifi/mvm/fw.c| 133 +- drivers/net/wireless/iwlwifi/mvm/mvm.h | 3 +- drivers/net/wireless/iwlwifi/mvm/ops.c | 18 +- drivers/net/wireless/iwlwifi/mvm/rx.c| 37 ++-- drivers/net/wireless/iwlwifi/mvm/sta.c | 10 + drivers/net/wireless/iwlwifi/mvm/tx.c| 6 +- drivers/net/wireless/iwlwifi/pcie/internal.h | 34 +++- drivers/net/wireless/iwlwifi/pcie/rx.c | 14 +- drivers/net/wireless/iwlwifi/pcie/tx.c | 266 +-- net/mac80211/cfg.c | 21 ++- net/mac80211/iface.c | 6 + net/mac80211/mlme.c | 28 ++- net/mac80211/tx.c| 3 +- net/wireless/core.c | 3 +- net/wireless/nl80211.c | 51 +++-- 21 files changed, 299 insertions(+), 381 deletions(-) diff --git a/drivers/net/wireless/iwlwifi/dvm/sta.c b/drivers/net/wireless/iwlwifi/dvm/sta.c index 94ef338..b775769 100644 --- a/drivers/net/wireless/iwlwifi/dvm/sta.c +++ b/drivers/net/wireless/iwlwifi/dvm/sta.c @@ -151,7 +151,7 @@ int iwl_send_add_sta(struct iwl_priv *priv, sta_id, sta->sta.addr, flags &
Re: [Announce] open ath9k_htc firmware
Awesome news! Many thanks to Adrian, Luis, and all the others they have credited with helping this along! John On Fri, Mar 08, 2013 at 03:46:38PM -0800, Luis R. Rodriguez wrote: > Many thanks to Adrian for his hard work on all this and to everyone > else who volunteered to help make this happen, including the > understanding by our management at QCA and even Tensilica requires > some handsome applause for their commitment, understanding on letting > us get this out. We now have a public mailing list for development: > > http://lists.infradead.org/mailman/listinfo/ath9k_htc_fw > > Full steam ahead! > > Luis > > On Fri, Mar 8, 2013 at 3:32 PM, Adrian Chadd wrote: > > Hi, > > > > I hate fanfare. > > > > You can all thank Luis Rodriguez for his ridiculously long and hard > > fighting to get this stuff pushed through the grinder to make this > > happen. > > > > There's also been a hard working team of developers behind the scene - > > Felix Fietkau, Eugene Krasnikov, Sujith Manoharan, and the team from > > Cozybit. They've been working hard to get the codebase converted over > > to using the open source tensilica toolchain and finding/fixing up any > > silly issues that may creep up from that. > > > > I've just been involved in shepharding this stuff into a sensible > > shape and pushing it through the final stage (legal review) before > > publication. > > > > You can find it here: > > > > https://github.com/qca/open-ath9k-htc-firmware > > > > There's a bunch of sorely needed work to do in the short term: > > > > * felix has a replacement cmake build system that I'd like to now integrate; > > * there's lots of build warnings which need to be removed (and then > > build this thing using -Wall -Werror); > > * some general code cleanup and documentation wouldn't be rejected - > > but I don't really want any sweeping code changes to go in until we've > > tidied up the build warnings and validated that the image(s) work > > right. > > > > I plan on doing some test builds shortly. I plan on bumping the > > firmware to 1.4 once felix's cmake system is in place and people have > > validated that this work.s > > > > Thanks, > > > > > > > > Adrian > > -- > > To unsubscribe from this list: send the line "unsubscribe linux-wireless" in > > the body of a message to majord...@vger.kernel.org > > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majord...@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ > -- John W. LinvilleSomeday the world will need a hero, and you linvi...@tuxdriver.com might be all we have. Be ready. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
pull request: wireless 2012-08-03
commit d4e5979c0da95791aa717c18e162540c7a596360
Dave,
This request covers a batch of fixes intended for the 3.6 stream.
Daniel Drake provides a pair of libertas fixes: one to avoid
unnecessary resets in order to keep the MMC layer happy; and another
to correct a couple of memory leaks.
Eliad Peller gives us a mac80211 fix for an issue that could fail to
notify userland of a completed scan.
Johannes Berg provides "a few fixes for various things [Johannes]
found doing code inspection for [his] multi-channel work".
Mohammed Shafi Shajakhan provides a simple hardware-enablement
(i.e. device ID) patch for ath9k.
Paul Stewart provides a cfg80211 fix to ensure that the presence of
beacons on a channel is recorded correctly.
Rafał Miłecki gives us a bcma device ID patch to support BCM43228
devices, and a b43 GPIO fix.
Seth Forshee provide a pair of patches to properly expose some
regulatory information needed by brcmsmac. This corrects a lockdep
issue created by a patch that is already in the tree.
Stanislaw Gruszka provides a regulatory code fix to correct an earlier
regression with the rt2x00 drivers.
Woody Hung offers an rt2x00 fix to correct a regression when resuming
an rt3290 device from S3/S4. This one seems big, but most of its
size comes from moving a function between two source files.
Please let me know if there are problems!
Thanks,
John
---
The following changes since commit e33cdac014d50dd9753e1399ae8b0b5cd98d7aa0:
ipv4: route.c cleanup (2012-08-02 02:54:43 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git
tags/master-2012-08-03
for you to fetch changes up to d4e5979c0da95791aa717c18e162540c7a596360:
ath9k: Add PID/VID support for AR (2012-08-03 10:11:14 -0400)
Daniel Drake (2):
libertas: don't reset card on error when it is being removed
libertas: fix two memory leaks
Eliad Peller (1):
mac80211: don't clear sched_scan_sdata on sched scan stop request
Johannes Berg (4):
mac80211: fix scan_sdata assignment
Merge remote-tracking branch 'wireless/master' into mac80211
mac80211: clear timer bits when disconnecting
mac80211: cancel mesh path timer
John W. Linville (1):
Merge branch 'for-john' of git://git.kernel.org/.../jberg/mac80211
Mohammed Shafi Shajakhan (1):
ath9k: Add PID/VID support for AR
Paul Stewart (1):
cfg80211: Clear "beacon_found" on regulatory restore
Rafał Miłecki (2):
bcma: BCM43228 support
b43: fix logic in GPIO init
Seth Forshee (2):
cfg80211: add channel flag to prohibit OFDM operation
brcmsmac: use channel flags to restrict OFDM
Stanislaw Gruszka (1):
wireless: reg: restore previous behaviour of chan->max_power calculations
Woody Hung (1):
rt2x00 : fix rt3290 resuming failed.
drivers/bcma/host_pci.c|1 +
drivers/bcma/sprom.c |4 +-
drivers/net/wireless/ath/ath9k/hw.c|1 +
drivers/net/wireless/ath/ath9k/hw.h|1 +
drivers/net/wireless/ath/ath9k/pci.c |1 +
drivers/net/wireless/b43/main.c| 21 +++---
drivers/net/wireless/brcm80211/brcmsmac/channel.c |5 +-
.../net/wireless/brcm80211/brcmsmac/mac80211_if.c |3 +-
drivers/net/wireless/libertas/cfg.c|1 +
drivers/net/wireless/libertas/if_sdio.c|1 +
drivers/net/wireless/libertas/main.c |5 +-
drivers/net/wireless/rt2x00/rt2800lib.c| 68 +++
drivers/net/wireless/rt2x00/rt2800pci.c| 71
include/linux/bcma/bcma_driver_chipcommon.h|6 ++
include/net/cfg80211.h |2 +
net/mac80211/mesh.c|3 +
net/mac80211/mlme.c|2 +
net/mac80211/scan.c|3 +-
net/wireless/reg.c | 19 +-
19 files changed, 129 insertions(+), 89 deletions(-)
diff --git a/drivers/bcma/host_pci.c b/drivers/bcma/host_pci.c
index 11b32d2..a6e5672 100644
--- a/drivers/bcma/host_pci.c
+++ b/drivers/bcma/host_pci.c
@@ -272,6 +272,7 @@ static DEFINE_PCI_DEVICE_TABLE(bcma_pci_bridge_tbl) = {
{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4331) },
{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4353) },
{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4357) },
+ { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4359) },
{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4727) },
{ 0, },
};
diff --git a/drivers/bcma/sprom.c b/drivers/bcma/sprom.c
index 26823d9..9ea4627 100644
--- a/drivers/bcma/sprom.c
+++ b/drivers/bcma/sprom.c
@@ -507,7 +507,9 @@ static bool bcma_sprom_onchip_available(struct bcma_bus
*bus)
pull request: wireless 2012-08-24
commit e72615f6abde92e961feee13e1078a1352cde4f7 Dave, This batch of fixes is intended for 3.6... Johannes Berg gives us a pair of iwlwifi fixes. One corrects some improperly defined ifdefs that lead to crashes and BUG_ONs. The other prevents attempts to read SRAM for devices that aren't actually started. Julia Lawall provides an ipw2100 fix to properly set the return code from a function call before testing it! :-) Thomas Huehn corrects the improper use of a constant related to a power setting in ath5k. Thomas Pedersen offers a mac80211 fix to properly handle destination addresses of unicast frames passing though a mesh gate. Vladimir Zapolskiy provides a brcmsmac fix to properly mark the interface state when the device goes down. Please let me know if there are problems! Thanks, John --- The following changes since commit a0dfb2634e5671770f598cda08002d8cda66ac77: af_packet: match_fanout_group() can be static (2012-08-23 09:27:12 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git for-davem for you to fetch changes up to e72615f6abde92e961feee13e1078a1352cde4f7: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem (2012-08-24 11:16:58 -0400) Johannes Berg (2): iwlwifi: fix flow handler debug code iwlwifi: protect SRAM debugfs John W. Linville (2): Merge branch 'for-john' of git://git.kernel.org/.../jberg/mac80211 Merge branch 'master' of git://git.kernel.org/.../linville/wireless into for-davem Julia Lawall (1): drivers/net/wireless/ipw2x00/ipw2100.c: introduce missing initialization Thomas Huehn (1): ath5k: fix wrong max power per rate eeprom reads for 802.11a Thomas Pedersen (1): mac80211: fix DS to MBSS address translation Vladimir Zapolskiy (1): brcm80211: smac: set interface down on reset drivers/net/wireless/ath/ath5k/eeprom.c| 2 +- drivers/net/wireless/ath/ath5k/eeprom.h| 1 + .../net/wireless/brcm80211/brcmsmac/mac80211_if.c | 3 ++ drivers/net/wireless/ipw2x00/ipw2100.c | 3 +- drivers/net/wireless/iwlwifi/dvm/debugfs.c | 3 ++ drivers/net/wireless/iwlwifi/pcie/internal.h | 2 +- drivers/net/wireless/iwlwifi/pcie/rx.c | 2 +- drivers/net/wireless/iwlwifi/pcie/trans.c | 30 + net/mac80211/tx.c | 38 +- 9 files changed, 44 insertions(+), 40 deletions(-) diff --git a/drivers/net/wireless/ath/ath5k/eeprom.c b/drivers/net/wireless/ath/ath5k/eeprom.c index 4026c90..b7e0258 100644 --- a/drivers/net/wireless/ath/ath5k/eeprom.c +++ b/drivers/net/wireless/ath/ath5k/eeprom.c @@ -1482,7 +1482,7 @@ ath5k_eeprom_read_target_rate_pwr_info(struct ath5k_hw *ah, unsigned int mode) case AR5K_EEPROM_MODE_11A: offset += AR5K_EEPROM_TARGET_PWR_OFF_11A(ee->ee_version); rate_pcal_info = ee->ee_rate_tpwr_a; - ee->ee_rate_target_pwr_num[mode] = AR5K_EEPROM_N_5GHZ_CHAN; + ee->ee_rate_target_pwr_num[mode] = AR5K_EEPROM_N_5GHZ_RATE_CHAN; break; case AR5K_EEPROM_MODE_11B: offset += AR5K_EEPROM_TARGET_PWR_OFF_11B(ee->ee_version); diff --git a/drivers/net/wireless/ath/ath5k/eeprom.h b/drivers/net/wireless/ath/ath5k/eeprom.h index dc2bcfe..94a9bbe 100644 --- a/drivers/net/wireless/ath/ath5k/eeprom.h +++ b/drivers/net/wireless/ath/ath5k/eeprom.h @@ -182,6 +182,7 @@ #define AR5K_EEPROM_EEP_DELTA 10 #define AR5K_EEPROM_N_MODES3 #define AR5K_EEPROM_N_5GHZ_CHAN10 +#define AR5K_EEPROM_N_5GHZ_RATE_CHAN 8 #define AR5K_EEPROM_N_2GHZ_CHAN3 #define AR5K_EEPROM_N_2GHZ_CHAN_2413 4 #defineAR5K_EEPROM_N_2GHZ_CHAN_MAX 4 diff --git a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c index 192ad5c..a5edebe 100644 --- a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c +++ b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c @@ -1233,6 +1233,9 @@ uint brcms_reset(struct brcms_info *wl) /* dpc will not be rescheduled */ wl->resched = false; + /* inform publicly that interface is down */ + wl->pub->up = false; + return 0; } diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c index 95aa8e1..83324b3 100644 --- a/drivers/net/wireless/ipw2x00/ipw2100.c +++ b/drivers/net/wireless/ipw2x00/ipw2100.c @@ -2042,7 +2042,8 @@ static void isr_indicate_associated(struct ipw2100_priv *priv, u32 status) return; } len = ETH_ALEN; - ipw2100_get_ordinal(priv, IPW_ORD_STAT_ASSN_AP_BSSID, &bssid, &len); +
pull request: wireless 2012-08-10
commit 039aafba1b57ed39acb3abc290c11be37402feb2
Dave,
Here is a handful of fixes intended for 3.6.
Daniel Drake offers a cfg80211 fix to consume pending events before
taking a wireless device down. This prevents a resource leak.
Stanislaw Gruszka gives us a fix for a NULL pointer dereference in
rt61pci.
Johannes Berg provides an iwlwifi patch to disable "greenfield" mode.
Use of that mode was causing a rate scaling problem in for iwlwifi.
Please let me know if there are problems!
Thanks,
John
---
The following changes since commit 63d02d157ec4124990258d66517b6c11fd6df0cf:
net: tcp: ipv6_mapped needs sk_rx_dst_set method (2012-08-09 20:56:09 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git for-davem
for you to fetch changes up to 039aafba1b57ed39acb3abc290c11be37402feb2:
Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
(2012-08-10 14:05:38 -0400)
Daniel Drake (1):
cfg80211: process pending events when unregistering net device
Johannes Berg (1):
iwlwifi: disable greenfield transmissions as a workaround
John W. Linville (1):
Merge branch 'master' of git://git.kernel.org/.../linville/wireless into
for-davem
Stanislaw Gruszka (1):
rt61pci: fix NULL pointer dereference in config_lna_gain
drivers/net/wireless/iwlwifi/dvm/rs.c | 13 -
drivers/net/wireless/rt2x00/rt61pci.c |3 +--
net/wireless/core.c |5 +
net/wireless/core.h |1 +
net/wireless/util.c |2 +-
5 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/drivers/net/wireless/iwlwifi/dvm/rs.c
b/drivers/net/wireless/iwlwifi/dvm/rs.c
index 6fddd27..a82f46c 100644
--- a/drivers/net/wireless/iwlwifi/dvm/rs.c
+++ b/drivers/net/wireless/iwlwifi/dvm/rs.c
@@ -707,11 +707,14 @@ static int rs_toggle_antenna(u32 valid_ant, u32
*rate_n_flags,
*/
static bool rs_use_green(struct ieee80211_sta *sta)
{
- struct iwl_station_priv *sta_priv = (void *)sta->drv_priv;
- struct iwl_rxon_context *ctx = sta_priv->ctx;
-
- return (sta->ht_cap.cap & IEEE80211_HT_CAP_GRN_FLD) &&
- !(ctx->ht.non_gf_sta_present);
+ /*
+* There's a bug somewhere in this code that causes the
+* scaling to get stuck because GF+SGI can't be combined
+* in SISO rates. Until we find that bug, disable GF, it
+* has only limited benefit and we still interoperate with
+* GF APs since we can always receive GF transmissions.
+*/
+ return false;
}
/**
diff --git a/drivers/net/wireless/rt2x00/rt61pci.c
b/drivers/net/wireless/rt2x00/rt61pci.c
index f322596..3f7bc5c 100644
--- a/drivers/net/wireless/rt2x00/rt61pci.c
+++ b/drivers/net/wireless/rt2x00/rt61pci.c
@@ -2243,8 +2243,7 @@ static void rt61pci_txdone(struct rt2x00_dev *rt2x00dev)
static void rt61pci_wakeup(struct rt2x00_dev *rt2x00dev)
{
- struct ieee80211_conf conf = { .flags = 0 };
- struct rt2x00lib_conf libconf = { .conf = &conf };
+ struct rt2x00lib_conf libconf = { .conf = &rt2x00dev->hw->conf };
rt61pci_config(rt2x00dev, &libconf, IEEE80211_CONF_CHANGE_PS);
}
diff --git a/net/wireless/core.c b/net/wireless/core.c
index 31b40cc..dcd64d5 100644
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
@@ -952,6 +952,11 @@ static int cfg80211_netdev_notifier_call(struct
notifier_block *nb,
*/
synchronize_rcu();
INIT_LIST_HEAD(&wdev->list);
+ /*
+* Ensure that all events have been processed and
+* freed.
+*/
+ cfg80211_process_wdev_events(wdev);
break;
case NETDEV_PRE_UP:
if (!(wdev->wiphy->interface_modes & BIT(wdev->iftype)))
diff --git a/net/wireless/core.h b/net/wireless/core.h
index 5206c68..bc7430b 100644
--- a/net/wireless/core.h
+++ b/net/wireless/core.h
@@ -426,6 +426,7 @@ int cfg80211_change_iface(struct cfg80211_registered_device
*rdev,
struct net_device *dev, enum nl80211_iftype ntype,
u32 *flags, struct vif_params *params);
void cfg80211_process_rdev_events(struct cfg80211_registered_device *rdev);
+void cfg80211_process_wdev_events(struct wireless_dev *wdev);
int cfg80211_can_use_iftype_chan(struct cfg80211_registered_device *rdev,
struct wireless_dev *wdev,
diff --git a/net/wireless/util.c b/net/wireless/util.c
index 26f8cd3..994e2f0 100644
--- a/net/wireless/util.c
+++ b/net/wireless/util.c
@@ -735,7 +735,7 @@ void cfg80211_upload_connect_keys(struct wireless_dev *wdev)
wdev->connect_keys = NULL;
}
-static void cfg80
Re: iwl3945 not working properly.
On Mon, Feb 18, 2008 at 05:54:25AM +0100, Wael Nasreddine wrote: > Hello, > > I have a Toshiba Satellite A135-S4427 with and Intel 3945ABG card, the > driver is not working properly. > > When I turn on my PC it works fine, but If I ever bring the interface > down, I no longer can associate it with any AP without rebooting, even > the one I was using, I tried rmmod/modprobe iwl3945, didn't do > anything, > > iwconfig shows that the wlan0 has the radio turned off, and > > $ cat /sys/bus/pci/drivers/iwl3945/:04:00.0/rf_kill > 1 > > Even If I echo 0 > /sys/bus/pci/drivers/iwl3945/:04:00.0/rf_kill > whenever I try to associate the interface with an AP it turns back to > 1, I tried both iwconfig and NetworkManager, same problem. > > There's a button on my laptop for Radio SoftKill (fn+F8) but it's not > working, the soft kill is being enabled/disabled without my > interference. > > I tried it on kernel-2.6.24 and kernel-2.6.25-rc2 same result... > > Any help is appreciated... > > P.S: Please Cc to me, I am not subscribed to the mailing list. This sounds similar to the bug here: https://bugzilla.redhat.com/show_bug.cgi?id=432264 The OP in that bug reports that the problem continues even after reverting to older kernels that worked previously. Hopefully part of the Intel crew will have some clue as to what is happending here? John -- John W. Linville [EMAIL PROTECTED] -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
pull request: wireless 2012-08-14
commit 1e55217e174f4e6920fd441dcd3aaf8e37645460
Dave,
This batch of fixes is intended for 3.6.
Alexey Khoroshilov provides a potential memory leak in rndis_wlan.
Bob Copeland gives us an ath5k fix for a lockdep problem.
Dan Carpenter fixes a signedness mismatch in at76c50x.
Felix Fietkau corrects a regression caused by an earlier commit that can
lead to an IRQ storm.
Lorenzo Bianconi offers a fix for a bad variable initialization in ath9k
that can cause it to improperly mark decrypted frames.
Rajkumar Manoharan fixes ath9k to prevent the btcoex time from running
when the hardware is asleep.
The remainder are Bluetooth fixes, about which Gustavo says:
"Here goes some fixes for 3.6-rc1, there are a few fix to
thte inquiry code by Ram Malovany, support for 2 new devices,
and few others fixes for NULL dereference, possible deadlock
and a memory leak."
Please let me know if there are problems!
Thanks,
John
---
The following changes since commit 3bf671af14d591ede9251acb0085e8017f3705e7:
Merge branch 'fixes-for-3.6' of
git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds (2012-08-13
09:59:04 +0300)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git for-davem
for you to fetch changes up to 1e55217e174f4e6920fd441dcd3aaf8e37645460:
Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
(2012-08-14 14:42:54 -0400)
Alexey Khoroshilov (1):
rndis_wlan: Fix potential memory leak in update_pmkid()
Andrei Emeltchenko (1):
Bluetooth: smp: Fix possible NULL dereference
Bob Copeland (1):
ath5k: fix spin_lock_irqsave/spin_lock_bh nesting in mesh
Dan Carpenter (1):
wireless: at76c50x: signedness bug in at76_dfu_get_state()
Felix Fietkau (1):
ath9k: fix interrupt storms on queued hardware reset
Gustavo Padovan (1):
Bluetooth: Fix possible deadlock in SCO code
Jaganath Kanakkassery (1):
Bluetooth: Fix socket not getting freed if l2cap channel create fails
John W. Linville (2):
Merge branch 'master' of git://git.kernel.org/.../bluetooth/bluetooth
Merge branch 'master' of git://git.kernel.org/.../linville/wireless into
for-davem
Lorenzo Bianconi (1):
ath9k: fix decrypt_error initialization in ath_rx_tasklet()
Manoj Iyer (1):
Bluetooth: btusb: Add vendor specific ID (0a5c:21f4) BCM20702A0
Peng Chen (1):
Bluetooth: add support for atheros 0489:e057
Rajkumar Manoharan (1):
ath9k: stop btcoex on device suspend
Ram Malovany (3):
Bluetooth: Fix using NULL inquiry entry
Bluetooth: Fix using a NULL inquiry cache entry
Bluetooth: Set name_state to unknown when entry name is empty
Szymon Janc (1):
Bluetooth: Fix legacy pairing with some devices
drivers/bluetooth/ath3k.c | 2 ++
drivers/bluetooth/btusb.c | 2 ++
drivers/net/wireless/at76c50x-usb.c | 2 +-
drivers/net/wireless/ath/ath5k/base.c | 6 ++
drivers/net/wireless/ath/ath5k/mac80211-ops.c | 5 ++---
drivers/net/wireless/ath/ath9k/mac.c | 18 +++--
drivers/net/wireless/ath/ath9k/mac.h | 1 +
drivers/net/wireless/ath/ath9k/main.c | 4 +++-
drivers/net/wireless/ath/ath9k/pci.c | 1 +
drivers/net/wireless/ath/ath9k/recv.c | 2 +-
drivers/net/wireless/rndis_wlan.c | 6 --
net/bluetooth/hci_event.c | 28 +--
net/bluetooth/l2cap_core.c| 1 +
net/bluetooth/l2cap_sock.c| 2 +-
net/bluetooth/sco.c | 19 +-
net/bluetooth/smp.c | 5 -
16 files changed, 68 insertions(+), 36 deletions(-)
diff --git a/drivers/bluetooth/ath3k.c b/drivers/bluetooth/ath3k.c
index 10308cd..11f36e5 100644
--- a/drivers/bluetooth/ath3k.c
+++ b/drivers/bluetooth/ath3k.c
@@ -79,6 +79,7 @@ static struct usb_device_id ath3k_table[] = {
{ USB_DEVICE(0x13d3, 0x3362) },
{ USB_DEVICE(0x0CF3, 0xE004) },
{ USB_DEVICE(0x0930, 0x0219) },
+ { USB_DEVICE(0x0489, 0xe057) },
/* Atheros AR5BBU12 with sflash firmware */
{ USB_DEVICE(0x0489, 0xE02C) },
@@ -104,6 +105,7 @@ static struct usb_device_id ath3k_blist_tbl[] = {
{ USB_DEVICE(0x13d3, 0x3362), .driver_info = BTUSB_ATH3012 },
{ USB_DEVICE(0x0cf3, 0xe004), .driver_info = BTUSB_ATH3012 },
{ USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 },
+ { USB_DEVICE(0x0489, 0xe057), .driver_info = BTUSB_ATH3012 },
/* Atheros AR5BBU22 with sflash firmware */
{ USB_DEVICE(0x0489, 0xE03C), .driver_info = BTUSB_ATH3012 },
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
ind
Re: [Ksummit-2012-discuss] Linux Foundation Technical Advisory Board Elections and Nomination process
On Sat, Jul 21, 2012 at 02:20:51PM -0700, Randy Dunlap wrote: > On 07/06/2012 11:07 AM, Randy Dunlap wrote: > > > On 07/06/2012 06:49 AM, James Bottomley wrote: > > > >> The elections for five of the ten members of the Linux Foundation > >> Technical Advisory Board[TAB] are held every year. Currently the > >> election will be at the 2011 Kernel Summit at one of the Joint events > >> (probably on the Wednesday 29 August) and will be open to all attendees > >> of the Weeks events (Kernel Summit, LinuxCon and Plumbers). > > > > > > > > Will you please summarize what the TAB has done (i.e., > > accomplishments) in the past year? > > > > thanks, > > > > Was this too much to ask? No, of course not! :-) You probably realize that the TAB tends to keep a low profile. We have tended to prefer "soft diplomacy" where possible, at least so long as I've been on the TAB. I think this is a good policy overall, and it is conducive to the non-partisan, 'all for the benefit of Linux' nature of the TAB. But, it isn't necessarily great for self-promotion... In general, the TAB does the following: -- provides some oversight/assistance/feedback to the KS/LPC organizers; -- provides feedback to LF staff on event planning; -- provides a source of community/technical contacts for LF members that want a hand to hold; -- provides a pool of 'volunteers' to help the LF fill last-minute speaking slots or other random requests; More specifically, in the past year we reviewed the plans for LF to take over the kernel.org administration. We were also quite involved with the discussions about what services needed to be prioritized to bring kernel.org back on-line in a timely and secure fashion. You can also blame us for the 'web of trust' (aka key signing) stuff from last Fall. Greg provided a great deal of leadership on all the kernel.org bits, of course. Another point of interest during the last year were some discussions between the TAB and the Software Freedom Conservancy to address some concerns that had been raised about GPL enforcement, particularly regarding such enforcement for the kernel. After some back-and-forth, I think those issues were mostly addressed in an amicable fashion. Also during the last year, the TAB has spent a lot of time grappling with the UEFI secure boot thing and discussing how the Linux community can influence and/or deal with the ramifications of it. Some of that is still on-going, of course. So, anyway...I think that provides a rough overview of the types of things the TAB does. I'm sorry if it lacks some specifics -- there is a lot of details that really amount to a bunch of long discussions and talking on the phone. Still, I think the TAB fulfills an important role in the community even if it isn't always particularly visible. Hth! John -- John W. LinvilleSomeday the world will need a hero, and you linvi...@tuxdriver.com might be all we have. Be ready. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: pull request: wireless 2012-07-06
On Mon, Jul 09, 2012 at 12:31:55AM -0700, David Miller wrote: > From: "John W. Linville" > Date: Fri, 6 Jul 2012 15:20:35 -0400 > > > Please let me know if there are problems! > > This indentation is not correct: > > commit 01f9cb073c827c60c43f769763b49a2026f1a897 > Author: Thomas Huehn > Date: Thu Jun 28 14:39:51 2012 -0700 > > mwl8k: fix possible race condition in info->control.sta use > ... > + sta = ieee80211_find_sta_by_ifaddr(hw, wh->addr1, > + wh->addr2); OK, I'll drop this patch and send a new pull request with a couple more fixes as well. John -- John W. LinvilleSomeday the world will need a hero, and you linvi...@tuxdriver.com might be all we have. Be ready. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
pull request: wireless 2012-07-09
commit c1109736bcdd14b590392e9a96d66e7e823f9e67
Dave,
Please accept these fixes for the 3.5 stream...
Bing Zhao provides an mwifiex fix for a memory leak uncovered by
Coverity.
Eliad Peller provides a mac80211 fix to properly clean-up after an
association failure.
Emmanuel Grumbach gives us an iwlegacy fix to avoid some on-device
memory corruption that leads to a stuck queue.
Sasha Levin offers an NFC fix to prevent a NULL pointer dereference
in llcp_sock_getname.
Stanislaw Gruszka offers an rt2x00usb fix for an RX queue stall that
results from using the wrong argument order in a macro call. He also
gives us an iwlegacy fix that corresponds to an already merged iwlwifi
fix, the effect of which is to avoid stuck queue detection failure.
Finally, Thomas Huehn provides a mac80211 fix to correct some kzalloc
arguments. This was originally two patches, but I consolidated them.
Please let me know if there are problems!
Thanks,
John
---
The following changes since commit bb3bb3a5b839fa5c0a2c386640e865320a1fb64c:
Merge branch 'master' of git://1984.lsi.us.es/nf (2012-07-09 02:47:59 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git for-davem
for you to fetch changes up to c1109736bcdd14b590392e9a96d66e7e823f9e67:
Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
(2012-07-09 15:09:08 -0400)
Bing Zhao (1):
mwifiex: fix Coverity SCAN CID 709078: Resource leak (RESOURCE_LEAK)
Eliad Peller (1):
mac80211: destroy assoc_data correctly if assoc fails
Emmanuel Grumbach (1):
iwlegacy: don't mess up the SCD when removing a key
John W. Linville (1):
Merge branch 'master' of git://git.kernel.org/.../linville/wireless into
for-davem
Sasha Levin (1):
NFC: Prevent NULL deref when getting socket name
Stanislaw Gruszka (2):
rt2x00usb: fix indexes ordering on RX queue kick
iwlegacy: always monitor for stuck queues
Thomas Huehn (1):
mac80211: correct size the argument to kzalloc in minstrel_ht
drivers/net/wireless/iwlegacy/4965-mac.c |4 ++--
drivers/net/wireless/iwlegacy/common.c | 14 ++
drivers/net/wireless/mwifiex/cfg80211.c |1 +
drivers/net/wireless/rt2x00/rt2x00usb.c |2 +-
net/mac80211/mlme.c |6 ++
net/mac80211/rc80211_minstrel_ht.c |2 +-
net/nfc/llcp/sock.c |2 +-
7 files changed, 14 insertions(+), 17 deletions(-)
diff --git a/drivers/net/wireless/iwlegacy/4965-mac.c
b/drivers/net/wireless/iwlegacy/4965-mac.c
index 509301a..ff5d689 100644
--- a/drivers/net/wireless/iwlegacy/4965-mac.c
+++ b/drivers/net/wireless/iwlegacy/4965-mac.c
@@ -3405,7 +3405,7 @@ il4965_remove_dynamic_key(struct il_priv *il,
return 0;
}
- if (il->stations[sta_id].sta.key.key_offset == WEP_INVALID_OFFSET) {
+ if (il->stations[sta_id].sta.key.key_flags & STA_KEY_FLG_INVALID) {
IL_WARN("Removing wrong key %d 0x%x\n", keyconf->keyidx,
key_flags);
spin_unlock_irqrestore(&il->sta_lock, flags);
@@ -3420,7 +3420,7 @@ il4965_remove_dynamic_key(struct il_priv *il,
memset(&il->stations[sta_id].sta.key, 0, sizeof(struct il4965_keyinfo));
il->stations[sta_id].sta.key.key_flags =
STA_KEY_FLG_NO_ENC | STA_KEY_FLG_INVALID;
- il->stations[sta_id].sta.key.key_offset = WEP_INVALID_OFFSET;
+ il->stations[sta_id].sta.key.key_offset = keyconf->hw_key_idx;
il->stations[sta_id].sta.sta.modify_mask = STA_MODIFY_KEY_MASK;
il->stations[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK;
diff --git a/drivers/net/wireless/iwlegacy/common.c
b/drivers/net/wireless/iwlegacy/common.c
index cbf2dc1..5d4807c 100644
--- a/drivers/net/wireless/iwlegacy/common.c
+++ b/drivers/net/wireless/iwlegacy/common.c
@@ -4767,14 +4767,12 @@ il_bg_watchdog(unsigned long data)
return;
/* monitor and check for other stuck queues */
- if (il_is_any_associated(il)) {
- for (cnt = 0; cnt < il->hw_params.max_txq_num; cnt++) {
- /* skip as we already checked the command queue */
- if (cnt == il->cmd_queue)
- continue;
- if (il_check_stuck_queue(il, cnt))
- return;
- }
+ for (cnt = 0; cnt < il->hw_params.max_txq_num; cnt++) {
+ /* skip as we already checked the command queue */
+ if (cnt == il->cmd_queue)
+ continue;
+ if (il_check_stuck_queue(il, cnt))
+ return;
}
mod_timer(&il->watchdog,
diff --git
Re: pull request: wireless 2012-07-09
Forgot to sign -- hopefully this is sufficient? :-)
On Mon, Jul 09, 2012 at 03:28:18PM -0400, John W. Linville wrote:
> commit c1109736bcdd14b590392e9a96d66e7e823f9e67
>
> Dave,
>
> Please accept these fixes for the 3.5 stream...
>
> Bing Zhao provides an mwifiex fix for a memory leak uncovered by
> Coverity.
>
> Eliad Peller provides a mac80211 fix to properly clean-up after an
> association failure.
>
> Emmanuel Grumbach gives us an iwlegacy fix to avoid some on-device
> memory corruption that leads to a stuck queue.
>
> Sasha Levin offers an NFC fix to prevent a NULL pointer dereference
> in llcp_sock_getname.
>
> Stanislaw Gruszka offers an rt2x00usb fix for an RX queue stall that
> results from using the wrong argument order in a macro call. He also
> gives us an iwlegacy fix that corresponds to an already merged iwlwifi
> fix, the effect of which is to avoid stuck queue detection failure.
>
> Finally, Thomas Huehn provides a mac80211 fix to correct some kzalloc
> arguments. This was originally two patches, but I consolidated them.
>
> Please let me know if there are problems!
>
> Thanks,
>
> John
>
> ---
>
> The following changes since commit bb3bb3a5b839fa5c0a2c386640e865320a1fb64c:
>
> Merge branch 'master' of git://1984.lsi.us.es/nf (2012-07-09 02:47:59 -0700)
>
> are available in the git repository at:
>
>
> git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git
> for-davem
>
> for you to fetch changes up to c1109736bcdd14b590392e9a96d66e7e823f9e67:
>
> Merge branch 'master' of
> git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into
> for-davem (2012-07-09 15:09:08 -0400)
>
>
>
> Bing Zhao (1):
> mwifiex: fix Coverity SCAN CID 709078: Resource leak (RESOURCE_LEAK)
>
> Eliad Peller (1):
> mac80211: destroy assoc_data correctly if assoc fails
>
> Emmanuel Grumbach (1):
> iwlegacy: don't mess up the SCD when removing a key
>
> John W. Linville (1):
> Merge branch 'master' of git://git.kernel.org/.../linville/wireless
> into for-davem
>
> Sasha Levin (1):
> NFC: Prevent NULL deref when getting socket name
>
> Stanislaw Gruszka (2):
> rt2x00usb: fix indexes ordering on RX queue kick
> iwlegacy: always monitor for stuck queues
>
> Thomas Huehn (1):
> mac80211: correct size the argument to kzalloc in minstrel_ht
>
> drivers/net/wireless/iwlegacy/4965-mac.c |4 ++--
> drivers/net/wireless/iwlegacy/common.c | 14 ++
> drivers/net/wireless/mwifiex/cfg80211.c |1 +
> drivers/net/wireless/rt2x00/rt2x00usb.c |2 +-
> net/mac80211/mlme.c |6 ++
> net/mac80211/rc80211_minstrel_ht.c |2 +-
> net/nfc/llcp/sock.c |2 +-
> 7 files changed, 14 insertions(+), 17 deletions(-)
>
> diff --git a/drivers/net/wireless/iwlegacy/4965-mac.c
> b/drivers/net/wireless/iwlegacy/4965-mac.c
> index 509301a..ff5d689 100644
> --- a/drivers/net/wireless/iwlegacy/4965-mac.c
> +++ b/drivers/net/wireless/iwlegacy/4965-mac.c
> @@ -3405,7 +3405,7 @@ il4965_remove_dynamic_key(struct il_priv *il,
> return 0;
> }
>
> - if (il->stations[sta_id].sta.key.key_offset == WEP_INVALID_OFFSET) {
> + if (il->stations[sta_id].sta.key.key_flags & STA_KEY_FLG_INVALID) {
> IL_WARN("Removing wrong key %d 0x%x\n", keyconf->keyidx,
> key_flags);
> spin_unlock_irqrestore(&il->sta_lock, flags);
> @@ -3420,7 +3420,7 @@ il4965_remove_dynamic_key(struct il_priv *il,
> memset(&il->stations[sta_id].sta.key, 0, sizeof(struct il4965_keyinfo));
> il->stations[sta_id].sta.key.key_flags =
> STA_KEY_FLG_NO_ENC | STA_KEY_FLG_INVALID;
> - il->stations[sta_id].sta.key.key_offset = WEP_INVALID_OFFSET;
> + il->stations[sta_id].sta.key.key_offset = keyconf->hw_key_idx;
> il->stations[sta_id].sta.sta.modify_mask = STA_MODIFY_KEY_MASK;
> il->stations[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK;
>
> diff --git a/drivers/net/wireless/iwlegacy/common.c
> b/drivers/net/wireless/iwlegacy/common.c
> index cbf2dc1..5d4807c 100644
> --- a/drivers/net/wireless/iwlegacy/common.c
> +++ b/drivers/net/wireless/iwlegacy/common.c
> @@ -4767,14 +4767,12 @@ il_bg_watchdog(unsigned long data)
> return;
>
> /* monitor and check for other stuck queues */
> - if (il_is_any_associated(il)) {
> - for (cnt = 0; cnt <
