summaryrefslogtreecommitdiffstats
path: root/include/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2014-03-203-19/+31
|\
| * 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-191-8/+8
| * mac80211: add status_driver_data array to ieee80211_tx_infoEliad Peller2014-03-191-2/+2
| * cfg80211: DFS get CAC time from regulatory databaseJanusz Dziedzic2014-02-251-1/+4
| * cfg80211: regulatory: allow getting DFS CAC time from userspaceJanusz Dziedzic2014-02-252-8/+15
* | Merge tag 'nfc-next-3.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2014-03-172-0/+10
|\ \
| * | NFC: digital: Rename Type V tags to Type 5 tagsMark A. Greer2014-03-111-1/+1
| * | NFC: digital: Add poll support for type 4A tag platformThierry Escande2014-02-161-0/+3
| * | NFC: Add ISO/IEC 15693 header definitionsMark A. Greer2014-02-162-0/+7
* | | Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2014-03-033-14/+101
|\ \ \
| * | | Bluetooth: Remove unnecessary stop_scan_complete functionJohan Hedberg2014-02-281-0/+1
| * | | Bluetooth: Add timeout for LE connection attemptsJohan Hedberg2014-02-282-0/+2
| * | | Bluetooth: Add defines for LE initiator filter policyJohan Hedberg2014-02-281-0/+3
| * | | Bluetooth: Track LE initiator and responder address informationJohan Hedberg2014-02-281-0/+4
| * | | Bluetooth: Use __le64 type for LE random numbersMarcel Holtmann2014-02-283-7/+7
| * | | Bluetooth: Add timer to force power offJohan Hedberg2014-02-271-0/+1
| * | | Bluetooth: Add support for storing LE white list entriesMarcel Holtmann2014-02-281-0/+7
| * | | Bluetooth: Add definitions for LE white list HCI commandsMarcel Holtmann2014-02-281-0/+14
| * | | Bluetooth: Make hci_blacklist_clear function staticMarcel Holtmann2014-02-281-1/+0
| * | | Bluetooth: Add hci_copy_identity_address convenience functionJohan Hedberg2014-02-271-0/+2
| * | | Bluetooth: Add tracking of advertising address typeJohan Hedberg2014-02-271-0/+1
| * | | Bluetooth: Create hci_req_add_le_passive_scan helperAndre Guedes2014-02-261-0/+1
| * | | Bluetooth: Connection parameters and resolvable addressAndre Guedes2014-02-261-3/+3
| * | | Bluetooth: Introduce LE auto connect optionsAndre Guedes2014-02-261-1/+8
| * | | Bluetooth: Introduce LE auto connection infrastructureAndre Guedes2014-02-261-0/+2
| * | | Bluetooth: Introduce hdev->pend_le_conn listAndre Guedes2014-02-261-0/+7
| * | | Bluetooth: Refactor HCI connection codeAndre Guedes2014-02-261-2/+4
| * | | Bluetooth: Stop scanning on LE connectionAndre Guedes2014-02-261-0/+1
| * | | Bluetooth: Declare le_conn_failed in hci_core.hAndre Guedes2014-02-261-0/+2
| * | | Bluetooth: Create hci_req_add_le_scan_disable helperAndre Guedes2014-02-261-0/+2
| * | | Bluetooth: Move check for MGMT_CONNECTED flag into mgmt.cJohan Hedberg2014-02-241-1/+2
| * | | Bluetooth: Move HCI_ADVERTISING handling into mgmt.cJohan Hedberg2014-02-241-0/+1
| * | | Bluetooth: Add convenience function for getting total connection countJohan Hedberg2014-02-241-0/+7
| * | | Bluetooth: Store current RPA and update it if neededMarcel Holtmann2014-02-241-0/+1
| * | | Bluetooth: Use unresolvable private address for active scanningMarcel Holtmann2014-02-241-1/+2
| * | | Bluetooth: Remove unneeded hdev->own_addr_typeJohan Hedberg2014-02-231-1/+0
| * | | Bluetooth: Add hci_update_random_address() convenience functionJohan Hedberg2014-02-231-0/+2
| * | | Bluetooth: Add timer for regenerating local RPAJohan Hedberg2014-02-232-0/+6
| * | | Bluetooth: Add mgmt defines for privacyJohan Hedberg2014-02-221-0/+8
| * | | Bluetooth: Add initial code for distributing local IRKJohan Hedberg2014-02-222-0/+3
* | | | Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2014-02-246-31/+207
|\| | | | |_|/ |/| |
| * | Bluetooth: Provide option for changing LE advertising channel mapMarcel Holtmann2014-02-211-0/+1
| * | Bluetooth: Track the current configured random addressMarcel Holtmann2014-02-201-0/+1
| * | Bluetooth: Replace own_address_type with force_static_address debugfsMarcel Holtmann2014-02-201-0/+1
| * | Bluetooth: Add support for sending New IRK eventJohan Hedberg2014-02-192-0/+8
| * | Bluetooth: Move SMP LTK notification after key distributionJohan Hedberg2014-02-191-3/+2
| * | Bluetooth: Move New LTK store hint evaluation into mgmt_new_ltkJohan Hedberg2014-02-191-1/+1
| * | Bluetooth: Return added key when adding LTKs and IRKsJohan Hedberg2014-02-191-5/+6
| * | Bluetooth: Wait for SMP key distribution completion when pairingJohan Hedberg2014-02-181-0/+1