From d6e368b0b2b8343f8b833daa28ed88f59df31441 Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Tue, 15 Feb 2011 18:58:22 -0600 Subject: main/linux-grsec: upgrade to 2.6.37 --- main/linux-grsec/xfrm-fix-gre-key-endianess.patch | 43 ----------------------- 1 file changed, 43 deletions(-) delete mode 100644 main/linux-grsec/xfrm-fix-gre-key-endianess.patch (limited to 'main/linux-grsec/xfrm-fix-gre-key-endianess.patch') diff --git a/main/linux-grsec/xfrm-fix-gre-key-endianess.patch b/main/linux-grsec/xfrm-fix-gre-key-endianess.patch deleted file mode 100644 index 362484a76a..0000000000 --- a/main/linux-grsec/xfrm-fix-gre-key-endianess.patch +++ /dev/null @@ -1,43 +0,0 @@ -From aa285b1740f5b13e5a2606a927f3129954583d78 Mon Sep 17 00:00:00 2001 -From: =?utf8?q?Timo=20Ter=C3=A4s?= -Date: Tue, 23 Nov 2010 04:03:45 +0000 -Subject: [PATCH] xfrm: fix gre key endianess -MIME-Version: 1.0 -Content-Type: text/plain; charset=utf8 -Content-Transfer-Encoding: 8bit - -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 -Signed-off-by: David S. Miller ---- - 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 54b2832..7fa5b00 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*/ --- -1.7.3.2 - -- cgit v1.2.3