aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/ethoc.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2016-07-20 23:39:36 -0700
committerDavid S. Miller <davem@davemloft.net>2016-07-20 23:39:36 -0700
commit276b8c77c3e4838f574d37e25ec8ba52d0418475 (patch)
tree99bf7313765ca10e40d5a1edde2a5db44143bfb7 /drivers/net/ethernet/ethoc.c
parentsamples: Add an IPv6 '-6' option to the pktgen scripts (diff)
parentNFC: nfcsim: Simulate lost frames through debugfs entry (diff)
downloadlinux-dev-276b8c77c3e4838f574d37e25ec8ba52d0418475.tar.xz
linux-dev-276b8c77c3e4838f574d37e25ec8ba52d0418475.zip
Merge tag 'nfc-next-4.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next
Samuel Ortiz says: ==================== NFC 4.8 pull request This is the first NFC pull request for 4.8. We have: - A fairly large NFC digital stack patchset: * RTOX fixes. * Proper DEP RWT support. * ACK and NACK PDUs handling fixes, in both initiator and target modes. * A few memory leak fixes. - A conversion of the nfcsim driver to use the digital stack. The driver supports the DEP protocol in both NFC-A and NFC-F. - Error injection through debugfs for the nfcsim driver. - Improvements to the port100 driver for the Sony USB chipset, in particular to the command abort and cancellation code paths. - A few minor fixes for the pn533, trf7970a and fdp drivers. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/ethoc.c')
0 files changed, 0 insertions, 0 deletions