summaryrefslogtreecommitdiff
path: root/trafgen.8
diff options
context:
space:
mode:
authorVadim Kochan <vadim4j@gmail.com>2016-07-15 23:21:05 +0300
committerTobias Klauser <tklauser@distanz.ch>2016-07-16 11:29:07 +0200
commitc11d67bf8ce5666b454ba34c004c264d5cfae24a (patch)
tree001077c098c635d4746f5edc40fa4d759b45b2d1 /trafgen.8
parent423bb070d372341aa178849a9479099b95c7d352 (diff)
trafgen: ipv4: Set default proto as ipv6-in-ipv4 for ipv6()
Set default ip proto field to IPPROTO_IPV6(41) if the higher protocol was specified as ipv6(). Signed-off-by: Vadim Kochan <vadim4j@gmail.com> Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Diffstat (limited to 'trafgen.8')
0 files changed, 0 insertions, 0 deletions
ef='/cgit.cgi/linux/net-next.git/commit/include/crypto/scatterwalk.h?h=nds-private-remove&id=926af6273fc683cd98cd0ce7bf0d04a02eed6742'>926af6273fc683cd98cd0ce7bf0d04a02eed6742 (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/crypto/scatterwalk.h')