diff options
Diffstat (limited to 'net/ipv4/gre_demux.c')
| -rw-r--r-- | net/ipv4/gre_demux.c | 2 | 
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/gre_demux.c b/net/ipv4/gre_demux.c index 66fdbfe5447c..5d1e6fe9d838 100644 --- a/net/ipv4/gre_demux.c +++ b/net/ipv4/gre_demux.c @@ -128,7 +128,7 @@ int gre_parse_header(struct sk_buff *skb, struct tnl_ptk_info *tpi,  	 * to 0 and sets the configured key in the  	 * inner erspan header field  	 */ -	if (greh->protocol == htons(ETH_P_ERSPAN) || +	if ((greh->protocol == htons(ETH_P_ERSPAN) && hdr_len != 4) ||  	    greh->protocol == htons(ETH_P_ERSPAN2)) {  		struct erspan_base_hdr *ershdr;  |