aboutsummaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAge
* Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2014-03-27
|\
| * Bluetooth: Fix returning peer address in pending connect stateJohan Hedberg2014-03-26
| * Bluetooth: Remove unnecessary assignment in SMPJohan Hedberg2014-03-24
| * Bluetooth: Fix potential NULL pointer dereference in smp_conn_securityJohan Hedberg2014-03-24
| * Bluetooth: Remove LTK re-encryption procedureJohan Hedberg2014-03-24
| * Bluetooth: Don't try to confirm locally initiated SMP pairingJohan Hedberg2014-03-24
| * Bluetooth: Add SMP flag to track which side is the initiatorJohan Hedberg2014-03-24
| * Bluetooth: Fix SMP confirmation callback handlingJohan Hedberg2014-03-24
| * Bluetooth: Add missing cmd_status handler for LE_Start_EncryptionJohan Hedberg2014-03-24
| * Bluetooth: Fix potential NULL pointer dereference in SMPJohan Hedberg2014-03-24
| * Bluetooth: Track current configured LE scan type parameterMarcel Holtmann2014-03-21
| * Bluetooth: Fix address value for early disconnection eventsJohan Hedberg2014-03-20
| * Bluetooth: Fix passkey endianess in user_confirm and notify_passkeyJohan Hedberg2014-03-20
* | Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2014-03-20
|\|
| * Bluetooth: Enforce strict Secure Connections Only mode securityMarcel Holtmann2014-03-19
| * Bluetooth: Fix Pair Device response parameters for pairing failureJohan Hedberg2014-03-19
| * Bluetooth: Fix SMP user passkey notification mgmt eventJohan Hedberg2014-03-19
| * Bluetooth: Increase SMP re-encryption delay to 500msJohan Hedberg2014-03-19
| * Bluetooth: Simplify logic when checking SMP_FLAG_TK_VALIDJohan Hedberg2014-03-19
| * Bluetooth: Fix MITM flag when initiating SMP pairingJohan Hedberg2014-03-18
| * Bluetooth: Fix smp_e byte order to be consistent with SMP specificationJohan Hedberg2014-03-18
| * Bluetooth: Fix const declaration for swap function src parameterJohan Hedberg2014-03-18
| * Bluetooth: Fix updating SMP remote key distribution informationJohan Hedberg2014-03-14
| * Bluetooth: make sure 6LOWPAN_IPHC is built-in if neededArnd Bergmann2014-03-13
| * Bluetooth: Convert uses of __constant_<foo> to <foo>Joe Perches2014-03-12
| * Bluetooth: Enable duplicates filter in background scanAndre Guedes2014-03-11
| * Bluetooth: Fix aborting eSCO connection in case of error 0x20Andrew Earl2014-03-11
| * Bluetooth: make bluetooth 6lowpan as an optionAlexander Aring2014-03-11
| * Bluetooth: Make LTK and CSRK only persisent when bondingMarcel Holtmann2014-03-10
| * Bluetooth: Add support for handling signature resolving keysMarcel Holtmann2014-03-09
| * Bluetooth: Fix skb allocation check for A2MPGustavo Padovan2014-03-07
| * Bluetooth: Fix expected key count debug logsJohan Hedberg2014-03-07
| * Bluetooth: Fix removing Long Term KeyClaudio Takahasi2014-03-05
* | Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2014-03-20
|\ \
| * | cfg80211: remove macro ASSERT_RDEV_LOCK(rdev)Zhao, Gang2014-03-19
| * | cfg80211: remove unnecessary checkZhao, Gang2014-03-19
| * | mac80211: set beamforming bit in radiotapEmmanuel Grumbach2014-03-19
| * | cfg80211/mac80211: ignore signal if the frame was heard on wrong channelEmmanuel Grumbach2014-03-19
| * | cfg80211: make __cfg80211_join_ibss() staticZhao, Gang2014-03-19
| * | mac80211: release sched_scan_sdata when stopping sched scanAlexander Bondar2014-03-19
| * | mac80211: fix WPA with VLAN on AP side with ps-sta againMichael Braun2014-03-19
| * | mac80211: fix suspend vs. authentication raceJohannes Berg2014-03-19
| * | mac80211: verify deauthentication and return error on failureJohannes Berg2014-03-19
| * | mac80211: fix potential use-after-freeJohannes Berg2014-03-19
| * | cfg80211: allow reprocessing of pending requestsLuis R. Rodriguez2014-03-03
| * | mac80211: add missing update on rx status VHT flagChun-Yeow Yeoh2014-03-03
| * | mac80211: refactor channel switch functionMichal Kazior2014-03-03
| * | cfg80211: send stop AP event only due to internal reasonIlan Peer2014-02-25
| * | cfg80211: DFS get CAC time from regulatory databaseJanusz Dziedzic2014-02-25
| * | cfg80211: regulatory: allow getting DFS CAC time from userspaceJanusz Dziedzic2014-02-25