summaryrefslogtreecommitdiffstats
path: root/net/nfc
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2013-04-301-2/+3
|\
| * NFC: llcp: two bugs in ->getname()Dan Carpenter2013-04-251-2/+3
* | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2013-04-299-79/+9Star
|\ \
| * | NFC: Add missing RFKILL dependency for KconfigMarcel Holtmann2013-04-271-0/+1
| * | NFC: Move LLCP code to the NFC top level diirectorySamuel Ortiz2013-04-269-79/+8Star
* | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2013-04-245-54/+194
|\| |
| * | NFC: RFKILL supportSamuel Ortiz2013-04-121-0/+38
| * | NFC: Prevent polling when device is downSamuel Ortiz2013-04-111-0/+5
| * | NFC: llcp: Terminate connection when receiving a DISC on (0,0)Samuel Ortiz2013-04-111-0/+6
| * | NFC: llcp: Remove local_cleanup last argumentSamuel Ortiz2013-04-111-4/+4
| * | NFC: llcp: Only keep raw sockets alive when the LLCP local leavesSamuel Ortiz2013-04-111-23/+3Star
| * | NFC: llcp: Add support in getsockopt for RW, LTO, and MIU remote parametersThierry Escande2013-04-111-1/+22
| * | NFC: llcp: Reset RW, LTO, and MIU remote parameters when link goes downThierry Escande2013-04-113-2/+13
| * | NFC: llcp: Use localy stored remote_miu value if not set at socket levelThierry Escande2013-04-113-3/+12
| * | NFC: llcp: Aggregated frames supportThierry Escande2013-04-112-12/+69
| * | NFC: llcp: Fix zero octets length SDU handlingOlivier Guiter2013-04-111-8/+8
| * | NFC: llcp: Fall back to local values when getting socket optionsSamuel Ortiz2013-04-111-3/+13
| * | NFC: llcp: Socket miux is a big endian fieldSamuel Ortiz2013-04-113-6/+9
| * | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2013-04-102-11/+3Star
| |\ \
* | \ \ Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2013-04-082-11/+6Star
|\ \ \ \ | | |_|/ | |/| |
| * | | NFC: llcp: fix info leaks via msg_name in llcp_sock_recvmsg()Mathias Krause2013-04-071-0/+3
| | |/ | |/|
| * | NFC: llcp: Keep the connected socket parent pointer aliveSamuel Ortiz2013-03-261-1/+3
| * | NFC: llcp: Remove possible double call to kfree_skbThierry Escande2013-03-201-2/+0Star
| * | NFC: llcp: Detach socket from process context only when releasing the socketSamuel Ortiz2013-03-202-8/+0Star
* | | net: fix smatch warnings inside datagram_pollJacob Keller2013-04-021-1/+1
* | | net: add option to enable error queue packets waking selectKeller, Jacob E2013-04-011-1/+2
| |/ |/|
* | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2013-03-182-9/+55
|\|
| * NFC: llcp: Report error to pending sockets when a device is removedSamuel Ortiz2013-03-081-4/+12
| * NFC: llcp: Clean raw sockets from nfc_llcp_socket_releaseSamuel Ortiz2013-03-081-0/+29
| * NFC: llcp: Clean local timers and works when removing a deviceSamuel Ortiz2013-03-081-7/+14
| * NFC: llcp: Decrease socket ack log when accepting a connectionSamuel Ortiz2013-03-081-0/+2
* | NFC: llcp: Add cleanup support for unreplied SNL requestsThierry Escande2013-03-103-0/+57
* | NFC: llcp: Service Name Lookup netlink interfaceThierry Escande2013-03-105-0/+302
* | NFC: llcp: Service Name Lookup SDRES aggregationThierry Escande2013-03-103-27/+94
* | NFC: Add missing type policies for netlink attributesThierry Escande2013-03-101-0/+3
* | NFC: llcp: Remove redundant printkSamuel Ortiz2013-03-101-2/+0Star
* | NFC: llcp: Use socket specific link parameters before the local onesSamuel Ortiz2013-03-103-8/+23
* | NFC: llcp: Implement socket optionsSamuel Ortiz2013-03-102-2/+120
* | NFC: llcp: Rename socket rw and miu fieldsSamuel Ortiz2013-03-104-16/+19
|/
* hlist: drop the node parameter from iteratorsSasha Levin2013-02-281-10/+6Star
* Merge tag 'driver-core-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/...Linus Torvalds2013-02-211-2/+2
|\
| * driver-core: constify data for class_find_device()Michał Mirosław2013-02-061-2/+2
* | NFC: llcp: integer underflow in nfc_llcp_set_remote_gb()Dan Carpenter2013-02-081-3/+2Star
* | NFC: Use skb_copy_datagram_iovecSamuel Ortiz2013-01-111-1/+1
* | NFC: Avoid memcpy on LLCP connection less Rx pathSamuel Ortiz2013-01-111-8/+8
* | NFC: Initial Secure Element APISamuel Ortiz2013-01-104-1/+8
* | NFC: Add HCI quirks to support driver (non)standard implementationsEric Lapuyade2013-01-102-1/+9
* | NFC: Fixed skb leak in tm_send() nfc and hci ops implementationsEric Lapuyade2013-01-101-2/+4
* | NFC: Changed event_received hci ops result semanticEric Lapuyade2013-01-101-6/+8
* | NFC: Added error handling in event_received hci opsEric Lapuyade2013-01-101-3/+5