linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / net / ipv4 / netfilter / ip_conntrack_proto_gre.c

diff --git a/net/ipv4/netfilter/ip_conntrack_proto_gre.c b/net/ipv4/netfilter/ip_conntrack_proto_gre.c
index 4ee016c..5679479 100644 (file)
--- a/net/ipv4/netfilter/ip_conntrack_proto_gre.c
+++ b/net/ipv4/netfilter/ip_conntrack_proto_gre.c
@@ -23,6 +23,7 @@
  *
  */
 
+#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/timer.h>
@@ -76,10 +77,10 @@ static inline int gre_key_cmpfn(const struct ip_ct_gre_keymap *km,
 }
 
 /* look up the source key for a given tuple */
-static __be16 gre_keymap_lookup(struct ip_conntrack_tuple *t)
+static u_int32_t gre_keymap_lookup(struct ip_conntrack_tuple *t)
 {
        struct ip_ct_gre_keymap *km;
-       __be16 key = 0;
+       u_int32_t key = 0;
 
        read_lock_bh(&ip_ct_gre_lock);
        km = LIST_FIND(&gre_keymap_list, gre_key_cmpfn,
@@ -189,7 +190,7 @@ static int gre_pkt_to_tuple(const struct sk_buff *skb,
                           struct ip_conntrack_tuple *tuple)
 {
        struct gre_hdr_pptp _pgrehdr, *pgrehdr;
-       __be16 srckey;
+       u_int32_t srckey;
        struct gre_hdr _grehdr, *grehdr;
 
        /* first only delinearize old RFC1701 GRE header */