summaryrefslogtreecommitdiff
path: root/trafgen_l3.c
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2016-02-01 17:45:39 +0100
committerTobias Klauser <tklauser@distanz.ch>2016-02-01 17:45:39 +0100
commit52b1f5dd3c60aa008e0538d7f8abda4727b6a9df (patch)
treeb73a405e6fc550972f270160c1008513314f5d2b /trafgen_l3.c
parent23492a017a2df510d054157ba314d1e6b1a43c3c (diff)
trafgen: parser: Fix parsing of "prot[o]" field in eth()
Commit 2ba202b introduced the [e]type field for specifiying the Ethertype, but at the same time made the existing "prot[o]" field name not work anymore. Fix it by providing a specific parser rule as it cannot be solved in the lexer grammar alone (which will always use the first matching token). Fixes: 2ba202b ("trafgen: parser: Support "etype"/"type" keywords for Ethertype") Reported-by: Vadim Kochan <vadim4j@gmail.com> Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Diffstat (limited to 'trafgen_l3.c')
0 files changed, 0 insertions, 0 deletions
98cd0ce7bf0d04a02eed6742'>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/soc/tegra/ivc.h')