summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2014-03-2015-183/+360
|\
| * Bluetooth: Enforce strict Secure Connections Only mode securityMarcel Holtmann2014-03-192-0/+23
| * Bluetooth: Fix Pair Device response parameters for pairing failureJohan Hedberg2014-03-191-2/+14
| * Bluetooth: Fix SMP user passkey notification mgmt eventJohan Hedberg2014-03-191-2/+3
| * Bluetooth: Increase SMP re-encryption delay to 500msJohan Hedberg2014-03-191-1/+1
| * Bluetooth: Simplify logic when checking SMP_FLAG_TK_VALIDJohan Hedberg2014-03-191-4/+2
| * Bluetooth: Fix MITM flag when initiating SMP pairingJohan Hedberg2014-03-181-0/+6
| * Bluetooth: Fix smp_e byte order to be consistent with SMP specificationJohan Hedberg2014-03-181-55/+46
| * Bluetooth: Fix const declaration for swap function src parameterJohan Hedberg2014-03-181-2/+2
| * Bluetooth: Fix updating SMP remote key distribution informationJohan Hedberg2014-03-141-0/+5
| * Bluetooth: make sure 6LOWPAN_IPHC is built-in if neededArnd Bergmann2014-03-131-1/+1
| * Bluetooth: Convert uses of __constant_<foo> to <foo>Joe Perches2014-03-1211-96/+96
| * Bluetooth: Enable duplicates filter in background scanAndre Guedes2014-03-111-5/+7
| * Bluetooth: Fix aborting eSCO connection in case of error 0x20Andrew Earl2014-03-111-0/+1
| * Bluetooth: make bluetooth 6lowpan as an optionAlexander Aring2014-03-113-2/+30
| * Bluetooth: Make LTK and CSRK only persisent when bondingMarcel Holtmann2014-03-102-8/+17
| * Bluetooth: Add support for handling signature resolving keysMarcel Holtmann2014-03-093-5/+94
| * Bluetooth: Fix skb allocation check for A2MPGustavo Padovan2014-03-071-1/+7
| * Bluetooth: Fix expected key count debug logsJohan Hedberg2014-03-071-3/+3
| * Bluetooth: Fix removing Long Term KeyClaudio Takahasi2014-03-051-1/+7
* | Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2014-03-2022-176/+298
|\ \
| * | cfg80211: remove macro ASSERT_RDEV_LOCK(rdev)Zhao, Gang2014-03-194-5/+2
| * | cfg80211: remove unnecessary checkZhao, Gang2014-03-191-3/+0
| * | mac80211: set beamforming bit in radiotapEmmanuel Grumbach2014-03-191-0/+2
| * | cfg80211/mac80211: ignore signal if the frame was heard on wrong channelEmmanuel Grumbach2014-03-193-29/+23
| * | cfg80211: make __cfg80211_join_ibss() staticZhao, Gang2014-03-192-8/+4
| * | mac80211: release sched_scan_sdata when stopping sched scanAlexander Bondar2014-03-191-2/+4
| * | mac80211: fix WPA with VLAN on AP side with ps-sta againMichael Braun2014-03-191-1/+1
| * | mac80211: fix suspend vs. authentication raceJohannes Berg2014-03-193-3/+38
| * | mac80211: verify deauthentication and return error on failureJohannes Berg2014-03-191-13/+17
| * | mac80211: fix potential use-after-freeJohannes Berg2014-03-191-1/+1
| * | cfg80211: allow reprocessing of pending requestsLuis R. Rodriguez2014-03-031-6/+8
| * | mac80211: add missing update on rx status VHT flagChun-Yeow Yeoh2014-03-031-0/+1
| * | mac80211: refactor channel switch functionMichal Kazior2014-03-031-50/+63
| * | cfg80211: send stop AP event only due to internal reasonIlan Peer2014-02-255-8/+9
| * | cfg80211: DFS get CAC time from regulatory databaseJanusz Dziedzic2014-02-255-6/+72
| * | cfg80211: regulatory: allow getting DFS CAC time from userspaceJanusz Dziedzic2014-02-253-8/+45
| * | cfg80211: regulatory: allow user to set world regdomainJanusz Dziedzic2014-02-251-3/+0
| * | cfg80211: regulatory: simplify uevent sendingJohannes Berg2014-02-252-30/+8
* | | Merge tag 'nfc-next-3.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2014-03-179-33/+331
|\ \ \
| * | | NFC: llcp: Use list_for_each_entry in nfc_llcp_find_local()Axel Lin2014-03-141-2/+2
| * | | NFC: Move checking valid gb_len value to nfc_llcp_set_remote_gbAxel Lin2014-03-142-6/+5
| * | | NFC: Remove redundant test for dev->n_targets in nfc_find_targetAxel Lin2014-03-141-3/+0
| * | | NFC: digital: Rename Type V tags to Type 5 tagsMark A. Greer2014-03-111-1/+1
| * | | NFC: Use LIST_HEAD() at appropriate placesAxel Lin2014-02-232-6/+2
| * | | NFC: digital: Use matching_[im|tm]_protocols to check with NFC protocols masksAxel Lin2014-02-231-2/+2
| * | | NFC: Use list_for_each_entry in nfc_find_se()Axel Lin2014-02-231-2/+2
| * | | NFC: NCI: Use reinit_completion() at appropriate placesAxel Lin2014-02-232-2/+4
| * | | NFC: digital: Fix a possible memory leakThierry Escande2014-02-161-5/+13
| * | | NFC: digital: Add missing break in switch statementThierry Escande2014-02-161-0/+1
OpenPOWER on IntegriCloud