summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2013-01-2811-42/+49
|\
| * Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2013-01-226-31/+35
| |\
| | * mac80211: add encrypt headroom to PERR framesBob Copeland2013-01-161-1/+3
| | * mac80211: set NEED_TXPROCESSING for PERR framesBob Copeland2013-01-161-0/+1
| | * mac80211: fix monitor mode injectionFelix Fietkau2013-01-161-3/+6
| | * mac80211: synchronize scan off/on-channel and PS statesStanislaw Gruszka2013-01-163-26/+14Star
| | * mac80211: fix FT roamingJohannes Berg2013-01-161-1/+11
| * | Bluetooth: Check if the hci connection exists in SCO shutdownGustavo Padovan2013-01-101-1/+1
| * | Bluetooth: Fix authentication if acl data comes before remote feature evtJaganath Kanakkassery2013-01-102-8/+11
| * | Bluetooth: Fix incorrect strncpy() in hidp_setup_hid()Anderson Lizardo2013-01-091-1/+1
| * | Bluetooth: Fix sending HCI commands after resetSzymon Janc2013-01-091-1/+1
| |/
* | Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2013-01-2215-100/+274
|\ \
| * | mac80211: split out chandef tracing macrosJohannes Berg2013-01-161-9/+15
| * | cfg80211: check radar interface combinationsSimon Wunderlich2013-01-164-8/+55
| * | cfg80211: Allow use_mfp to be specified with the connect commandJouni Malinen2013-01-162-1/+11
| * | nl80211: allow user-space to set address for P2P_DEVICEArend van Spriel2013-01-161-0/+7
| * | {cfg,nl}80211: mesh power mode primitives and userspace accessMarco Porsch2013-01-162-1/+45
| * | {cfg,nl,mac}80211: set beacon interval and DTIM period on mesh joinMarco Porsch2013-01-165-3/+23
| * | mac80211: move add_tim to subfunctionMarco Porsch2013-01-161-19/+28
| * | mac80211: update mesh peer link counter during userspace peeringMarco Porsch2013-01-163-17/+33
| * | nl80211: add range checks to mesh parametersMarco Porsch2013-01-161-35/+44
| * | mac80211: allow disable power save in meshChun-Yeow Yeoh2013-01-161-1/+2
| * | mac80211: call restart complete at wowlan resume timeJohannes Berg2013-01-161-3/+4
| * | mac80211: fix resume from WoWLANJohannes Berg2013-01-161-2/+4
| * | wireless: fix regulatory HT40 allowed checkFelix Fietkau2013-01-111-1/+3
| * | mac80211: fix HT40 connectionsJohannes Berg2013-01-111-2/+2
* | | Merge tag 'nfc-next-3.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s...John W. Linville2013-01-1410-66/+127
|\ \ \ | |/ / |/| |
| * | NFC: Use skb_copy_datagram_iovecSamuel Ortiz2013-01-111-1/+1
| * | NFC: Avoid memcpy on LLCP connection less Rx pathSamuel Ortiz2013-01-111-8/+8
| * | NFC: Initial Secure Element APISamuel Ortiz2013-01-104-1/+8
| * | NFC: Add HCI quirks to support driver (non)standard implementationsEric Lapuyade2013-01-102-1/+9
| * | NFC: Fixed skb leak in tm_send() nfc and hci ops implementationsEric Lapuyade2013-01-101-2/+4
| * | NFC: Changed event_received hci ops result semanticEric Lapuyade2013-01-101-6/+8
| * | NFC: Added error handling in event_received hci opsEric Lapuyade2013-01-101-3/+5
| * | NFC: Fixed nfc core and hci unregistration and cleanupEric Lapuyade2013-01-103-32/+53
| * | NFC: llcp: Fix Rx memory leakSamuel Ortiz2013-01-101-10/+25
| * | NFC: llcp: Remove the tx backlog queueSamuel Ortiz2013-01-103-6/+2Star
| * | NFC: Add support for SO_TIMESTAMP LLCP socket optionThierry Escande2013-01-103-0/+8
* | | regulatory: fix restore_regulatory_settingsJohannes Berg2013-01-091-1/+1
* | | regulatory: fix ueventJohannes Berg2013-01-091-6/+13
* | | mac80211: fix mesh_hwmp kerneldocBob Copeland2013-01-041-1/+4
|/ /
* | cfg80211: disallow more station changesJohannes Berg2013-01-032-18/+13Star
* | mac80211: unset peer's HT 40 MHz support if not usableJohannes Berg2013-01-031-0/+15
* | wireless: use __alignedJohannes Berg2013-01-031-1/+1
* | mac80211: support HT notify channel width actionJohannes Berg2013-01-031-1/+30
* | mac80211: split TX aggregation stop actionJohannes Berg2013-01-031-5/+35
* | mac80211: move ieee80211_remove_tid_tx functionJohannes Berg2013-01-031-103/+103
* | mac80211: split out aggregation TX removalJohannes Berg2013-01-031-18/+30
* | mac80211: split aggregation stop by reasonJohannes Berg2013-01-038-25/+33
* | nl80211/mac80211: support full station state in AP modeJohannes Berg2013-01-033-45/+97