From: Patrick McHardy <kaber@trash.net>
Date: Wed, 15 Jan 2014 11:55:39 +0000 (+0000)
Subject: Merge branch 'master' into next-3.14
X-Git-Tag: v0.2~64
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d232d30da84b333ca668e61d4cbcafe8dbc34ade;p=thirdparty%2Fnftables.git

Merge branch 'master' into next-3.14

Signed-off-by: Patrick McHardy <kaber@trash.net>

Conflicts:
	src/meta.c
	src/parser.y
---

d232d30da84b333ca668e61d4cbcafe8dbc34ade
diff --cc src/parser.y
index 632970b2,038282ec..89d6279c
--- a/src/parser.y
+++ b/src/parser.y
@@@ -1462,14 -1398,14 +1462,14 @@@ payload_raw_expr	:	AT	payload_base_spe
  			}
  			;
  
 -payload_base_spec	:	LL_HDR		{ $$ = PAYLOAD_BASE_LL_HDR; }
 -			|	NETWORK_HDR	{ $$ = PAYLOAD_BASE_NETWORK_HDR; }
 -			|	TRANSPORT_HDR	{ $$ = PAYLOAD_BASE_TRANSPORT_HDR; }
 +payload_base_spec	:	LL_HDR		{ $$ = PROTO_BASE_LL_HDR; }
 +			|	NETWORK_HDR	{ $$ = PROTO_BASE_NETWORK_HDR; }
 +			|	TRANSPORT_HDR	{ $$ = PROTO_BASE_TRANSPORT_HDR; }
  			;
  
- eth_hdr_expr		:	ETH	eth_hdr_field
+ eth_hdr_expr		:	ETHER	eth_hdr_field
  			{
 -				$$ = payload_expr_alloc(&@$, &payload_eth, $2);
 +				$$ = payload_expr_alloc(&@$, &proto_eth, $2);
  			}
  			;