summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2013-08-1614-344/+570
|\
| * mac80211: add APIs to allow keeping connections after WoWLANJohannes Berg2013-08-162-8/+148
| * mac80211: move ibss presp generation in own functionSimon Wunderlich2013-08-161-76/+109
| * mac80211: perform power save processing before decryptionJohan Almbladh2013-08-161-202/+202
| * net: rfkill: Do not ignore errors from regulator_enable()Luis Henriques2013-08-151-3/+5
| * mac80211: ibss - do not scan if not needed when creating an IBSSAntonio Quartulli2013-08-121-0/+11
| * mac80211: add vif to testmode cmdDavid Spinadel2013-08-121-1/+10
| * cfg80211: add wdev to testmode cmdDavid Spinadel2013-08-124-12/+28
| * mac80211: add control port protocol TX control flagJohannes Berg2013-08-122-5/+8
| * nl80211: clean up CQM settings codeJohannes Berg2013-08-121-27/+24
| * mac80211: fix ieee80211_sta_process_chanswitch for 5/10 MHz channelsSimon Wunderlich2013-08-091-0/+9
| * mac80211: allow lowest basic rate for unicast management for meshChun-Yeow Yeoh2013-08-091-7/+16
| * wireless: make TU conversion macros availableJohannes Berg2013-08-061-3/+0
* | NFC: Update secure element stateArron Wang2013-08-141-0/+4
* | NFC: Fix secure element state checkArron Wang2013-08-141-2/+2
* | NFC: hci: Fix enable/disable confusionDan Carpenter2013-08-141-1/+1
* | NFC: netlink: Add result of firmware operation to completion eventEric Lapuyade2013-08-143-4/+15
* | NFC: Move nfc_fw_download_done() definition from private to publicEric Lapuyade2013-08-141-2/+0
* | NFC: Add a GET_SE netlink APISamuel Ortiz2013-08-141-0/+91
* | NFC: Fix SE discovery failure warning conditionSamuel Ortiz2013-08-141-1/+1
* | Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2013-08-0915-34/+663
|\ \ | |/
| * mac80211: add channel switch command and beacon callbacksSimon Wunderlich2013-08-017-2/+386
| * nl80211/cfg80211: add channel switch commandSimon Wunderlich2013-08-013-1/+166
| * mac80211: add debugfs for driver-buffered TID bitmapJohannes Berg2013-08-011-0/+9
| * mac80211: report some VHT radiotap infos for tx statusKarl Beldan2013-08-011-13/+63
| * mac80211: ibss - remove not authorized station earlierAntonio Quartulli2013-08-011-1/+29
| * mac80211: use oneshot blink API for LED triggersFabio Baltieri2013-08-015-17/+10
* | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2013-08-0912-55/+95
|\ \
| * \ Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2013-08-023-20/+41
| |\ \
| | * | mac80211: continue using disabled channels while connectedJohannes Berg2013-07-311-1/+10
| | * | cfg80211: fix P2P GO interface teardownJohannes Berg2013-07-311-0/+1
| | * | mac80211: ignore HT primary channel while connectedJohannes Berg2013-07-311-13/+13
| | * | mac80211: don't wait for TX status foreverJohannes Berg2013-07-311-3/+12
| | * | mac80211: fix infinite loop in ieee80211_determine_chantypeChris Wright2013-07-311-1/+1
| | * | nl80211: fix another nl80211_fam.attrbuf raceJohannes Berg2013-07-301-2/+4
| * | | Merge tag 'nfc-fixes-3.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git...John W. Linville2013-07-315-23/+24
| |\ \ \
| | * | | NFC: netlink: Rename CMD_FW_UPLOAD to CMD_FW_DOWNLOADSamuel Ortiz2013-07-314-23/+23
| | * | | NFC: Fix NCI over SPI buildFrederic Danis2013-07-191-0/+1
| * | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/blueto...John W. Linville2013-07-311-9/+17
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Bluetooth: Fix calling request callback more than onceJohan Hedberg2013-07-291-1/+9
| | * | | Bluetooth: Fix HCI init for BlueFRITZ! devicesJohan Hedberg2013-07-291-1/+4
| | * | | Bluetooth: Fix race between hci_register_dev() and hci_dev_open()Gustavo Padovan2013-07-251-7/+4
| | * | | Bluetooth: Fix invalid length check in l2cap_information_rsp()Jaganath Kanakkassery2013-07-251-1/+1
| * | | | regulatory: use correct regulatory initiator on wiphy registerArik Nemtsov2013-07-251-1/+4
| * | | | mac80211: fix monitor interface suspend crash regressionStanislaw Gruszka2013-07-231-2/+5
| * | | | mac80211: prevent the buffering or frame transmission to non-assoc mesh STAChun-Yeow Yeoh2013-07-221-0/+4
* | | | | Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2013-08-0127-329/+1078
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | mac80211: make active monitor injection work w/ HW queueJohannes Berg2013-07-161-0/+4
| * | | mac80211: set forwarding in mesh capability infoChun-Yeow Yeoh2013-07-161-1/+3
| * | | mac80211: fix off-by-one regression in ibss beacon generationSimon Wunderlich2013-07-161-1/+3
OpenPOWER on IntegriCloud