From 0e101d0e1c259d91e1afd381c3e7d5c17b00de03 Mon Sep 17 00:00:00 2001 From: Florian Westphal Date: Mon, 15 Feb 2010 18:17:10 +0100 Subject: [PATCH] --- yaml --- r: 184187 b: refs/heads/master c: 3e5e524ffb5fcf2447eb5dd9f8e54ad22dd9baa7 h: refs/heads/master i: 184185: 953663f86b80790294c78d5a800b0e02ec6faba5 184183: f4e686bd50c2cc8f3aae4eccc1df11955e32a073 v: v3 --- [refs] | 2 +- trunk/include/linux/netfilter/x_tables.h | 2 +- trunk/net/netfilter/x_tables.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index ad881e9e468e..698bb0c42c84 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fc0e3df4f00a5f62c2f2fce84bf496136b58c474 +refs/heads/master: 3e5e524ffb5fcf2447eb5dd9f8e54ad22dd9baa7 diff --git a/trunk/include/linux/netfilter/x_tables.h b/trunk/include/linux/netfilter/x_tables.h index c61758f4be31..a18119fb88f0 100644 --- a/trunk/include/linux/netfilter/x_tables.h +++ b/trunk/include/linux/netfilter/x_tables.h @@ -588,7 +588,7 @@ extern void xt_compat_unlock(u_int8_t af); extern int xt_compat_add_offset(u_int8_t af, unsigned int offset, short delta); extern void xt_compat_flush_offsets(u_int8_t af); -extern short xt_compat_calc_jump(u_int8_t af, unsigned int offset); +extern int xt_compat_calc_jump(u_int8_t af, unsigned int offset); extern int xt_compat_match_offset(const struct xt_match *match); extern int xt_compat_match_from_user(struct xt_entry_match *m, diff --git a/trunk/net/netfilter/x_tables.c b/trunk/net/netfilter/x_tables.c index 69c56287d518..0a12cedfe9e3 100644 --- a/trunk/net/netfilter/x_tables.c +++ b/trunk/net/netfilter/x_tables.c @@ -39,7 +39,7 @@ MODULE_DESCRIPTION("{ip,ip6,arp,eb}_tables backend module"); struct compat_delta { struct compat_delta *next; unsigned int offset; - short delta; + int delta; }; struct xt_af { @@ -439,10 +439,10 @@ void xt_compat_flush_offsets(u_int8_t af) } EXPORT_SYMBOL_GPL(xt_compat_flush_offsets); -short xt_compat_calc_jump(u_int8_t af, unsigned int offset) +int xt_compat_calc_jump(u_int8_t af, unsigned int offset) { struct compat_delta *tmp; - short delta; + int delta; for (tmp = xt[af].compat_offsets, delta = 0; tmp; tmp = tmp->next) if (tmp->offset < offset)