summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* NFC: NCI: Fix NCI RF FRAME interface usageVincent Cuissard2014-09-011-2/+5
* NFC: NCI: Fix nci_register_device init sequenceVincent Cuissard2014-09-011-8/+5
* NFC: NCI: Add support of ISO15693Vincent Cuissard2014-09-012-0/+39
* NFC: digital: Add Inititor-side PSL supportMark A. Greer2014-08-311-0/+101
* wireless: core: Reorder wiphy_register() notifications relevantlyTomasz Bursztyka2014-08-251-4/+3
* Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2014-08-2512-548/+766
|\
| * Bluetooth: Fix ERTM L2CAP resend packetLukasz Rymanowski2014-08-141-3/+5
| * Bluetooth: Improve data packing in SAR modeLukasz Rymanowski2014-08-141-4/+1
| * mac802154: common tx error pathVarka Bhadram2014-08-141-7/+8
| * ieee802154: 6lowpan: remove unused functionAlexander Aring2014-08-141-8/+0
| * mac802154: common error pathVarka Bhadram2014-08-141-4/+6
| * mac802154: cleanup in rx pathVarka Bhadram2014-08-141-3/+2
| * Bluetooth: Make smp_chan_destroy() private to smp.cJohan Hedberg2014-08-142-52/+50
| * Bluetooth: Always call smp_distribute_keys() from a workqueueJohan Hedberg2014-08-141-16/+26
| * Bluetooth: Move canceling security_timer into smp_chan_destroy()Johan Hedberg2014-08-141-6/+6
| * Bluetooth: Remove unused l2cap_conn->security_timerJohan Hedberg2014-08-141-17/+1
| * Bluetooth: Add SMP-internal timeout callbackJohan Hedberg2014-08-141-9/+43
| * Bluetooth: Fix double free of SMP data skbJohan Hedberg2014-08-141-7/+6
| * Bluetooth: Call l2cap_conn_shutdown() when SMP recv callback failsJohan Hedberg2014-08-141-1/+19
| * Bluetooth: Add public l2cap_conn_shutdown() API to request disconnectionJohan Hedberg2014-08-141-0/+25
| * Bluetooth: Use L2CAP resume callback to call smp_distribute_keysJohan Hedberg2014-08-143-191/+196
| * Bluetooth: Convert SMP to use l2cap_chan infrastructureJohan Hedberg2014-08-143-67/+66
| * Bluetooth: Make AES crypto context private to SMPJohan Hedberg2014-08-143-27/+32
| * Bluetooth: Add SMP L2CAP channel skeletonJohan Hedberg2014-08-141-1/+130
| * Bluetooth: Move SMP (de)initialization to smp.cJohan Hedberg2014-08-143-30/+31
| * Bluetooth: Move SMP initialization after HCI initJohan Hedberg2014-08-141-7/+3
| * Bluetooth: Refactor SMP (de)initialization into separate functionsJohan Hedberg2014-08-141-12/+34
| * Bluetooth: Fix IRK lookup when tfm_aes is not availableJohan Hedberg2014-08-141-0/+3
| * Bluetooth: Fix hci_update_random_address() error return for no cryptoJohan Hedberg2014-08-141-0/+6
| * Bluetooth: Fix using HCI_CONN_LE_SMP_PEND to check for SMP contextJohan Hedberg2014-08-141-1/+1
| * Bluetooth: Call l2cap_le_conn_ready after notifying channelsJohan Hedberg2014-08-141-3/+3
| * Bluetooth: Call L2CAP teardown callback before clearing chan->connJohan Hedberg2014-08-141-2/+2
| * Bluetooth: Move parts of fixed channel initialization to l2cap_add_scidJohan Hedberg2014-08-142-9/+4
| * Bluetooth: Remove special ATT data channel handlingJohan Hedberg2014-08-141-79/+0
| * Bluetooth: Improve fixed channel lookup based on link typeJohan Hedberg2014-08-141-3/+8
| * Bluetooth: Move L2CAP fixed channel creation into l2cap_conn_cfmJohan Hedberg2014-08-141-44/+80
| * Bluetooth: Refactor l2cap_connect_cfmJohan Hedberg2014-08-141-5/+8
| * Bluetooth: Remove special handling of ATT in l2cap_security_cfm()Johan Hedberg2014-08-141-9/+2
| * Bluetooth: Resume BT_CONNECTED state after LE security elevationJohan Hedberg2014-08-141-0/+6
| * Bluetooth: Fix __l2cap_no_conn_pending() usage with all channelsJohan Hedberg2014-08-141-0/+3
| * Bluetooth: Fix reference counting of global L2CAP channelsJohan Hedberg2014-08-141-8/+28
| * Bluetooth: Fix confusion between parent and child channel for 6lowpanJohan Hedberg2014-08-141-5/+5
| * Bluetooth: Remove redundant check for remote_key_distJohan Hedberg2014-08-141-2/+1
| * Bluetooth: Disable page scan if all whitelisted devices are connectedJohan Hedberg2014-08-142-4/+27
| * Bluetooth: Create unified helper function for updating page scanJohan Hedberg2014-08-142-60/+43
| * Bluetooth: Add convenience function to check for pending power offJohan Hedberg2014-08-141-24/+28
* | mac80211: fix channel switch for chanctx-based driversMichal Kazior2014-08-221-1/+1
* | net: sctp: fix suboptimal edge-case on non-active active/retrans path selectionDaniel Borkmann2014-08-221-6/+3
* | net: sctp: spare unnecessary comparison in sctp_trans_elect_bestDaniel Borkmann2014-08-221-1/+1
* | openvswitch: fix panic with multiple vlan headersJiri Benc2014-08-221-0/+5