Skip to content

Commit

Permalink
[NETFILTER]: PPTP helper: fixup gre_keymap_lookup() return type
Browse files Browse the repository at this point in the history
GRE keys are 16-bit wide.

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Alexey Dobriyan authored and David S. Miller committed Jun 18, 2006
1 parent ae5b7d8 commit c45fb10
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions net/ipv4/netfilter/ip_conntrack_proto_gre.c
Original file line number Diff line number Diff line change
Expand Up @@ -77,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 u_int32_t gre_keymap_lookup(struct ip_conntrack_tuple *t)
static __be16 gre_keymap_lookup(struct ip_conntrack_tuple *t)
{
struct ip_ct_gre_keymap *km;
u_int32_t key = 0;
__be16 key = 0;

read_lock_bh(&ip_ct_gre_lock);
km = LIST_FIND(&gre_keymap_list, gre_key_cmpfn,
Expand Down Expand Up @@ -190,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;
u_int32_t srckey;
__be16 srckey;
struct gre_hdr _grehdr, *grehdr;

/* first only delinearize old RFC1701 GRE header */
Expand Down

0 comments on commit c45fb10

Please sign in to comment.