From: David S. Miller <davem@davemloft.net>
Date: Fri, 27 Mar 2009 05:45:23 +0000 (-0700)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
X-Git-Tag: v2.6.30-rc1~137^2~134
X-Git-Url: http://ftp.safe.ca/?p=safe%2Fjmp%2Flinux-2.6;a=commitdiff_plain;h=01e6de64d9c8d0e75dca3bb4cf898db73abe00d4

Merge branch 'master' of git://git./linux/kernel/git/kaber/nf-next-2.6
---

01e6de64d9c8d0e75dca3bb4cf898db73abe00d4
diff --cc lib/nlattr.c
index 80009a2,ae32c57..c4706eb
--- a/lib/nlattr.c
+++ b/lib/nlattr.c
@@@ -463,10 -480,9 +489,11 @@@ int nla_append(struct sk_buff *skb, in
  	memcpy(skb_put(skb, attrlen), data, attrlen);
  	return 0;
  }
 +EXPORT_SYMBOL(nla_append);
 +#endif
  
  EXPORT_SYMBOL(nla_validate);
+ EXPORT_SYMBOL(nla_policy_len);
  EXPORT_SYMBOL(nla_parse);
  EXPORT_SYMBOL(nla_find);
  EXPORT_SYMBOL(nla_strlcpy);
diff --cc net/ipv4/netfilter/arp_tables.c
index 84b9c17,4f454ce..35c5f6a
--- a/net/ipv4/netfilter/arp_tables.c
+++ b/net/ipv4/netfilter/arp_tables.c
@@@ -81,28 -80,13 +81,16 @@@ static inline int arp_devaddr_compare(c
  static unsigned long ifname_compare(const char *_a, const char *_b, const char *_mask)
  {
  #ifdef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS
- 	const unsigned long *a = (const unsigned long *)_a;
- 	const unsigned long *b = (const unsigned long *)_b;
- 	const unsigned long *mask = (const unsigned long *)_mask;
- 	unsigned long ret;
- 
- 	ret = (a[0] ^ b[0]) & mask[0];
- 	if (IFNAMSIZ > sizeof(unsigned long))
- 		ret |= (a[1] ^ b[1]) & mask[1];
- 	if (IFNAMSIZ > 2 * sizeof(unsigned long))
- 		ret |= (a[2] ^ b[2]) & mask[2];
- 	if (IFNAMSIZ > 3 * sizeof(unsigned long))
- 		ret |= (a[3] ^ b[3]) & mask[3];
- 	BUILD_BUG_ON(IFNAMSIZ > 4 * sizeof(unsigned long));
+ 	unsigned long ret = ifname_compare_aligned(_a, _b, _mask);
  #else
  	unsigned long ret = 0;
 +	const u16 *a = (const u16 *)_a;
 +	const u16 *b = (const u16 *)_b;
 +	const u16 *mask = (const u16 *)_mask;
  	int i;
  
 -	for (i = 0; i < IFNAMSIZ; i++)
 -		ret |= (_a[i] ^ _b[i]) & _mask[i];
 +	for (i = 0; i < IFNAMSIZ/sizeof(u16); i++)
 +		ret |= (a[i] ^ b[i]) & mask[i];
  #endif
  	return ret;
  }