summaryrefslogtreecommitdiff
path: root/proto_ipv6_in_ipv4.c
AgeCommit message (Expand)AuthorFilesLines
2013-03-15all: import netsniff-ng 0.5.8-rc0 sourceDaniel Borkmann1-0/+25
d>
authorDavid S. Miller <davem@davemloft.net>2016-10-03 23:28:50 -0400
committerDavid S. Miller <davem@davemloft.net>2016-10-03 23:28:50 -0400
commit0438e3c88c54b11ab6168d55eb7c696aeaa32b14 (patch)
tree06e55a9dd5e4892ce12fd9f2d68a5ae4a553250a
parentedfc23ee3e0ebbb6713d7574ab1b00abff178f6c (diff)
parent5e3d033ec175b3d0a8da2b1fc9aee8bc8acf3cfc (diff)
Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue
Jeff Kirsher says: ==================== 100GbE Intel Wired LAN Driver Updates 2016-10-02 This series contains updates to fm10k only. Jake fixes an issue where PTP applications requesting software timestamps may complain that the requested mode is not supported, so add a generic callback for those drivers that have software transmit timestamp support enabled. Then provides a trivial cleanup where a code was not wrapped properly. Got make sure that code looks good in a 80 character limit. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat