summaryrefslogtreecommitdiffstats
path: root/net/nfc
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2012-07-203-4/+21
|\
| * Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2012-07-173-4/+21
| |\
| | * NFC: NCI module license 'unspecified' taints kernelDave Jones2012-07-121-0/+3
| | * NFC: Set target nfcid1 for all HCI reader A targetsEric Lapuyade2012-07-121-0/+15
| | * NFC: Fix order of arguments to list_add_tail() when queueing HCP framesMathias Jeppsson2012-07-101-1/+1
| | * NFC: Fix empty HCI message list checkMathias Jeppsson2012-07-101-3/+2
* | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2012-07-1211-223/+392
|\ \ \ | |/ /
| * | NFC: Check for llcp_sock and its device from llcp_sock_getnameSamuel Ortiz2012-07-091-0/+3
| * | NFC: Add ISO 14443 type B protocolSamuel Ortiz2012-07-093-4/+8
| * | NFC: Dereference LLCP bind socket address after checking for it to be NULLSamuel Ortiz2012-07-091-2/+2
| * | NFC: Do not return EBUSY when stopping a poll that's already stoppedSamuel Ortiz2012-07-091-0/+9
| * | NFC: Remove warning from nfc_llcp_local_putSamuel Ortiz2012-07-091-2/+0
| * | NFC: Handle LLCP Disconnected Mode framesSamuel Ortiz2012-07-091-0/+44
| * | NFC: LLCP late bindingSamuel Ortiz2012-07-092-77/+166
| * | NFC: Forbid SSAP binding to a not well known LLCP serviceSamuel Ortiz2012-07-091-17/+5
| * | NFC: Forbid LLCP service name reusingSamuel Ortiz2012-07-091-1/+3
| * | NFC: Release LLCP SAP when the owner is releasedSamuel Ortiz2012-07-093-14/+11
| * | NFC: Close listening LLCP sockets when the device is goneSamuel Ortiz2012-07-091-3/+8
| * | NFC: Build LLCP general bytes upon requestSamuel Ortiz2012-07-091-15/+17
| * | NFC: Fix LLCP getname socket opSamuel Ortiz2012-07-091-4/+7
| * | NFC: Update LLCP socket target index when getting a connectionSamuel Ortiz2012-07-091-0/+1
| * | NFC: Add netlink module alias for NFCSamuel Ortiz2012-07-091-0/+3
| * | NFC: Add modules alias for NFC socketsSamuel Ortiz2012-07-091-0/+1
| * | NFC: Allow HCI driver to pre-open pipes to some gatesEric Lapuyade2012-07-093-21/+15
| * | NFC: nfc_driver_failure() implementationEric Lapuyade2012-07-091-6/+2
| * | NFC: nfc_targets_found() should accept zero target foundEric Lapuyade2012-07-091-6/+13
| * | NFC: Core must test the device polling state inside the device lockEric Lapuyade2012-07-091-2/+7
| * | NFC: Implement HCI driver or internal error managementEric Lapuyade2012-07-091-4/+11
| * | NFC: Factorize HCI cmd completionEric Lapuyade2012-07-091-11/+16
| * | NFC: Driver failure APIEric Lapuyade2012-07-091-0/+10
| * | NFC: Changed HCI cmd execution completion result to std linux errnoEric Lapuyade2012-07-093-22/+23
| * | NFC: Implement HCP reaggregation allocation error caseEric Lapuyade2012-07-091-5/+10
| * | NFC: Remove an impossible HCI error caseEric Lapuyade2012-07-091-10/+0
| * | NFC: Handle SHDLC RSET frames from an SHDLC connected chipEric Lapuyade2012-07-091-4/+4
| * | NFC: Removed addressed shdlc TODOsEric Lapuyade2012-07-091-11/+0
| * | NFC: Prepare asynchronous error management for driver and shdlcEric Lapuyade2012-07-092-8/+19
| * | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2012-07-093-7/+10
| |\ \ | | |/
| * | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2012-06-121-0/+3
| |\ \
* | \ \ Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2012-07-101-1/+1
|\ \ \ \ | | |_|/ | |/| |
| * | | NFC: Prevent NULL deref when getting socket nameSasha Levin2012-07-091-1/+1
* | | | net: Use NLMSG_DEFAULT_SIZE in combination with nlmsg_new()Thomas Graf2012-06-281-9/+9
* | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2012-06-282-6/+9
|\ \ \ \ | |/ / /
| * | | NFC: Return from rawsock_release when sk is NULLEric Dumazet2012-06-261-1/+4
| * | | NFC: Prevent multiple buffer overflows in NCIDan Rosenberg2012-06-251-5/+5
| | |/ | |/|
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2012-06-121-0/+3
|\ \ \ | |/ / | | / | |/ |/|
| * NFC: Fix possible NULL ptr deref when getting the name of a socketSasha Levin2012-06-081-0/+3
* | NFC: Destroy LLCP timout workqueue when releasing the linkSamuel Ortiz2012-06-041-0/+1
* | NFC: Switch to Initiator mode when getting NFC_ATTR_PROTOCOLSSamuel Ortiz2012-06-041-2/+2
* | NFC: Send a receiver ready frame only to reply to an I frameSamuel Ortiz2012-06-041-1/+1
* | NFC: Requeue lost LLCP framesSamuel Ortiz2012-06-041-31/+55
OpenPOWER on IntegriCloud