summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/dvm/mac80211.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlw...John W. Linville2013-02-121-29/+132
|\
| * iwlwifi: dvm: query and report WoWLAN wakeup reasonJohannes Berg2013-02-121-29/+132
* | mac80211: remove IEEE80211_HW_SCAN_WHILE_IDLEJohannes Berg2013-02-111-2/+1
|/
* Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2013-02-081-1/+1
|\
| * mac80211: inform the driver about update of dtim_periodEmmanuel Grumbach2013-01-311-1/+1
| * Merge remote-tracking branch 'wireless-next/master' into HEADJohannes Berg2013-01-291-9/+7
| |\
* | | iwlwifi: move register access lock into transportLilach Edelstein2013-02-011-4/+2
* | | Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlw...John W. Linville2013-01-301-1/+1
|\ \ \
| * | | iwlwifi: update copyrightJohannes Berg2013-01-241-1/+1
* | | | Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2013-01-301-0/+1
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| |
| * | mac80211: provide the vif in rssi_callbackEmmanuel Grumbach2013-01-241-0/+1
* | | Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlw...John W. Linville2013-01-221-5/+3
|\ \ \ | | |/ | |/|
| * | iwlwifi: improve the reports in TX pathEmmanuel Grumbach2013-01-161-3/+0
| * | iwlwifi: enable communication with WoWLAN firmwareJohannes Berg2013-01-161-2/+3
* | | Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlw...John W. Linville2013-01-071-4/+4
|\ \ \ | |/ / | | / | |/ |/|
| * iwlwifi: don't treat a bool as an error codeEmmanuel Grumbach2013-01-031-2/+2
| * iwlwifi: virtualize SRAM accessEmmanuel Grumbach2013-01-031-1/+1
| * iwlwifi: virtualize iwl_{grab,release}_nic_accessEmmanuel Grumbach2013-01-031-2/+2
* | mac80211: split TX aggregation stop actionJohannes Berg2013-01-031-1/+3
|/
* Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlw...John W. Linville2012-12-111-6/+6
|\
| * iwlwifi: Change define and struct names in iwl-eeprom-parse.hEytan Lifshitz2012-12-061-6/+6
* | Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2012-11-261-2/+0
|\ \
| * | cfg80211: remove remain-on-channel channel typeJohannes Berg2012-11-261-2/+0
* | | Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2012-11-211-0/+1
|\ \ \ | |/ /
| * | mac80211: make remain_on_channel() op pass vif paramEliad Peller2012-11-191-0/+1
* | | Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlw...John W. Linville2012-11-211-2/+7
|\ \ \ | | |/ | |/|
| * | iwlwifi: disallow MFP with software cryptoJohannes Berg2012-11-191-2/+7
* | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2012-11-211-1/+15
|\ \ \ | |/ / |/| |
| * | iwlwifi: fix monitor mode FCS flagJohannes Berg2012-11-141-0/+14
| * | iwlwifi: use ieee80211_free_txskbJohannes Berg2012-11-071-1/+1
| |/
* | iwlwifi: fix queue flush confusionJohannes Berg2012-11-051-1/+1
* | iwlwifi: remove MFP Kconfig optionAssaf Krauss2012-10-231-2/+0
|/
* Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlw...John W. Linville2012-08-221-1/+1
|\
| * iwlwifi: reduce max remain-on-channel durationJohannes Berg2012-07-271-1/+1
| * Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2012-07-091-0/+12
* | mac80211: move TX station pointer and restructure TXThomas Huehn2012-07-311-2/+4
* | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2012-06-291-0/+12
|/
* iwlwifi: limit mac_change_interface to BSS contextJohannes Berg2012-06-211-20/+17
* iwlwifi: remove sku field from hw_paramsJohannes Berg2012-06-201-2/+2
* iwlwifi: delay ROC if doing internal reset scanJohannes Berg2012-06-181-2/+12
* Merge remote-tracking branch 'wireless-next/master' into iwlwifi-nextJohannes Berg2012-06-131-0/+3
|\
| * Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlw...John W. Linville2012-06-111-0/+3
* | iwlwifi: iwl_{read,write}_targ_mem_words takes dwordsEmmanuel Grumbach2012-06-131-1/+1
|/
* iwlwifi: refactor EEPROM reading/parsingJohannes Berg2012-06-061-5/+4
* iwlwifi: s/txq_setup/txq_enableEmmanuel Grumbach2012-06-061-1/+1
* iwlwifi: move DVM code into subdirectoryJohannes Berg2012-06-061-0/+1631
OpenPOWER on IntegriCloud