]>
Commit | Line | Data |
---|---|---|
8c771458 | 1 | diff -urN ipset-6.8.orig/kernel/net/netfilter/ipset/ip_set_hash_netiface.c ipset-6.8/kernel/net/netfilter/ipset/ip_set_hash_netiface.c |
2 | --- ipset-6.8.orig/kernel/net/netfilter/ipset/ip_set_hash_netiface.c 2011-07-08 10:13:53.000000000 +0200 | |
3 | +++ ipset-6.8/kernel/net/netfilter/ipset/ip_set_hash_netiface.c 2011-08-13 09:58:01.456999822 +0200 | |
4 | @@ -41,25 +41,7 @@ | |
5 | static inline long | |
6 | ifname_compare(const char *_a, const char *_b) | |
7 | { | |
8 | - const long *a = (const long *)_a; | |
9 | - const long *b = (const long *)_b; | |
10 | - | |
11 | - BUILD_BUG_ON(IFNAMSIZ > 4 * sizeof(unsigned long)); | |
12 | - if (a[0] != b[0]) | |
13 | - return a[0] - b[0]; | |
14 | - if (IFNAMSIZ > sizeof(long)) { | |
15 | - if (a[1] != b[1]) | |
16 | - return a[1] - b[1]; | |
17 | - } | |
18 | - if (IFNAMSIZ > 2 * sizeof(long)) { | |
19 | - if (a[2] != b[2]) | |
20 | - return a[2] - b[2]; | |
21 | - } | |
22 | - if (IFNAMSIZ > 3 * sizeof(long)) { | |
23 | - if (a[3] != b[3]) | |
24 | - return a[3] - b[3]; | |
25 | - } | |
26 | - return 0; | |
27 | + return strcmp(_a, _b); | |
28 | } | |
29 | ||
30 | static void |