From a2a47e5462a1f2c2bb4d198d29f30b521f332930 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Ter=C3=A4s?= Date: Tue, 23 Nov 2010 04:03:45 +0000 Subject: [PATCH] --- yaml --- r: 224523 b: refs/heads/master c: aa285b1740f5b13e5a2606a927f3129954583d78 h: refs/heads/master i: 224521: 981d5e7d0428e4b6190db0b94d221b6ed9b6cb50 224519: 5a79edb4c31c547e8d98c2457678139b32f4e30c v: v3 --- [refs] | 2 +- trunk/include/net/xfrm.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 33ab2579a5ef..7ba01505341d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6a632625c7da7594d059b88dae0e9c591af147ba +refs/heads/master: aa285b1740f5b13e5a2606a927f3129954583d78 diff --git a/trunk/include/net/xfrm.h b/trunk/include/net/xfrm.h index 54b283229488..7fa5b005893e 100644 --- a/trunk/include/net/xfrm.h +++ b/trunk/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*/