moved netfilter patches to avoid conflicts with patch-o-matic
[oweals/openwrt.git] / obsolete-buildroot / sources / openwrt / kernel / patches / 170-ip6tables-alignment.patch
1 diff -Nur linux/net/ipv6/netfilter/ip6_tables.c linux.fixed/net/ipv6/netfilter/ip6_tables.c
2 --- linux/net/ipv6/netfilter/ip6_tables.c       Sat Aug  3 02:39:46 2002
3 +++ linux.fixed/net/ipv6/netfilter/ip6_tables.c Thu Sep 26 17:12:07 2002
4 @@ -98,10 +98,8 @@
5         unsigned int hook_entry[NF_IP6_NUMHOOKS];
6         unsigned int underflow[NF_IP6_NUMHOOKS];
7  
8 -       char padding[SMP_ALIGN((NF_IP6_NUMHOOKS*2+2)*sizeof(unsigned int))];
9 -
10         /* ip6t_entry tables: one per CPU */
11 -       char entries[0];
12 +       char entries[0] ____cacheline_aligned;
13  };
14  
15  static LIST_HEAD(ip6t_target);
16 @@ -1425,7 +1423,7 @@
17         int ret;
18         struct ip6t_table_info *newinfo;
19         static struct ip6t_table_info bootstrap
20 -               = { 0, 0, 0, { 0 }, { 0 }, { }, { } };
21 +               = { 0, 0, 0, { 0 }, { 0 }, { } };
22  
23         MOD_INC_USE_COUNT;
24         newinfo = vmalloc(sizeof(struct ip6t_table_info)