Merge branch 'exec_domain_rip_v2' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-block.git] / net / netfilter / nf_conntrack_amanda.c

diff --git a/net/netfilter/nf_conntrack_amanda.c b/net/netfilter/nf_conntrack_amanda.c
index b8b95f4027caf8b177d4e5550047fc11e05d8f69..57a26cc90c9fada2be251d6718f8b814e059beea 100644 (file)
--- a/net/netfilter/nf_conntrack_amanda.c
+++ b/net/netfilter/nf_conntrack_amanda.c
@@ -88,7 +88,6 @@ static int amanda_help(struct sk_buff *skb,
                       struct nf_conn *ct,
                       enum ip_conntrack_info ctinfo)
 {
-       struct ts_state ts;
        struct nf_conntrack_expect *exp;
        struct nf_conntrack_tuple *tuple;
        unsigned int dataoff, start, stop, off, i;
@@ -113,23 +112,20 @@ static int amanda_help(struct sk_buff *skb,
                return NF_ACCEPT;
        }
 
-       memset(&ts, 0, sizeof(ts));
        start = skb_find_text(skb, dataoff, skb->len,
-                             search[SEARCH_CONNECT].ts, &ts);
+                             search[SEARCH_CONNECT].ts);
        if (start == UINT_MAX)
                goto out;
        start += dataoff + search[SEARCH_CONNECT].len;
 
-       memset(&ts, 0, sizeof(ts));
        stop = skb_find_text(skb, start, skb->len,
-                            search[SEARCH_NEWLINE].ts, &ts);
+                            search[SEARCH_NEWLINE].ts);
        if (stop == UINT_MAX)
                goto out;
        stop += start;
 
        for (i = SEARCH_DATA; i <= SEARCH_INDEX; i++) {
-               memset(&ts, 0, sizeof(ts));
-               off = skb_find_text(skb, start, stop, search[i].ts, &ts);
+               off = skb_find_text(skb, start, stop, search[i].ts);
                if (off == UINT_MAX)
                        continue;
                off += start + search[i].len;