diff options
| author |   Bojan Prtvar <prtvar.b@gmail.com> | 2015-02-22 11:46:35 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-02-22 15:59:54 -0500 |
| commit | 059a2440fd3cf4ec57735db2c0a90401cde84fca (patch) | |
| tree | ae1cc62a03192b53b6d4c1eb14b50d534b385797 /net/netfilter/xt_string.c | |
| parent | ethtool: use "ops" name consistenty in ethtool_set_rxfh() (diff) | |
| download | linux-dev-059a2440fd3cf4ec57735db2c0a90401cde84fca.tar.xz linux-dev-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/netfilter/xt_string.c')
| -rw-r--r-- | net/netfilter/xt_string.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/netfilter/xt_string.c b/net/netfilter/xt_string.c index 5699adb97652..0bc3460319c8 100644 --- a/net/netfilter/xt_string.c +++ b/net/netfilter/xt_string.c @@ -26,13 +26,12 @@ static bool string_mt(const struct sk_buff *skb, struct xt_action_param *par) { const struct xt_string_info *conf = par->matchinfo; - struct ts_state state; bool invert; invert = conf->u.v1.flags & XT_STRING_FLAG_INVERT; return (skb_find_text((struct sk_buff *)skb, conf->from_offset, - conf->to_offset, conf->config, &state) + conf->to_offset, conf->config) != UINT_MAX) ^ invert; } |