diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2011-11-15 12:41:53 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2011-11-22 12:48:34 +0000 |
| commit | 0ad7b51cd6fe710317bc2adc49297487ac57a28c (patch) | |
| tree | 96524e81cfadcd6d5a958d01a0a18a38f9a638f4 /main/linux-grsec/net-align-af-specific-flowi-structs-to-long.patch | |
| parent | 7f67880f77978839ae378e00a8d77a5c68edf519 (diff) | |
| download | aports-0ad7b51cd6fe710317bc2adc49297487ac57a28c.tar.bz2 aports-0ad7b51cd6fe710317bc2adc49297487ac57a28c.tar.xz | |
main/*-grsec: upgrade kernel to 3.0.9-201111121310
(cherry picked from commit 4ba20c01bd90e5ed8719131447ef65dba0bc0d2a)
Diffstat (limited to 'main/linux-grsec/net-align-af-specific-flowi-structs-to-long.patch')
| -rw-r--r-- | main/linux-grsec/net-align-af-specific-flowi-structs-to-long.patch | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/main/linux-grsec/net-align-af-specific-flowi-structs-to-long.patch b/main/linux-grsec/net-align-af-specific-flowi-structs-to-long.patch deleted file mode 100644 index 544c06f57..000000000 --- a/main/linux-grsec/net-align-af-specific-flowi-structs-to-long.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 728871bc05afc8ff310b17dba3e57a2472792b13 Mon Sep 17 00:00:00 2001 -From: David Ward <david.ward@ll.mit.edu> -Date: Mon, 5 Sep 2011 16:47:23 +0000 -Subject: net: Align AF-specific flowi structs to long - -From: David Ward <david.ward@ll.mit.edu> - -commit 728871bc05afc8ff310b17dba3e57a2472792b13 upstream. - -AF-specific flowi structs are now passed to flow_key_compare, which must -also be aligned to a long. - -Signed-off-by: David Ward <david.ward@ll.mit.edu> -Signed-off-by: David S. Miller <davem@davemloft.net> -Cc: Kim Phillips <kim.phillips@freescale.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - include/net/flow.h | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - ---- a/include/net/flow.h -+++ b/include/net/flow.h -@@ -68,7 +68,7 @@ struct flowi4 { - #define fl4_ipsec_spi uli.spi - #define fl4_mh_type uli.mht.type - #define fl4_gre_key uli.gre_key --}; -+} __attribute__((__aligned__(BITS_PER_LONG/8))); - - static inline void flowi4_init_output(struct flowi4 *fl4, int oif, - __u32 mark, __u8 tos, __u8 scope, -@@ -112,7 +112,7 @@ struct flowi6 { - #define fl6_ipsec_spi uli.spi - #define fl6_mh_type uli.mht.type - #define fl6_gre_key uli.gre_key --}; -+} __attribute__((__aligned__(BITS_PER_LONG/8))); - - struct flowidn { - struct flowi_common __fl_common; -@@ -127,7 +127,7 @@ struct flowidn { - union flowi_uli uli; - #define fld_sport uli.ports.sport - #define fld_dport uli.ports.dport --}; -+} __attribute__((__aligned__(BITS_PER_LONG/8))); - - struct flowi { - union { |