projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[NETFILTER] x_tables: Abstraction layer for {ip,ip6,arp}_tables
[powerpc.git]
/
net
/
ipv4
/
netfilter
/
ip_conntrack_tftp.c
diff --git
a/net/ipv4/netfilter/ip_conntrack_tftp.c
b/net/ipv4/netfilter/ip_conntrack_tftp.c
index
f8ff170
..
d3c5a37
100644
(file)
--- a/
net/ipv4/netfilter/ip_conntrack_tftp.c
+++ b/
net/ipv4/netfilter/ip_conntrack_tftp.c
@@
-26,9
+26,9
@@
MODULE_DESCRIPTION("tftp connection tracking helper");
MODULE_LICENSE("GPL");
#define MAX_PORTS 8
MODULE_LICENSE("GPL");
#define MAX_PORTS 8
-static
in
t ports[MAX_PORTS];
+static
unsigned shor
t ports[MAX_PORTS];
static int ports_c;
static int ports_c;
-module_param_array(ports,
in
t, &ports_c, 0400);
+module_param_array(ports,
ushor
t, &ports_c, 0400);
MODULE_PARM_DESC(ports, "port numbers of tftp servers");
#if 0
MODULE_PARM_DESC(ports, "port numbers of tftp servers");
#if 0
@@
-75,6
+75,7
@@
static int tftp_help(struct sk_buff **pskb,
exp->mask.dst.u.udp.port = 0xffff;
exp->mask.dst.protonum = 0xff;
exp->expectfn = NULL;
exp->mask.dst.u.udp.port = 0xffff;
exp->mask.dst.protonum = 0xff;
exp->expectfn = NULL;
+ exp->flags = 0;
DEBUGP("expect: ");
DUMP_TUPLE(&exp->tuple);
DEBUGP("expect: ");
DUMP_TUPLE(&exp->tuple);
@@
-99,7
+100,7
@@
static int tftp_help(struct sk_buff **pskb,
}
static struct ip_conntrack_helper tftp[MAX_PORTS];
}
static struct ip_conntrack_helper tftp[MAX_PORTS];
-static char tftp_names[MAX_PORTS][
10
];
+static char tftp_names[MAX_PORTS][
sizeof("tftp-65535")
];
static void fini(void)
{
static void fini(void)
{