summaryrefslogtreecommitdiff
path: root/trafgen_lexer.l
diff options
context:
space:
mode:
authorVadim Kochan <vadim4j@gmail.com>2015-07-25 19:56:59 +0300
committerDaniel Borkmann <daniel@iogearbox.net>2015-07-26 20:31:24 +0200
commitad7cfbf4efca7a2716eba89994f5f8f8167cd51c (patch)
treebdbf98aa300cd7b282e95f5cc7fbbbf12faf2a6a /trafgen_lexer.l
parentba9ec2c4c5cfad8471eb1fffab4bdcc40404c2f9 (diff)
flowtop: Change tcp param to 'bool is_tcp' in presenter_get_port(..)
Rename tcp -> is_tcp param and change it to bool. Signed-off-by: Vadim Kochan <vadim4j@gmail.com> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Diffstat (limited to 'trafgen_lexer.l')
0 files changed, 0 insertions, 0 deletions
> (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 'net/ncsi/ncsi-manage.c')