diff options
| author |   Timo Teräs <timo.teras@iki.fi> | 2010-11-23 04:03:45 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2010-11-28 11:22:17 -0800 |
| commit | aa285b1740f5b13e5a2606a927f3129954583d78 (patch) | |
| tree | 4845acc70e17cbd0c3a16f490aa24e1a00e8eb3c /include/net/xfrm.h | |
| parent | ethoc: remove division from loops (diff) | |
| download | linux-dev-aa285b1740f5b13e5a2606a927f3129954583d78.tar.xz linux-dev-aa285b1740f5b13e5a2606a927f3129954583d78.zip | |
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: Timo Teräs <timo.teras@iki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/xfrm.h')
| -rw-r--r-- | include/net/xfrm.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/xfrm.h b/include/net/xfrm.h index 54b283229488..7fa5b005893e 100644 --- a/include/net/xfrm.h +++ b/include/net/xfrm.h @@ -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*/ |