aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2011-07-135-6/+16
|\
| * Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2011-07-085-6/+16
| |\
| | * rtlwifi: rtl8192cu: Add new USB ID for Netgear WNA1000MYoann DI-RUZZA2011-07-051-0/+1
| | * ath9k: Fix tx throughput drops for AR9003 chips with AES encryptionRajkumar Manoharan2011-07-051-1/+2
| | * carl9170: add NEC WL300NU-AG usbidChristian Lamparter2011-07-051-0/+2
| | * ath5k: fix incorrect use of drvdata in PCI suspend/resume codePavel Roskin2011-07-051-2/+5
| | * ath5k: fix incorrect use of drvdata in sysfs codePavel Roskin2011-07-051-3/+6
* | | ath5k: Add missing breaks in switch/caseJoe Perches2011-07-111-0/+3
|/ /
* | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2011-06-308-32/+36
|\ \ | |/
| * ath5k: fix memory leak when fewer than N_PD_CURVES are in useEugene A. Shatokhin2011-06-291-5/+3
| * ath9k: Fix suspend/resume when no interface is UPRajkumar Manoharan2011-06-291-0/+6
| * iwlagn: use PCI_DMA_* for pci_* operationsJohn W. Linville2011-06-281-6/+6
| * iwlagn: fix *_UCODE_API_MAX output in the firmware fieldEvgeni Golov2011-06-274-11/+15
| * Merge branch 'wireless-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2011-06-272-17/+13
| |\
| | * iwlagn: map command buffers BIDIJohannes Berg2011-06-271-7/+10
| | * iwlagn: fix cmd queue unmapJohannes Berg2011-06-271-4/+1
| | * iwlagn: fix change_interface for P2P typesJohannes Berg2011-06-241-1/+2
| | * iwlagn: Fix a bug introduced by the HUGE command removalEmmanuel Grumbach2011-06-241-6/+1
* | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2011-06-242-1/+32
|\ \ \ | |/ /
| * | rtl8192cu: Fix missing firmware loadLarry Finger2011-06-221-0/+20
| * | rtlwifi: rtl8192se: Handle duplicate PCI ID 0x10ec:0x8192 conflict with r8192...Larry Finger2011-06-201-1/+12
| |/
* | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2011-06-172-1/+5
|\ \ | |/
| * mwl8k: Tell firmware to generate CCMP headerNishant Sarmukadam2011-06-151-1/+3
| * mwifiex: Fixing NULL pointer dereferenceYogesh Ashok Powar2011-06-151-0/+2
* | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2011-06-0911-75/+65
|\ \ | |/
| * iwlegacy: fix channel switch lockingStanislaw Gruszka2011-06-085-46/+28
| * iwlagn: send tx power command if defer cause by RXON not matchWey-Yi Guy2011-06-081-0/+5
| * rtlwifi: Avoid modifying skbs that are resubmittedMike McCormack2011-06-071-15/+13
| * rtlwifi: Fix logic in rx_interruptMike McCormack2011-06-071-1/+1
| * iwl4965: set tx power after rxon_assocStanislaw Gruszka2011-06-061-1/+2
| * rt2x00: fix rmmod crashStanislaw Gruszka2011-06-062-1/+6
| * iwlagn: use cts-to-self protection on 5000 adapters seriesStanislaw Gruszka2011-06-063-11/+10
* | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2011-06-0612-126/+58
|\ \ | |/
| * libertas_sdio: handle spurious interruptsDaniel Drake2011-06-031-5/+16
| * iwlagn: fix channel switch lockingStanislaw Gruszka2011-06-039-119/+28
| * ath5k: Disable fast channel switching by defaultNick Kossifidis2011-06-032-2/+14
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2011-06-0424-72/+185
|\ \ | |/
| * iwl4965: correctly validate temperature valueStanislaw Gruszka2011-06-011-1/+1
| * ath9k: fix two more bugs in tx powerDaniel Halperin2011-06-012-4/+16
| * iwlagn: fix incorrect PCI subsystem id for 6150 devicesWey-Yi Guy2011-05-313-13/+22
| * zd1211rw: fix to work on OHCIJussi Kivilinna2011-05-311-11/+42
| * wl12xx: fix oops in sched_scan when forcing a passive scanLuciano Coelho2011-05-311-3/+8
| * wl12xx: add separate config value for DFS dwell time on sched scanLuciano Coelho2011-05-313-2/+9
| * wl12xx: fix DFS channels handling in scheduled scanLuciano Coelho2011-05-312-11/+23
| * wl12xx: fix passive and radar channel generation for scheduled scanLuciano Coelho2011-05-311-2/+2
| * libertas: Set command sequence number later to ensure consistencyDaniel Drake2011-05-311-3/+3
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2....John W. Linville2011-05-2712-24/+61
| |\
| | * ath9k: Fix AR9287 calibrationAdrian Chadd2011-05-271-1/+1
| | * wireless: Default to 'n' for 2 new added devices in Kconfig.Tao Ma2011-05-272-2/+0
| | * iwl4965: fix 5GHz operationStanislaw Gruszka2011-05-271-2/+2