diff options
| author | Patrick McHardy <kaber@trash.net> | 2014-01-15 11:55:39 +0000 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2014-01-15 11:55:39 +0000 |
| commit | d232d30da84b333ca668e61d4cbcafe8dbc34ade (patch) | |
| tree | a02b3778dd3f916e615a23d054d5481adbcac520 /src/parser.y | |
| parent | a4da57bde3330aa2d84815e16d8cf238cebf8d70 (diff) | |
| parent | 646dccd732b8d26484d5d07ff59d44a1770cf736 (diff) | |
Merge branch 'master' into next-3.14
Signed-off-by: Patrick McHardy <kaber@trash.net>
Conflicts:
src/meta.c
src/parser.y
Diffstat (limited to 'src/parser.y')
| -rw-r--r-- | src/parser.y | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/parser.y b/src/parser.y index 632970b2..89d6279c 100644 --- a/src/parser.y +++ b/src/parser.y @@ -194,7 +194,7 @@ static void location_update(struct location *loc, struct location *rhs, int n) %token BRIDGE "bridge" -%token ETH "eth" +%token ETHER "ether" %token SADDR "saddr" %token DADDR "daddr" %token TYPE "type" @@ -1467,7 +1467,7 @@ payload_base_spec : LL_HDR { $$ = PROTO_BASE_LL_HDR; } | TRANSPORT_HDR { $$ = PROTO_BASE_TRANSPORT_HDR; } ; -eth_hdr_expr : ETH eth_hdr_field +eth_hdr_expr : ETHER eth_hdr_field { $$ = payload_expr_alloc(&@$, &proto_eth, $2); } |