summaryrefslogtreecommitdiff
path: root/proto_vlan.c
AgeCommit message (Expand)AuthorFilesLines
2015-05-04netsniff-ng: Rename protocol dissector member of struct pkt_buffTobias Klauser1-2/+2
2014-08-07dissectors: Use __packed macro instead of open-coding itTobias Klauser1-1/+1
2014-02-24dissectors: Get rid of unecessary includes of protos.hTobias Klauser1-1/+0
2013-03-15all: import netsniff-ng 0.5.8-rc0 sourceDaniel Borkmann1-0/+61
c239ae1044c341f92b7c20c0783aba71de2d724a'>8085b867525e9d0f31413ffbeb6ded28b2965e25 parent86fc04882310dd30bbd768c91dae63363c295598 (diff)parentd8d378fa1a0c98ecb50ca52c9bf3bc14e25aa2d2 (diff)
Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm
Pull libnvdimm fixes from Dan Williams: - Fix for the nd_blk (NVDIMM Block Window Aperture) driver. A spec clarification requires the driver to mask off reserved bits in status register. This is tagged for -stable back to the v4.2 kernel. - Fix for a kernel crash in the nvdimm unit tests when module loading is interrupted with SIGTERM. Tagged for -stable since validation efforts external to Intel use the unit tests for qualifying backports. - Add a new 'size' sysfs attribute for the BTT (NVDIMM Block Translation Table) driver to make it symmetric with the other namespace personality drivers (PFN and DAX) that provide a size attribute for indicating how much namespace capacity is lost to metadata. The BTT change arrived at the start of the merge window and has appeared in a -next release. It can technically wait for 4.9, but it is small, fixes asymmetry in the libnvdimm-sysfs interface, and something I would have squeezed into the v4.8 pull request had it arrived a few days earlier. * 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm: tools/testing/nvdimm: fix SIGTERM vs hotplug crash nvdimm, btt: add a size attribute for BTTs libnvdimm, nd_blk: mask off reserved status bits
Diffstat