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