summaryrefslogtreecommitdiffstats
path: root/net/nfc
Commit message (Expand)AuthorAgeFilesLines
* NFC: Fix nfc_llcp_local chained list insertionThierry Escande2012-11-201-1/+1
* Remove noisy printks from llcp_sock_connectDave Jones2012-10-041-6/+2
* workqueue: avoid using deprecated functionsLinus Torvalds2012-10-025-18/+18
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2012-09-2818-579/+1157
|\
| * NFC: Fix sleeping in atomic when releasing socketSzymon Janc2012-09-271-5/+5
| * NFC: Fix sleeping in invalid context when netlink socket is closedSzymon Janc2012-09-271-7/+39
| * NFC: Add dummy nfc_llc_shdlc_register definitionJohn W. Linville2012-09-271-0/+8
| * NFC: LLCP raw socket supportThierry Escande2012-09-274-4/+137
| * NFC: Use dynamic initialization for rwlocksSzymon Janc2012-09-271-2/+2
| * NFC: Fix typo negociating -> negotiatingWaldemar Rymarkiewicz2012-09-251-5/+5
| * NFC: Don't handle consequent RSET frames after UAWaldemar Rymarkiewicz2012-09-251-7/+31
| * NFC: Handle RSET in SHDLC_CONNECTING stateWaldemar Rymarkiewicz2012-09-251-1/+2
| * NFC: Add HCI module descriptionEric Lapuyade2012-09-251-0/+1
| * NFC: Fix LLC registration definitions for ANSI complianceEric Lapuyade2012-09-252-2/+2
| * NFC: Remove unneeded LLC symbols exportSamuel Ortiz2012-09-253-17/+1
| * NFC: Changed HCI and PN544 HCI driver to use the new HCI LLC CoreEric Lapuyade2012-09-254-1009/+123
| * NFC: Add an shdlc llc module to llc coreEric Lapuyade2012-09-254-2/+851
| * NFC: Add a nop (passthrough) llc module to llc coreEric Lapuyade2012-09-254-2/+105
| * NFC: Add an LLC Core layer to HCIEric Lapuyade2012-09-254-1/+241
| * NFC: Modified hci_transceive to become an asynchronous operationEric Lapuyade2012-09-252-20/+42
| * NFC: Add a public nfc_hci_send_cmd_async methodEric Lapuyade2012-09-251-1/+33
| * NFC: Changed the HCI cmd execution callback prototypeEric Lapuyade2012-09-254-24/+21
| * NFC: Correct outgoing frame before requeueingWaldemar Rymarkiewicz2012-09-251-2/+1
| * NFC: Remove crc generation from shdlc layerWaldemar Rymarkiewicz2012-09-251-25/+2
| * NFC: Fix possible LLCP memory leakWei Yongjun2012-09-251-5/+9
| * NFC: Remove pointless conditional before HCI kfree_skb()Wei Yongjun2012-09-252-4/+2
| * NFC: Use system_nrt_wq instead of custom onesTejun Heo2012-09-256-118/+26
| * NFC: Remove repeated code for NULL checkSyam Sidhardhan2012-09-251-3/+0
| * NFC: Implement NCI dep_link_up and dep_link_downIlan Elias2012-09-252-1/+55
| * NFC: Parse NCI NFC-DEP activation paramsIlan Elias2012-09-251-0/+32
| * NFC: Set local general bytes in nci_start_pollIlan Elias2012-09-252-0/+69
* | netlink: Rename pid to portid to avoid confusionEric W. Biederman2012-09-101-13/+13
|/
* 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
OpenPOWER on IntegriCloud