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-06-056-37/+60
|\
| * Bluetooth: Fix L2CAP deadlockJukka Taimisto2014-06-021-1/+4
| * Bluetooth: Fix missing check for FIPS security levelJohan Hedberg2014-06-021-1/+2
| * Bluetooth: Fix requiring SMP MITM for outgoing connectionsJohan Hedberg2014-05-311-3/+4
| * Bluetooth: l2cap: Set more channel defaultsJukka Rissanen2014-05-301-0/+6
| * Bluetooth: 6LoWPAN: Fix MAC address universal/local bit handlingJukka Rissanen2014-05-301-30/+35
| * Bluetooth: Fix authentication check for FIPS security levelJohan Hedberg2014-05-301-0/+1
| * Bluetooth: Fix properly ignoring LTKs of unknown typesJohan Hedberg2014-05-301-2/+8
* | Merge tag 'nfc-next-3.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2014-05-304-8/+9
|\ \
| * | NFC: nfc_sock_link() can be staticFengguang Wu2014-05-261-2/+2
| * | NFC: digital: digital_in_send_attrib_req() can be staticFengguang Wu2014-05-261-1/+1
| * | NFC: digital: Randomize poll cyclesThierry Escande2014-05-261-2/+4
| * | NFC: digital: Return proper error code when sending ATR_REQThierry Escande2014-05-261-3/+2
* | | Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2014-05-298-120/+449
|\ \ \ | | |/ | |/|
| * | Bluetooth: Clearly distinguish mgmt LTK type from authenticated propertyJohan Hedberg2014-05-231-3/+16
| * | Bluetooth: Update smp_confirm to return a response codeJohan Hedberg2014-05-201-14/+11
| * | Bluetooth: Update smp_random to return a response codeJohan Hedberg2014-05-201-23/+11
| * | Bluetooth: Rename smp->smp_flags to smp->flagsJohan Hedberg2014-05-201-19/+18
| * | Bluetooth: Remove unnecessary work structs from SMP codeJohan Hedberg2014-05-201-16/+6
| * | Bluetooth: Fix setting initial local auth_req valueJohan Hedberg2014-05-201-4/+2
| * | Bluetooth: Make SMP context private to smp.cJohan Hedberg2014-05-205-29/+32
| * | Bluetooth: Add missing msecs to jiffies conversionAndrzej Kaczmarek2014-05-161-1/+2
| * | Bluetooth: Add support for max_tx_power in Get Conn InfoAndrzej Kaczmarek2014-05-151-6/+17
| * | Bluetooth: Store max TX power level for connectionAndrzej Kaczmarek2014-05-152-1/+12
| * | Bluetooth: Avoid polling TX power for LE linksAndrzej Kaczmarek2014-05-151-4/+10
| * | Bluetooth: Add support to get connection informationAndrzej Kaczmarek2014-05-151-0/+196
| * | Bluetooth: Add conn info lifetime parameters to debugfsAndrzej Kaczmarek2014-05-151-0/+63
| * | Bluetooth: Store TX power level for connectionAndrzej Kaczmarek2014-05-092-0/+29
| * | Bluetooth: Increment management interface revisionMarcel Holtmann2014-05-091-1/+1
| * | Bluetooth: Store RSSI for connectionAndrzej Kaczmarek2014-05-081-0/+23
| * | Bluetooth: Add support for SMP Invalid Parameters error codeJohan Hedberg2014-05-082-10/+11
| * | Bluetooth: Convert RFCOMM spinlocks into mutexesLibor Pechacek2014-05-052-11/+11
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-nextJohn W. Linville2014-05-2911-29/+187
|\ \ \
| * | | mac80211: set new interfaces as idle upon initAvraham Stern2014-05-281-0/+1
| * | | mac80211: reduce packet loss notifications under loadFelix Fietkau2014-05-281-6/+19
| * | | mac80211: don't check netdev state for debugfs read/writeArik Nemtsov2014-05-281-4/+2
| * | | mac80211: fix a memory leak on sta rate selection tableFelix Fietkau2014-05-281-0/+1
| * | | regdb: Generalize the mW to dBm power conversionchaitanya.mgit@gmail.com2014-05-271-12/+2
| * | | mac80211: fix IBSS join by initializing last_scan_completedKrzysztof Hałasa2014-05-271-0/+1
| * | | cfg80211: send events when devices are added/removedJohannes Berg2014-05-263-7/+22
| * | | mac80211: fix virtual monitor interface additionEmmanuel Grumbach2014-05-261-0/+1
| * | | mac80211: add a single-transaction driver op to switch contextsLuciano Coelho2014-05-262-0/+138
* | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2014-05-274-16/+36
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/blueto...John W. Linville2014-05-191-2/+2
| |\ \ \
| | * | | Bluetooth: Fix L2CAP LE debugfs entries permissionsSamuel Ortiz2014-05-141-2/+2
| * | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211John W. Linville2014-05-143-14/+34
| |\ \ \ \
| | * | | | mac80211: fix on-channel remain-on-channelJohannes Berg2014-05-142-7/+21
| | * | | | mac80211: fix suspend vs. association raceEmmanuel Grumbach2014-05-131-7/+13
* | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-nextJohn W. Linville2014-05-2234-573/+1173
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | cfg80211: allow RSSI compensationEmmanuel Grumbach2014-05-221-4/+8
OpenPOWER on IntegriCloud