Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:

	drivers/net/wireless/rt2x00/rt2x00dev.c
	net/8021q/vlan_dev.c

1 files changed, 1 insertions, 1 deletions

diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index 9b6205665190..c435620dbb37 100644
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -278,7 +278,7 @@ extern int __xfrm_state_delete(struct xfrm_state *x);
 struct xfrm_state_afinfo {
         unsigned int            family;
         unsigned int            proto;
-        unsigned int            eth_proto;
+        __be16                  eth_proto;
         struct module           *owner;
         const struct xfrm_type  *type_map[IPPROTO_MAX];
         struct xfrm_mode        *mode_map[XFRM_MODE_MAX];