summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* nfc: Fix FSF address in file headersJeff Kirsher2013-12-1122-61/+22
* rfkill: Fix FSF address in file headersJeff Kirsher2013-12-111-3/+1
* Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2013-12-116-73/+877
|\
| * Bluetooth: Fix handling of L2CAP Command Reject over LEJohan Hedberg2013-12-101-0/+26
| * Bluetooth: Use macros for connectionless slave broadcast featuresMarcel Holtmann2013-12-091-3/+3
| * Bluetooth: Increase minor version of core moduleMarcel Holtmann2013-12-071-1/+1
| * Bluetooth: Fix valid LE PSM checkJohan Hedberg2013-12-051-1/+1
| * Bluetooth: Use min_t for calculating chan->mpsJohan Hedberg2013-12-051-5/+1
| * Bluetooth: Simplify l2cap_chan initialization for LE CoCJohan Hedberg2013-12-052-25/+14
| * Bluetooth: Add debugfs controls for LE CoC MPS and CreditsJohan Hedberg2013-12-051-4/+12
| * Bluetooth: Fix validating LE PSM valuesJohan Hedberg2013-12-052-11/+44
| * Bluetooth: Fix CID ranges for LE CoC CID allocationsJohan Hedberg2013-12-051-2/+7
| * Bluetooth: Fix clearing of chan->omtu for LE CoC channelsJohan Hedberg2013-12-051-4/+4
| * Bluetooth: Limit LE MPS to the MTU valueJohan Hedberg2013-12-051-4/+14
| * Bluetooth: Fix suspending the L2CAP socket if we start with 0 creditsJohan Hedberg2013-12-051-0/+3
| * Bluetooth: Fix LE L2CAP Connect Request handling together with SMPJohan Hedberg2013-12-051-0/+3
| * Bluetooth: Implement LE L2CAP reassemblyJohan Hedberg2013-12-051-3/+76
| * Bluetooth: Add LE L2CAP segmentation support for outgoing dataJohan Hedberg2013-12-051-1/+126
| * Bluetooth: Introduce L2CAP channel callback for suspendingJohan Hedberg2013-12-051-0/+9
| * Bluetooth: Reject LE CoC commands when the feature is not enabledJohan Hedberg2013-12-051-0/+11
| * Bluetooth: Add LE flow control disciplineJohan Hedberg2013-12-051-1/+66
| * Bluetooth: Implement returning of LE L2CAP creditsJohan Hedberg2013-12-051-0/+26
| * Bluetooth: Add new BT_SNDMTU and BT_RCVMTU socket optionsJohan Hedberg2013-12-051-0/+76
| * Bluetooth: Limit L2CAP_OPTIONS socket option usage with LEJohan Hedberg2013-12-051-0/+15
| * Bluetooth: Track LE L2CAP credits in l2cap_chanJohan Hedberg2013-12-052-5/+13
| * Bluetooth: Add LE L2CAP flow control modeJohan Hedberg2013-12-052-3/+31
| * Bluetooth: Make l2cap_le_sig_cmd logic consistentJohan Hedberg2013-12-051-8/+16
| * Bluetooth: Add L2CAP Disconnect suppport for LEJohan Hedberg2013-12-051-0/+7
| * Bluetooth: Fix L2CAP channel closing for LE connectionsJohan Hedberg2013-12-051-2/+4
| * Bluetooth: Add basic LE L2CAP connect request receiving supportJohan Hedberg2013-12-051-0/+152
| * Bluetooth: Refactor L2CAP connect rejection to its own functionJohan Hedberg2013-12-051-18/+24
| * Bluetooth: Add smp_sufficient_security helper functionJohan Hedberg2013-12-052-4/+13
| * Bluetooth: Add initial code for LE L2CAP Connect RequestJohan Hedberg2013-12-051-8/+98
| * Bluetooth: Move LE L2CAP initiator procedure to its own functionJohan Hedberg2013-12-051-1/+6
| * Bluetooth: Pass command length to LE signaling channel handlersJohan Hedberg2013-12-051-6/+6
| * Bluetooth: Allow l2cap_chan_check_security() to be used for LE links.Johan Hedberg2013-12-051-0/+3
| * Bluetooth: Update l2cap_global_chan_by_psm() to take a link typeJohan Hedberg2013-12-051-3/+11
| * Bluetooth: Add module parameter to enable LE CoC supportJohan Hedberg2013-12-051-6/+12
| * Bluetooth: Remove unnecessary braces from one-line if-statementJohan Hedberg2013-12-051-3/+2
* | Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2013-12-094-79/+70
|\|
| * Bluetooth: Remove dead code from SMP encryption functionJohan Hedberg2013-12-041-8/+1
| * Bluetooth: Remove useless smp_rand functionJohan Hedberg2013-12-041-13/+2
| * Bluetooth: Refactor hci_disconn_complete_evtAndre Guedes2013-12-041-22/+21
| * Bluetooth: Remove unneeded check in hci_disconn_complete_evt()Andre Guedes2013-12-041-10/+9
| * Bluetooth: Remove unnecessary 'send' parameter from smp_failure()Johan Hedberg2013-12-041-8/+8
| * Bluetooth: Remove link type check in hci_disconn_complete_evt()Andre Guedes2013-12-041-2/+1
| * Bluetooth: Add an extra check in mgmt_device_disconnected()Andre Guedes2013-12-041-0/+3
| * Bluetooth: Check address in mgmt_disconnect_failed()Andre Guedes2013-12-041-1/+11
| * Bluetooth: Store supported commands only during setup procedureMarcel Holtmann2013-12-041-1/+4
| * Bluetooth: Remove debug statement for features complete eventMarcel Holtmann2013-12-041-6/+0