Merge branch 'master' into next-3.14

Signed-off-by: Patrick McHardy <kaber@trash.net>
Conflicts:
	src/meta.c
	src/parser.y

diff --cc src/parser.y
index 632970b27e9492cd4191f0546c414a4cad768340,038282ece1265d702d29340a8f0797df37892cc8..89d6279c9d1c1b338faa64f776109e4e2d6d6283
--- 1/src/parser.y
--- 2/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);
                        }
                        ;
  

diff --cc src/scanner.l
Simple merge