Commit aa285b17 authored by Timo Teräs's avatar Timo Teräs Committed by David S. Miller
Browse files

xfrm: fix gre key endianess 



fl->fl_gre_key is network byte order contrary to fl->fl_icmp_*.
Make xfrm_flowi_{s|d}port return network byte order values for gre
key too.

Signed-off-by: default avatarTimo Teräs <timo.teras@iki.fi>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6a632625

include/net/xfrm.h

+2 −2
Original line number Diff line number Diff line
@@ -806,7 +806,7 @@ __be16 xfrm_flowi_sport(struct flowi *fl) 
		port = htons(fl->fl_mh_type);

		break;

	case IPPROTO_GRE:

		port = htonl(fl->fl_gre_key) >> 16;

		port = htons(ntohl(fl->fl_gre_key) >> 16);

		break;

	default:

		port = 0;	/*XXX*/
@@ -830,7 +830,7 @@ __be16 xfrm_flowi_dport(struct flowi *fl) 
		port = htons(fl->fl_icmp_code);

		break;

	case IPPROTO_GRE:

		port = htonl(fl->fl_gre_key) & 0xffff;

		port = htons(ntohl(fl->fl_gre_key) & 0xffff);

		break;

	default:

		port = 0;	/*XXX*/