John W. Linville
7f466cff75
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
2012-03-06 14:16:48 -05:00
John W. Linville
eea79e0713
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
2012-02-27 13:14:47 -05:00
John W. Linville
9d4990a260
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
2012-02-20 14:47:17 -05:00
John W. Linville
33b5d30cd8
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
2012-02-15 13:41:52 -05:00
John W. Linville
7a73b08b50
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
2012-02-08 14:53:43 -05:00
John W. Linville
8149415efa
ath9k: use WARN_ON_ONCE in ath_rc_get_highest_rix
...
The device seems to survive the issue, so no need to flood the logs
about it...
Signed-off-by: John W. Linville <[email protected] >
2012-02-03 14:17:12 -05:00
John W. Linville
157ca9eae9
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
2012-02-03 14:14:07 -05:00
John W. Linville
5fb8c182d2
iwlwifi: make "Tx aggregation enabled on ra =" be at DEBUG level
...
Average users either don't care or they think that message indicates a
problem...
Signed-off-by: John W. Linville <[email protected] >
2012-02-01 15:26:00 -05:00
John W. Linville
4f3d09de38
b43: add option to avoid duplicating device support with brcmsmac
...
Signed-off-by: John W. Linville <[email protected] >
2012-01-18 14:49:47 -05:00
John W. Linville
874c60bad9
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next
2012-01-10 15:44:17 -05:00
John W. Linville
1032c736e8
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
...
Conflicts:
drivers/net/wireless/b43legacy/dma.c
2012-01-05 10:13:24 -05:00
John W. Linville
cb00ec382b
ath6kl: revert USB support
...
The ath6kl driver is causing build failures when the ath6kl bits are
not built as modules. A better fix is forthcoming in a future release,
but for now lets revert the problematic code.
This reverts the following commits:
fde57764ef
d70385a26a
59d954dda4
Signed-off-by: John W. Linville <[email protected] >
2012-01-05 09:53:33 -05:00
John W. Linville
d8f46ff110
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
2012-01-04 11:37:30 -05:00
John W. Linville
57adc1fcba
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
...
Conflicts:
drivers/net/wireless/b43/dma.c
drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
2012-01-03 15:16:34 -05:00
John W. Linville
f9dc73e541
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth
2012-01-03 14:26:56 -05:00
John W. Linville
dc0d633e35
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next
2012-01-02 16:43:54 -05:00
John W. Linville
03877332ae
Merge branch 'for-linville' of git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx
2011-12-21 15:02:18 -05:00
John W. Linville
b4949b8456
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
2011-12-21 13:18:22 -05:00
John W. Linville
9662cbc712
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next
2011-12-19 14:28:22 -05:00
John W. Linville
640f5950a7
Merge branch 'for-linville' of git://github.com/kvalo/ath6kl
2011-12-19 14:25:17 -05:00
John W. Linville
7c4559c92d
Merge branch 'wireless-next' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi
2011-12-19 14:24:13 -05:00
John W. Linville
9763152c94
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth
2011-12-19 14:12:11 -05:00
John W. Linville
9f6e20cee6
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
2011-12-19 13:54:26 -05:00
John W. Linville
9b682c786f
b43: mark some vars __maybe_unused in b43_nphy_pmu_spur_avoid
...
Avoids this warning when CONFIG_B43_BCMA is not set:
CC [M] drivers/net/wireless/b43/phy_n.o
drivers/net/wireless/b43/phy_n.c: In function ‘b43_nphy_pmu_spur_avoid’:
drivers/net/wireless/b43/phy_n.c:4052:6: warning: unused variable ‘pmu_ctl’
drivers/net/wireless/b43/phy_n.c:4051:22: warning: unused variable ‘cc’
Signed-off-by: John W. Linville <[email protected] >
2011-12-16 16:29:17 -05:00
John W. Linville
42a3b63bb2
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
2011-12-15 13:47:58 -05:00
John W. Linville
5d22df200b
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
...
Conflicts:
drivers/net/wireless/iwlwifi/iwl-agn.c
2011-12-14 14:35:41 -05:00
John W. Linville
8b1fdb5307
b43: avoid calling bcma_* if CONFIG_B43_BCMA is not set
...
Avoids this:
ERROR: "bcma_chipco_pll_write" [drivers/net/wireless/b43/b43.ko] undefined!
Signed-off-by: John W. Linville <[email protected] >
2011-12-14 09:03:52 -05:00
John W. Linville
05ef54e8cd
Merge branch 'wireless-next' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi
2011-12-13 15:08:02 -05:00
John W. Linville
f2abba4921
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
2011-12-12 14:19:43 -05:00
John W. Linville
cf00f379d8
wl12xx: silence tx_attr uninitialized warning in wl1271_tx_fill_hdr
...
CC [M] drivers/net/wireless/wl12xx/tx.o
drivers/net/wireless/wl12xx/tx.c: In function ‘wl1271_tx_fill_hdr’:
drivers/net/wireless/wl12xx/tx.c:288:6: warning: ‘tx_attr’ may be used uninitialized in this function
Signed-off-by: John W. Linville <[email protected] >
2011-12-09 14:57:49 -05:00
John W. Linville
e7ab5f1c32
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
2011-12-09 14:07:12 -05:00
John W. Linville
5f779bbd47
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next
2011-12-06 16:02:05 -05:00
John W. Linville
facda29d75
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth
2011-12-06 14:59:32 -05:00
John W. Linville
d39aeaf260
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
2011-12-06 10:47:12 -05:00
John W. Linville
cbec0627ef
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
2011-12-05 11:05:44 -05:00
John W. Linville
d7a4858c0f
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
...
Conflicts:
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/libertas/cfg.c
2011-12-02 15:44:03 -05:00
John W. Linville
03360c5a40
Revert "mac80211: clear sta.drv_priv on reconfiguration"
...
This reverts commit f785d83a19 .
This was provoking WARNINGs from the iwlegacy drivers.
Signed-off-by: John W. Linville <[email protected] >
2011-12-01 10:44:17 -05:00
John W. Linville
3b95e9c089
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
2011-11-30 14:14:42 -05:00
John W. Linville
39338b5638
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
2011-11-28 14:11:18 -05:00
John W. Linville
02f1ce35be
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
2011-11-22 16:46:55 -05:00
John W. Linville
82e5fc2a34
Revert "rt2800pci: handle spurious interrupts"
...
This reverts commit 4ba7d99978 .
The original patch was a misguided attempt to improve performance on
some hardware that is apparently prone to spurious interrupt generation.
Signed-off-by: John W. Linville <[email protected] >
2011-11-22 16:38:19 -05:00
John W. Linville
6cccccafe9
Revert "rt2x00: handle spurious pci interrupts"
...
This reverts commit 23085d5796 .
The original patch was a misguided attempt to improve performance on
some hardware that is apparently prone to spurious interrupt generation.
Signed-off-by: John W. Linville <[email protected] >
2011-11-22 16:36:35 -05:00
John W. Linville
eb1852b105
rtlwifi: squash warning in _usb_read_sync
...
drivers/net/wireless/rtlwifi/usb.c: In function ‘_usb_read_sync’:
drivers/net/wireless/rtlwifi/usb.c:102:6: warning: ‘status’ may be used uninitialized in this function
drivers/net/wireless/rtlwifi/usb.c:102:6: note: ‘status’ was declared here
My compiler is dumb, but better to eliminate the warning than to have
anyone waste time evaluating this again...
Signed-off-by: John W. Linville <[email protected] >
Acked-by: Larry Finger <[email protected] >
2011-11-22 14:41:22 -05:00
John W. Linville
515db09338
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
...
Conflicts:
drivers/net/wireless/iwlegacy/iwl-debugfs.c
drivers/net/wireless/iwlegacy/iwl-rx.c
drivers/net/wireless/iwlegacy/iwl-scan.c
drivers/net/wireless/iwlegacy/iwl-tx.c
include/net/bluetooth/bluetooth.h
2011-11-22 14:05:46 -05:00
John W. Linville
4713e962c5
Merge branch 'for-linville' of git://github.com/sgruszka/iwlegacy
2011-11-21 16:00:56 -05:00
John W. Linville
9c461cef0d
Merge branch 'for-linville' of git://github.com/kvalo/ath6kl
2011-11-17 15:16:55 -05:00
John W. Linville
c4be3c2da1
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
2011-11-17 14:15:47 -05:00
John W. Linville
e11c259f74
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
...
Conflicts:
include/net/bluetooth/bluetooth.h
2011-11-17 13:11:43 -05:00
John W. Linville
731f8e1c41
libertas: release bss references and avoid warning from cfg80211_inform_bss
...
CC [M] drivers/net/wireless/libertas/cfg.o
drivers/net/wireless/libertas/cfg.c: In function ‘lbs_ret_scan’:
drivers/net/wireless/libertas/cfg.c:636:24: warning: ignoring return value of ‘cfg80211_inform_bss’, declared with attribute warn_unused_result
drivers/net/wireless/libertas/cfg.c: In function ‘lbs_join_post’:
drivers/net/wireless/libertas/cfg.c:1766:21: warning: ignoring return value of ‘cfg80211_inform_bss’, declared with attribute warn_unused_result
Signed-off-by: John W. Linville <[email protected] >
2011-11-11 14:28:49 -05:00
John W. Linville
6d377cdbe3
brcmsmac: fix warning in _initvars_srom_pci
...
CC [M] drivers/net/wireless/brcm80211/brcmsmac/srom.o
drivers/net/wireless/brcm80211/brcmsmac/srom.c: In function ‘_initvars_srom_pci’:
drivers/net/wireless/brcm80211/brcmsmac/srom.c:641:6: warning: ‘val’ may be used uninitialized in this function
Signed-off-by: John W. Linville <[email protected] >
2011-11-11 14:28:48 -05:00
John W. Linville
fb14ca438c
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
2011-11-11 11:34:47 -05:00
John W. Linville
fa5e91bc77
wireless: cleanup brcm80211 bits in drivers/net/wireless/Makefile
...
Signed-off-by: John W. Linville <[email protected] >
2011-11-09 15:25:18 -05:00
John W. Linville
312fef7d18
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next
...
Conflicts:
net/bluetooth/l2cap_sock.c
net/bluetooth/mgmt.c
2011-11-09 14:54:33 -05:00
John W. Linville
5e819059a2
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
2011-11-09 14:49:23 -05:00
John W. Linville
e29ec62470
Merge branch 'master' of ssh://ra.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
2011-11-09 13:41:11 -05:00
John W. Linville
9270fd61a3
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth
2011-11-08 14:59:14 -05:00
John W. Linville
22097fd297
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
2011-11-04 14:46:34 -04:00
John W. Linville
c125d5e846
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth
2011-11-02 15:15:51 -04:00
John W. Linville
41ebe9cde7
Merge branch 'master' of git://git.infradead.org/users/linville/wireless-next into for-davem
2011-10-17 15:05:26 -04:00
John W. Linville
5dde8e1749
Merge branch 'for-linville' of git://github.com/lucacoelho/wl12xx
2011-10-11 15:56:29 -04:00
John W. Linville
094daf7db7
Merge branch 'master' of git://git.infradead.org/users/linville/wireless-next into for-davem
...
Conflicts:
Documentation/feature-removal-schedule.txt
2011-10-11 15:35:42 -04:00
John W. Linville
5f68a2b0a8
ath6kl: fixup merge damage in ath6kl_mgmt_tx
...
CC [M] drivers/net/wireless/ath/ath6kl/cfg80211.o
drivers/net/wireless/ath/ath6kl/cfg80211.c:1838:2: warning: initialization from incompatible pointer type
Caused by commit e9f935e3e8dc0bddd0df6d148165d95925422502...
Signed-off-by: John W. Linville <[email protected] >
2011-10-11 15:33:10 -04:00
John W. Linville
d6222fb0d6
Merge branch 'master' of git://github.com/padovan/bluetooth-next
2011-10-04 14:06:47 -04:00
John W. Linville
a5abbcb220
Merge branch 'for-linville' of git://github.com/kvalo/ath6kl
2011-10-03 14:59:35 -04:00
John W. Linville
8e00f5fbb4
Merge branch 'master' of git://git.infradead.org/users/linville/wireless-next into for-davem
...
Conflicts:
drivers/net/wireless/iwlwifi/iwl-pci.c
drivers/net/wireless/wl12xx/main.c
2011-09-30 14:52:29 -04:00
John W. Linville
0874073570
Merge branch 'master' of git://git.infradead.org/users/linville/wireless
...
Conflicts:
drivers/net/wireless/iwlwifi/iwl-scan.c
net/wireless/nl80211.c
2011-09-28 10:28:09 -04:00
John W. Linville
a8acfd82eb
Merge branch 'master' of git://git.infradead.org/users/linville/wireless into for-davem
2011-09-27 15:47:33 -04:00
John W. Linville
85a8eefdc9
Merge branch 'for-linville' of git://github.com/lucacoelho/wl12xx
2011-09-27 14:20:23 -04:00
John W. Linville
bb8f2cb284
Merge branch 'master' of git://github.com/padovan/bluetooth-next
2011-09-27 14:15:00 -04:00
John W. Linville
4d8b61490c
Merge branch 'master' of git://git.infradead.org/users/linville/wireless
...
Conflicts:
drivers/net/wireless/iwlwifi/iwl-pci.c
drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c
drivers/net/wireless/rt2x00/rt2800usb.c
drivers/net/wireless/wl12xx/main.c
2011-09-20 14:11:55 -04:00
John W. Linville
eebb6fb4ae
Merge branch 'master' of ssh://infradead/~/public_git/wireless into for-davem
2011-09-20 09:19:14 -04:00
John W. Linville
42cecc3465
Revert "ath9k: do not insert padding into tx buffers on AR9380+"
...
This reverts commit 4245d31347 .
2011-09-19 15:42:31 -04:00
John W. Linville
376cf5d3fd
Merge branch 'for-linville' of git://github.com/lucacoelho/wl12xx
2011-09-19 15:42:21 -04:00
John W. Linville
b53d63ecce
Merge branch 'master' of ssh://infradead/~/public_git/wireless-next into for-davem
2011-09-19 15:00:16 -04:00
John W. Linville
5d59bbce3d
Merge branch 'for-3.1' of git://github.com/padovan/bluetooth-next
2011-09-19 14:47:29 -04:00
John W. Linville
bd1a272806
Merge branch 'for-linville' of git://github.com/lucacoelho/wl12xx
2011-09-16 16:20:43 -04:00
John W. Linville
8ea9ac0a47
Merge branch 'master' of git://git.infradead.org/users/linville/wireless into for-davem
2011-09-15 15:37:02 -04:00
John W. Linville
b4d3de8ca2
Merge branch 'master' of git://git.infradead.org/users/linville/wireless-next into for-davem
2011-09-13 15:41:16 -04:00
John W. Linville
78b8e51dd9
wl12xx/sdio_test.c: fix build breakage from WL127X_FW_NAME change
...
Commit c302b2c959 ("wl12xx: Use a single
fw for both STA and AP roles") changed the name of the firmware name
definition, breaking the build of wl12xx/sdio_test.c.
Signed-off-by: John W. Linville <[email protected] >
2011-08-29 15:49:46 -04:00
John W. Linville
817a53d986
mac80211: refactor skb copy to failq in mesh_path_move_to_queue
...
This seems a bit less awkward...
Signed-off-by: John W. Linville <[email protected] >
2011-08-29 15:25:28 -04:00
John W. Linville
ba6e5eb107
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
2011-08-29 14:52:20 -04:00
John W. Linville
e0a8c583c3
Merge branch 'for-linville' of git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx
2011-08-29 14:27:52 -04:00
John W. Linville
c3e5fac8e5
b43: correct warning for uninitialized variable 'macstat'
...
CC [M] drivers/net/wireless/b43/pio.o
drivers/net/wireless/b43/pio.c: In function ‘pio_rx_frame’:
drivers/net/wireless/b43/pio.c:614:6: warning: ‘macstat’ may be used uninitialized in this function
Signed-off-by: John W. Linville <[email protected] >
2011-08-26 10:47:57 -04:00
John W. Linville
22c55e6e7e
ath9k: remove replicated null check in ath_pci_aspm_init
...
Signed-off-by: John W. Linville <[email protected] >
2011-08-26 10:47:57 -04:00
John W. Linville
e2e6be56df
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
2011-08-26 10:33:51 -04:00
John W. Linville
b38d355eaa
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
...
Conflicts:
drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c
drivers/staging/ath6kl/os/linux/ar6000_drv.c
2011-08-22 14:28:50 -04:00
John W. Linville
4475a0a93f
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetooth
2011-08-22 14:20:09 -04:00
John W. Linville
eb18fa5bdb
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
2011-08-22 14:16:07 -04:00
John W. Linville
a06d8aba0e
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
2011-08-11 13:37:26 -04:00
John W. Linville
20adc1aecc
Merge branch 'for-linville' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath6kl
2011-08-10 13:51:19 -04:00
John W. Linville
392e741939
Merge branch 'ath6kl-next' of master.kernel.org:/pub/scm/linux/kernel/git/kvalo/ath6kl
2011-08-09 16:02:26 -04:00
John W. Linville
a5d5a91477
Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
2011-08-03 09:18:21 -04:00
John W. Linville
e5036c2575
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
2011-07-26 17:05:55 -04:00
John W. Linville
41bf37117b
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
2011-07-22 17:51:16 -04:00
John W. Linville
6e6e8c510a
bcma: fix 'SSB_PCICORE_BFL_NOPCI' undeclared build breakage
...
linux-next-20110722/drivers/bcma/driver_pci.c:175: error: 'SSB_PCICORE_BFL_NOPCI' undeclared (first use in this function)
Reported-by: Randy Dunlap <[email protected] >
Signed-off-by: John W. Linville <[email protected] >
2011-07-22 16:24:01 -04:00
John W. Linville
95a943c162
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
...
Conflicts:
net/bluetooth/l2cap_core.c
2011-07-15 10:05:24 -04:00
John W. Linville
4b42c542af
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetooth-next-2.6
...
Conflicts:
net/bluetooth/l2cap_core.c
2011-07-11 14:58:22 -04:00
John W. Linville
d859898114
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
...
Conflicts:
drivers/net/wireless/ath/ath5k/sysfs.c
net/bluetooth/l2cap_core.c
net/mac80211/wpa.c
2011-07-11 14:46:59 -04:00
John W. Linville
e441a5eab9
Merge branch 'for-linville' of git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx
2011-07-08 11:05:20 -04:00
John W. Linville
204d1641d2
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
2011-07-08 11:03:36 -04:00