Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux.git] / net / netfilter / x_tables.c

diff --git a/net/netfilter/x_tables.c b/net/netfilter/x_tables.c
index 13e1ac333fa461dbcf063f41ea40f4f4b5e5215e..e5e5c64df8d1a94b4e448c2a146c7c112f2e0e58 100644 (file)
--- a/net/netfilter/x_tables.c
+++ b/net/netfilter/x_tables.c
@@ -461,7 +461,7 @@ int xt_check_proc_name(const char *name, unsigned int size)
 EXPORT_SYMBOL(xt_check_proc_name);
 
 int xt_check_match(struct xt_mtchk_param *par,
-                  unsigned int size, u_int8_t proto, bool inv_proto)
+                  unsigned int size, u16 proto, bool inv_proto)
 {
        int ret;
 
@@ -984,7 +984,7 @@ bool xt_find_jump_offset(const unsigned int *offsets,
 EXPORT_SYMBOL(xt_find_jump_offset);
 
 int xt_check_target(struct xt_tgchk_param *par,
-                   unsigned int size, u_int8_t proto, bool inv_proto)
+                   unsigned int size, u16 proto, bool inv_proto)
 {
        int ret;