summaryrefslogtreecommitdiff
path: root/ifpps
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2014-05-23 09:30:31 +0200
committerTobias Klauser <tklauser@distanz.ch>2014-05-23 09:30:31 +0200
commit62ba03bbc77d22f33e7abd3e3a066310f90fbbc9 (patch)
treed8def2f542c41b1af074d44d9cfd02eab15f5697 /ifpps
parentf2154ee8285abee46028afff19e6bf2cb4794efc (diff)
netsniff-nf: proto_ipv6: Remove unused #include "csum.h"
This module doesn't use the checksum functions, thus we don't need to include csum.h. Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Diffstat (limited to 'ifpps')
0 files changed, 0 insertions, 0 deletions
'/cgit.cgi/linux/net-next.git/diff/include/trace/events/kmem.h?h=nds-private-remove&id=3efa70d78f218e4c9276b0bac0545e5184c1c47b&id2=76e0e70e6452b971a69cc9794ff4a6715c11f7f2'>diff)parent926af6273fc683cd98cd0ce7bf0d04a02eed6742 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The conflict was an interaction between a bug fix in the netvsc driver in 'net' and an optimization of the RX path in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/trace/events/kmem.h')