diff options
-rw-r--r-- | include/linux/netfilter/x_tables.h | 2 | ||||
-rw-r--r-- | net/netfilter/x_tables.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/netfilter/x_tables.h b/include/linux/netfilter/x_tables.h index c61758f4be31..a18119fb88f0 100644 --- a/include/linux/netfilter/x_tables.h +++ b/include/linux/netfilter/x_tables.h | |||
@@ -588,7 +588,7 @@ extern void xt_compat_unlock(u_int8_t af); | |||
588 | 588 | ||
589 | extern int xt_compat_add_offset(u_int8_t af, unsigned int offset, short delta); | 589 | extern int xt_compat_add_offset(u_int8_t af, unsigned int offset, short delta); |
590 | extern void xt_compat_flush_offsets(u_int8_t af); | 590 | extern void xt_compat_flush_offsets(u_int8_t af); |
591 | extern short xt_compat_calc_jump(u_int8_t af, unsigned int offset); | 591 | extern int xt_compat_calc_jump(u_int8_t af, unsigned int offset); |
592 | 592 | ||
593 | extern int xt_compat_match_offset(const struct xt_match *match); | 593 | extern int xt_compat_match_offset(const struct xt_match *match); |
594 | extern int xt_compat_match_from_user(struct xt_entry_match *m, | 594 | extern int xt_compat_match_from_user(struct xt_entry_match *m, |
diff --git a/net/netfilter/x_tables.c b/net/netfilter/x_tables.c index 69c56287d518..0a12cedfe9e3 100644 --- a/net/netfilter/x_tables.c +++ b/net/netfilter/x_tables.c | |||
@@ -39,7 +39,7 @@ MODULE_DESCRIPTION("{ip,ip6,arp,eb}_tables backend module"); | |||
39 | struct compat_delta { | 39 | struct compat_delta { |
40 | struct compat_delta *next; | 40 | struct compat_delta *next; |
41 | unsigned int offset; | 41 | unsigned int offset; |
42 | short delta; | 42 | int delta; |
43 | }; | 43 | }; |
44 | 44 | ||
45 | struct xt_af { | 45 | struct xt_af { |
@@ -439,10 +439,10 @@ void xt_compat_flush_offsets(u_int8_t af) | |||
439 | } | 439 | } |
440 | EXPORT_SYMBOL_GPL(xt_compat_flush_offsets); | 440 | EXPORT_SYMBOL_GPL(xt_compat_flush_offsets); |
441 | 441 | ||
442 | short xt_compat_calc_jump(u_int8_t af, unsigned int offset) | 442 | int xt_compat_calc_jump(u_int8_t af, unsigned int offset) |
443 | { | 443 | { |
444 | struct compat_delta *tmp; | 444 | struct compat_delta *tmp; |
445 | short delta; | 445 | int delta; |
446 | 446 | ||
447 | for (tmp = xt[af].compat_offsets, delta = 0; tmp; tmp = tmp->next) | 447 | for (tmp = xt[af].compat_offsets, delta = 0; tmp; tmp = tmp->next) |
448 | if (tmp->offset < offset) | 448 | if (tmp->offset < offset) |