summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Bluetooth: Fix SMP context tracking leading to a kernel crashJohan Hedberg2014-07-301-5/+8
* Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2014-07-295-20/+252
|\
| * Bluetooth: Fix incorrectly disabling page scan when toggling connectableJohan Hedberg2014-07-281-1/+13
| * Bluetooth: Fix clearing HCI_PSCAN flagJohan Hedberg2014-07-281-1/+1
| * Bluetooth: Set Simultaneous LE and BR/EDR controller option to zeroMarcel Holtmann2014-07-272-4/+4
| * Bluetooth: Expose default LE advertising interval via debugfsGeorg Lukas2014-07-261-0/+60
| * Bluetooth: Provide defaults for LE advertising intervalGeorg Lukas2014-07-262-2/+4
| * Bluetooth: Fix white list handling with resolvable private addressesMarcel Holtmann2014-07-262-0/+28
| * Bluetooth: Add support for using controller white list filteringMarcel Holtmann2014-07-261-0/+96
| * Bluetooth: Fix issue with ADV_IND reports and auto-connection handlingMarcel Holtmann2014-07-243-4/+33
| * Bluetooth: Ignore ADV_DIRECT_IND attempts from unknown devicesMarcel Holtmann2014-07-241-6/+0
| * Bluetooth: Get MWS transport configuration of the controllerMarcel Holtmann2014-07-231-0/+4
| * Bluetooth: Read list of local codecs supported by the controllerMarcel Holtmann2014-07-231-0/+4
| * Bluetooth: Avoid use of session socket after the session gets freedVignesh Raman2014-07-221-2/+5
* | Merge tag 'nfc-next-3.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2014-07-296-20/+128
|\ \
| * | NFC: digital: Add 'tg_listen_md' and 'tg_get_rf_tech' driver hooksMark A. Greer2014-07-233-9/+81
| * | NFC: hci: Add stop_poll HCI operand.Christophe Ricard2014-07-231-2/+5
| * | NFC: nci: Add T1T support notificationChristophe Ricard2014-07-231-1/+3
| * | NFC: digital: Add digital framing calls when in target modeMark A. Greer2014-07-211-0/+21
| * | NFC: digital: Clear poll_tech_count before activating targetMark A. Greer2014-07-212-6/+16
| * | NFC: digital: Check for NFC-DEP before checking for Type 4 tagMark A. Greer2014-07-211-2/+2
* | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2014-07-253-12/+16
|\ \ \
| * \ \ Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2014-07-231-1/+4
| |\ \ \
| | * | | mac80211: fix crash on getting sta info with uninitialized rate controlFelix Fietkau2014-07-221-1/+4
| * | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211John W. Linville2014-07-182-11/+12
| |\| | |
| | * | | cfg80211: fix mic_failure tracingEliad Peller2014-07-181-1/+2
| | * | | Revert "mac80211: move "bufferable MMPDU" check to fix AP mode scan"Johannes Berg2014-07-071-10/+10
* | | | | Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2014-07-2211-122/+144
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Bluetooth: Prefer sizeof(*ptr) when allocating memoryJohan Hedberg2014-07-213-6/+6
| * | | | Bluetooth: Remove unneeded variable assignment in hmac_sha256Marcel Holtmann2014-07-201-1/+1
| * | | | Bluetooth: Disable HCI_CONNECTABLE based passive scanning for nowJohan Hedberg2014-07-201-2/+1
| * | | | Bluetooth: Use EOPNOTSUPP instead of ENOTSUPPJohan Hedberg2014-07-184-5/+5
| * | | | Bluetooth: Fix allowing initiating pairing when not pairableJohan Hedberg2014-07-171-2/+7
| * | | | Bluetooth: Introduce a flag to track who really initiates authenticationJohan Hedberg2014-07-172-0/+8
| * | | | Bluetooth: Pass initiator/acceptor information to hci_conn_security()Johan Hedberg2014-07-175-11/+14
| * | | | Bluetooth: Fix resetting remote authentication requirement after pairingJohan Hedberg2014-07-171-0/+3
| * | | | Bluetooth: never linger on process exitVladimir Davydov2014-07-173-4/+8
| * | | | Bluetooth: Don't bother user space without IO capabilitiesJohan Hedberg2014-07-172-1/+7
| * | | | Bluetooth: Fix using uninitialized variable when pairingJohan Hedberg2014-07-171-1/+1
| * | | | Bluetooth: Fix always checking the blacklist for incoming connectionsJohan Hedberg2014-07-161-12/+11
| * | | | Bluetooth: Fix trying to initiate connections when acting as LE slaveJohan Hedberg2014-07-161-0/+6
| * | | | Bluetooth: Add a role parameter to hci_conn_add()Johan Hedberg2014-07-163-21/+17
| * | | | Bluetooth: Use explicit role instead of a bool in function parametersJohan Hedberg2014-07-166-21/+27
| * | | | Bluetooth: Convert HCI_CONN_MASTER flag to a conn->role variableJohan Hedberg2014-07-164-33/+23
| * | | | Bluetooth: Add proper defines for HCI connection roleJohan Hedberg2014-07-161-1/+1
| * | | | Bluetooth: Don't try to reject failed LE connectionsJohan Hedberg2014-07-151-5/+5
| * | | | Bluetooth: Remove unnecessary params variable from process_adv_report()Johan Hedberg2014-07-151-5/+2
* | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-nextJohn W. Linville2014-07-2217-169/+653
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | mac80211: add support for Rx reordering offloadingMichal Kazior2014-07-213-23/+118
| * | | | mac80211: fix Rx reordering with RX_FLAG_AMSDU_MOREMichal Kazior2014-07-214-24/+62