diff options
| -rw-r--r-- | net/ipv4/netfilter/ip_tables.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c index 09696f16aa95..fc1f153c86ba 100644 --- a/net/ipv4/netfilter/ip_tables.c +++ b/net/ipv4/netfilter/ip_tables.c | |||
| @@ -919,13 +919,13 @@ copy_entries_to_user(unsigned int total_size, | |||
| 919 | #ifdef CONFIG_COMPAT | 919 | #ifdef CONFIG_COMPAT |
| 920 | struct compat_delta { | 920 | struct compat_delta { |
| 921 | struct compat_delta *next; | 921 | struct compat_delta *next; |
| 922 | u_int16_t offset; | 922 | unsigned int offset; |
| 923 | short delta; | 923 | short delta; |
| 924 | }; | 924 | }; |
| 925 | 925 | ||
| 926 | static struct compat_delta *compat_offsets = NULL; | 926 | static struct compat_delta *compat_offsets = NULL; |
| 927 | 927 | ||
| 928 | static int compat_add_offset(u_int16_t offset, short delta) | 928 | static int compat_add_offset(unsigned int offset, short delta) |
| 929 | { | 929 | { |
| 930 | struct compat_delta *tmp; | 930 | struct compat_delta *tmp; |
| 931 | 931 | ||
| @@ -957,7 +957,7 @@ static void compat_flush_offsets(void) | |||
| 957 | } | 957 | } |
| 958 | } | 958 | } |
| 959 | 959 | ||
| 960 | static short compat_calc_jump(u_int16_t offset) | 960 | static short compat_calc_jump(unsigned int offset) |
| 961 | { | 961 | { |
| 962 | struct compat_delta *tmp; | 962 | struct compat_delta *tmp; |
| 963 | short delta; | 963 | short delta; |
| @@ -997,7 +997,7 @@ static int compat_calc_entry(struct ipt_entry *e, struct xt_table_info *info, | |||
| 997 | void *base, struct xt_table_info *newinfo) | 997 | void *base, struct xt_table_info *newinfo) |
| 998 | { | 998 | { |
| 999 | struct ipt_entry_target *t; | 999 | struct ipt_entry_target *t; |
| 1000 | u_int16_t entry_offset; | 1000 | unsigned int entry_offset; |
| 1001 | int off, i, ret; | 1001 | int off, i, ret; |
| 1002 | 1002 | ||
| 1003 | off = 0; | 1003 | off = 0; |
| @@ -1467,7 +1467,7 @@ check_compat_entry_size_and_hooks(struct ipt_entry *e, | |||
| 1467 | { | 1467 | { |
| 1468 | struct ipt_entry_target *t; | 1468 | struct ipt_entry_target *t; |
| 1469 | struct ipt_target *target; | 1469 | struct ipt_target *target; |
| 1470 | u_int16_t entry_offset; | 1470 | unsigned int entry_offset; |
| 1471 | int ret, off, h, j; | 1471 | int ret, off, h, j; |
| 1472 | 1472 | ||
| 1473 | duprintf("check_compat_entry_size_and_hooks %p\n", e); | 1473 | duprintf("check_compat_entry_size_and_hooks %p\n", e); |
