summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'nfc-next-3.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s...John W. Linville2012-10-2916-113/+630
|\
| * NFC: Extend netlink interface for LTO, RW, and MIUX parameters supportThierry Escande2012-10-295-19/+174
| * NFC: Purge LLCP socket Tx queues when being disconnectedSamuel Ortiz2012-10-261-0/+31
| * NFC: Remove CONFIG_EXPERIMENTAL from the NCI MakefileKees Cook2012-10-261-2/+2
| * NFC: Remove CONFIG_EXPERIMENTAL from the LLCP MakefileKees Cook2012-10-261-2/+2
| * NFC: Remove CONFIG_EXPERIMENTALKees Cook2012-10-261-2/+2
| * NFC: Fix some code style and whitespace issuesSzymon Janc2012-10-268-17/+17
| * NFC: Use IDR library to assing NFC devices IDsSamuel Ortiz2012-10-261-7/+16
| * NFC: Return NULL when no LLCP socket for a dsap,ssap couple is foundSamuel Ortiz2012-10-261-4/+6
| * NFC: Implement LLCP connection less Tx pathSamuel Ortiz2012-10-261-0/+19
| * NFC: UI frame sending routine implementationSamuel Ortiz2012-10-262-0/+48
| * NFC: Forward LLCP datagrams to userspaceSamuel Ortiz2012-10-261-1/+18
| * NFC: Handle LLCP UI framesSamuel Ortiz2012-10-262-0/+45
| * NFC: Keep connection less bound sockets alive when DEP link goes downSamuel Ortiz2012-10-261-0/+10
| * NFC: Check for connection less sockets when looking for a service nameSamuel Ortiz2012-10-261-1/+6
| * NFC: Reserve LLCP ssap when replying to an SNL frameSamuel Ortiz2012-10-261-6/+40
| * NFC: Fix sparse warnings due to missing staticArron Wang2012-10-261-1/+1
| * NFC: Fix style issues with logical operationsSzymon Janc2012-10-262-10/+10
| * NFC: Fix not propagating return code in nfc_hci_clear_all_pipesSzymon Janc2012-10-261-6/+2
| * NFC: Small nfc_hci_create_pipe refactoringSzymon Janc2012-10-261-8/+8
| * NFC: Remove unneeded LLCP function return callsSzymon Janc2012-10-261-9/+0
| * NFC: Remove not needed local variable in nci_set_local_general_bytesSzymon Janc2012-10-261-6/+4
| * NFC: Use NFC_MAX_GT_LEN to check len in nci_set_local_general_bytesSzymon Janc2012-10-261-1/+1
| * NFC: Add NFC_ATTR_RF_MODE when sending device netlink propertiesThierry Escande2012-10-261-1/+2
| * NFC: Set rf_mode to NFC_RF_NONE where necessaryThierry Escande2012-10-261-0/+5
| * NFC: Initial SNL supportSamuel Ortiz2012-10-261-0/+65
| * NFC: Add SNL frame building routineSamuel Ortiz2012-10-262-0/+47
| * NFC: Use llcp_allocate_pdu to build the DISC framesSamuel Ortiz2012-10-261-9/+1
| * NFC: Avoid falling back to SYMM when sk is NULLSamuel Ortiz2012-10-261-3/+4
| * NFC: HCI check presence must not fail when driver doesn't support itEric Lapuyade2012-10-261-0/+3
| * NFC: Implement HCI DEP send and receive dataArron Wang2012-10-261-4/+15
| * NFC: Implement HCI DEP link up and downArron Wang2012-10-261-0/+24
| * NFC: Handle pn544 continue activationArron Wang2012-10-261-1/+3
| * NFC: Pass hardware specific HCI event to driverArron Wang2012-10-261-3/+9
* | Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2012-10-2910-18/+91
|\ \ | |/ |/|
| * mac80211: complete bss_info tracingJohannes Berg2012-10-251-3/+31
| * mac80211: use non-atomic bitmap operation for local variableJohannes Berg2012-10-251-1/+1
| * mac80211: remove duplicate check in ieee80211_rx_mgmt_beaconRami Rosen2012-10-251-5/+4
| * cfg80211: add tracing for P2P Device start/stopJohannes Berg2012-10-234-4/+32
| * mac80211: expose AES-CMAC subkey calculationAssaf Krauss2012-10-231-0/+17
| * mac80211: mesh STAs only process mesh beaconsThomas Pedersen2012-10-231-4/+5
| * mac80211: fix WDS channel context testJohannes Berg2012-10-221-1/+1
* | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2012-10-237-31/+45
|\ \
| * \ Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2012-10-173-24/+34
| |\ \
| | * | mac80211: connect with HT20 if HT40 is not permittedJohannes Berg2012-10-171-10/+20
| | * | cfg80211/mac80211: avoid state mishmash on deauthStanislaw Gruszka2012-10-152-11/+6
| | * | Merge remote-tracking branch 'wireless/master' into mac80211Johannes Berg2012-10-15460-9632/+17843
| | |\ \
| | * | | mac80211: Fix FC masking in BIP AAD generationJouni Malinen2012-10-011-3/+8
| * | | | mac80211: use ieee80211_free_txskb in a few more placesFelix Fietkau2012-10-153-5/+5
| * | | | mac80211: check if key has TKIP type before updating IVStanislaw Gruszka2012-10-151-1/+2
OpenPOWER on IntegriCloud