* [PATCH] GRE: fixup gre_keymap_lookup() return type
@ 2006-05-26 19:07 Alexey Dobriyan
2006-05-28 23:01 ` Patrick McHardy
0 siblings, 1 reply; 2+ messages in thread
From: Alexey Dobriyan @ 2006-05-26 19:07 UTC (permalink / raw)
To: netfilter-devel, netdev
GRE keys are 16-bit wide.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
---
net/ipv4/netfilter/ip_conntrack_proto_gre.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- a/net/ipv4/netfilter/ip_conntrack_proto_gre.c
+++ b/net/ipv4/netfilter/ip_conntrack_proto_gre.c
@@ -77,10 +77,10 @@ static inline int gre_key_cmpfn(const st
}
/* 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,
@@ -190,7 +190,7 @@ static int gre_pkt_to_tuple(const struct
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 */
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] GRE: fixup gre_keymap_lookup() return type
2006-05-26 19:07 [PATCH] GRE: fixup gre_keymap_lookup() return type Alexey Dobriyan
@ 2006-05-28 23:01 ` Patrick McHardy
0 siblings, 0 replies; 2+ messages in thread
From: Patrick McHardy @ 2006-05-28 23:01 UTC (permalink / raw)
To: Alexey Dobriyan; +Cc: netfilter-devel, netdev
Alexey Dobriyan wrote:
> GRE keys are 16-bit wide.
This looks harmless, so I've queued it for 2.6.18. Thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2006-05-28 23:01 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-05-26 19:07 [PATCH] GRE: fixup gre_keymap_lookup() return type Alexey Dobriyan
2006-05-28 23:01 ` Patrick McHardy
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).