Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

[firefly-linux-kernel-4.4.55.git] / net / sched / em_text.c

diff --git a/net/sched/em_text.c b/net/sched/em_text.c
index 15d353d2e4be0791859f533c8b816a584713fbcd..f03c3de16c274f3152f4ef701339d20158609b51 100644 (file)
--- a/net/sched/em_text.c
+++ b/net/sched/em_text.c
@@ -45,7 +45,7 @@ static int em_text_match(struct sk_buff *skb, struct tcf_ematch *m,
        return skb_find_text(skb, from, to, tm->config, &state) != UINT_MAX;
 }
 
-static int em_text_change(struct tcf_proto *tp, void *data, int len,
+static int em_text_change(struct net *net, void *data, int len,
                          struct tcf_ematch *m)
 {
        struct text_match *tm;
@@ -100,7 +100,7 @@ retry:
        return 0;
 }
 
-static void em_text_destroy(struct tcf_proto *tp, struct tcf_ematch *m)
+static void em_text_destroy(struct tcf_ematch *m)
 {
        if (EM_TEXT_PRIV(m) && EM_TEXT_PRIV(m)->config)
                textsearch_destroy(EM_TEXT_PRIV(m)->config);