summaryrefslogtreecommitdiffstats
path: root/net/sched/em_text.c
diff options
context:
space:
mode:
authorBojan Prtvar <prtvar.b@gmail.com>2015-02-22 11:46:35 +0100
committerDavid S. Miller <davem@davemloft.net>2015-02-22 15:59:54 -0500
commit059a2440fd3cf4ec57735db2c0a90401cde84fca (patch)
treeae1cc62a03192b53b6d4c1eb14b50d534b385797 /net/sched/em_text.c
parentd340c862e760815bca2f2a4d8fd91dff4646a955 (diff)
downloadblackbird-op-linux-059a2440fd3cf4ec57735db2c0a90401cde84fca.tar.gz
blackbird-op-linux-059a2440fd3cf4ec57735db2c0a90401cde84fca.zip
net: Remove state argument from skb_find_text()
Although it is clear that textsearch state is intentionally passed to skb_find_text() as uninitialized argument, it was never used by the callers. Therefore, we can simplify skb_find_text() by making it local variable. Signed-off-by: Bojan Prtvar <prtvar.b@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/em_text.c')
-rw-r--r--net/sched/em_text.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/sched/em_text.c b/net/sched/em_text.c
index f03c3de16c27..73e2ed576ceb 100644
--- a/net/sched/em_text.c
+++ b/net/sched/em_text.c
@@ -34,7 +34,6 @@ static int em_text_match(struct sk_buff *skb, struct tcf_ematch *m,
{
struct text_match *tm = EM_TEXT_PRIV(m);
int from, to;
- struct ts_state state;
from = tcf_get_base_ptr(skb, tm->from_layer) - skb->data;
from += tm->from_offset;
@@ -42,7 +41,7 @@ static int em_text_match(struct sk_buff *skb, struct tcf_ematch *m,
to = tcf_get_base_ptr(skb, tm->to_layer) - skb->data;
to += tm->to_offset;
- return skb_find_text(skb, from, to, tm->config, &state) != UINT_MAX;
+ return skb_find_text(skb, from, to, tm->config) != UINT_MAX;
}
static int em_text_change(struct net *net, void *data, int len,
OpenPOWER on IntegriCloud