summaryrefslogtreecommitdiffstats
path: root/net
AgeCommit message (Expand)AuthorFilesLines
2014-03-27Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville6-77/+106
2014-03-26Bluetooth: Fix returning peer address in pending connect stateJohan Hedberg2-2/+4
2014-03-24Bluetooth: Remove unnecessary assignment in SMPJohan Hedberg1-2/+0
2014-03-24Bluetooth: Fix potential NULL pointer dereference in smp_conn_securityJohan Hedberg1-1/+1
2014-03-24Bluetooth: Remove LTK re-encryption procedureJohan Hedberg2-49/+7
2014-03-24Bluetooth: Don't try to confirm locally initiated SMP pairingJohan Hedberg1-0/+5
2014-03-24Bluetooth: Add SMP flag to track which side is the initiatorJohan Hedberg2-0/+7
2014-03-24Bluetooth: Fix SMP confirmation callback handlingJohan Hedberg1-0/+4
2014-03-24Bluetooth: Add missing cmd_status handler for LE_Start_EncryptionJohan Hedberg1-0/+34
2014-03-24Bluetooth: Fix potential NULL pointer dereference in SMPJohan Hedberg1-1/+7
2014-03-21Bluetooth: Track current configured LE scan type parameterMarcel Holtmann1-0/+25
2014-03-20Bluetooth: Fix address value for early disconnection eventsJohan Hedberg2-21/+11
2014-03-20Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville15-183/+360
2014-03-20Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville22-176/+298
2014-03-19Bluetooth: Fix passkey endianess in user_confirm and notify_passkeyJohan Hedberg3-5/+5
2014-03-19Bluetooth: Enforce strict Secure Connections Only mode securityMarcel Holtmann2-0/+23
2014-03-19Bluetooth: Fix Pair Device response parameters for pairing failureJohan Hedberg1-2/+14
2014-03-19Bluetooth: Fix SMP user passkey notification mgmt eventJohan Hedberg1-2/+3
2014-03-19Bluetooth: Increase SMP re-encryption delay to 500msJohan Hedberg1-1/+1
2014-03-19Bluetooth: Simplify logic when checking SMP_FLAG_TK_VALIDJohan Hedberg1-4/+2
2014-03-19cfg80211: remove macro ASSERT_RDEV_LOCK(rdev)Zhao, Gang4-5/+2
2014-03-19cfg80211: remove unnecessary checkZhao, Gang1-3/+0
2014-03-19mac80211: set beamforming bit in radiotapEmmanuel Grumbach1-0/+2
2014-03-19cfg80211/mac80211: ignore signal if the frame was heard on wrong channelEmmanuel Grumbach3-29/+23
2014-03-19cfg80211: make __cfg80211_join_ibss() staticZhao, Gang2-8/+4
2014-03-19mac80211: release sched_scan_sdata when stopping sched scanAlexander Bondar1-2/+4
2014-03-19mac80211: fix WPA with VLAN on AP side with ps-sta againMichael Braun1-1/+1
2014-03-19mac80211: fix suspend vs. authentication raceJohannes Berg3-3/+38
2014-03-19mac80211: verify deauthentication and return error on failureJohannes Berg1-13/+17
2014-03-19mac80211: fix potential use-after-freeJohannes Berg1-1/+1
2014-03-18Bluetooth: Fix MITM flag when initiating SMP pairingJohan Hedberg1-0/+6
2014-03-18Bluetooth: Fix smp_e byte order to be consistent with SMP specificationJohan Hedberg1-55/+46
2014-03-18Bluetooth: Fix const declaration for swap function src parameterJohan Hedberg1-2/+2
2014-03-17Merge tag 'nfc-next-3.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville9-33/+331
2014-03-14NFC: llcp: Use list_for_each_entry in nfc_llcp_find_local()Axel Lin1-2/+2
2014-03-14NFC: Move checking valid gb_len value to nfc_llcp_set_remote_gbAxel Lin2-6/+5
2014-03-14NFC: Remove redundant test for dev->n_targets in nfc_find_targetAxel Lin1-3/+0
2014-03-14Bluetooth: Fix updating SMP remote key distribution informationJohan Hedberg1-0/+5
2014-03-13Bluetooth: make sure 6LOWPAN_IPHC is built-in if neededArnd Bergmann1-1/+1
2014-03-12Bluetooth: Convert uses of __constant_<foo> to <foo>Joe Perches11-96/+96
2014-03-11Bluetooth: Enable duplicates filter in background scanAndre Guedes1-5/+7
2014-03-11Bluetooth: Fix aborting eSCO connection in case of error 0x20Andrew Earl1-0/+1
2014-03-11Bluetooth: make bluetooth 6lowpan as an optionAlexander Aring3-2/+30
2014-03-11NFC: digital: Rename Type V tags to Type 5 tagsMark A. Greer1-1/+1
2014-03-10Bluetooth: Make LTK and CSRK only persisent when bondingMarcel Holtmann2-8/+17
2014-03-09Bluetooth: Add support for handling signature resolving keysMarcel Holtmann3-5/+94
2014-03-07Bluetooth: Fix skb allocation check for A2MPGustavo Padovan1-1/+7
2014-03-07Bluetooth: Fix expected key count debug logsJohan Hedberg1-3/+3
2014-03-05Bluetooth: Fix removing Long Term KeyClaudio Takahasi1-1/+7
2014-03-04Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville10-65/+131