diff options
author | Patrick McHardy <kaber@trash.net> | 2005-06-21 17:01:30 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2005-06-21 17:01:30 -0400 |
commit | e45b1be8bcb3643808975a426fa3e201a2588e87 (patch) | |
tree | 0c461d7bd90d0c2fb462b42e664cf8a099c750ec /net/ipv4/netfilter/ip_conntrack_ftp.c | |
parent | c9e3e8b6958e02230079e6817862ea2968509866 (diff) |
[NETFILTER]: Kill lockhelp.h
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/netfilter/ip_conntrack_ftp.c')
-rw-r--r-- | net/ipv4/netfilter/ip_conntrack_ftp.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/net/ipv4/netfilter/ip_conntrack_ftp.c b/net/ipv4/netfilter/ip_conntrack_ftp.c index dd86503aa78..fea6dd2a00b 100644 --- a/net/ipv4/netfilter/ip_conntrack_ftp.c +++ b/net/ipv4/netfilter/ip_conntrack_ftp.c | |||
@@ -16,7 +16,6 @@ | |||
16 | #include <net/checksum.h> | 16 | #include <net/checksum.h> |
17 | #include <net/tcp.h> | 17 | #include <net/tcp.h> |
18 | 18 | ||
19 | #include <linux/netfilter_ipv4/lockhelp.h> | ||
20 | #include <linux/netfilter_ipv4/ip_conntrack_helper.h> | 19 | #include <linux/netfilter_ipv4/ip_conntrack_helper.h> |
21 | #include <linux/netfilter_ipv4/ip_conntrack_ftp.h> | 20 | #include <linux/netfilter_ipv4/ip_conntrack_ftp.h> |
22 | #include <linux/moduleparam.h> | 21 | #include <linux/moduleparam.h> |
@@ -28,7 +27,7 @@ MODULE_DESCRIPTION("ftp connection tracking helper"); | |||
28 | /* This is slow, but it's simple. --RR */ | 27 | /* This is slow, but it's simple. --RR */ |
29 | static char ftp_buffer[65536]; | 28 | static char ftp_buffer[65536]; |
30 | 29 | ||
31 | static DECLARE_LOCK(ip_ftp_lock); | 30 | static DEFINE_SPINLOCK(ip_ftp_lock); |
32 | 31 | ||
33 | #define MAX_PORTS 8 | 32 | #define MAX_PORTS 8 |
34 | static int ports[MAX_PORTS]; | 33 | static int ports[MAX_PORTS]; |
@@ -319,7 +318,7 @@ static int help(struct sk_buff **pskb, | |||
319 | } | 318 | } |
320 | datalen = (*pskb)->len - dataoff; | 319 | datalen = (*pskb)->len - dataoff; |
321 | 320 | ||
322 | LOCK_BH(&ip_ftp_lock); | 321 | spin_lock_bh(&ip_ftp_lock); |
323 | fb_ptr = skb_header_pointer(*pskb, dataoff, | 322 | fb_ptr = skb_header_pointer(*pskb, dataoff, |
324 | (*pskb)->len - dataoff, ftp_buffer); | 323 | (*pskb)->len - dataoff, ftp_buffer); |
325 | BUG_ON(fb_ptr == NULL); | 324 | BUG_ON(fb_ptr == NULL); |
@@ -442,7 +441,7 @@ out_update_nl: | |||
442 | if (ends_in_nl) | 441 | if (ends_in_nl) |
443 | update_nl_seq(seq, ct_ftp_info,dir); | 442 | update_nl_seq(seq, ct_ftp_info,dir); |
444 | out: | 443 | out: |
445 | UNLOCK_BH(&ip_ftp_lock); | 444 | spin_unlock_bh(&ip_ftp_lock); |
446 | return ret; | 445 | return ret; |
447 | } | 446 | } |
448 | 447 | ||