net: filter: split 'struct sk_filter' into socket and bpf parts

[cascardo/linux.git] / drivers / net / team / team_mode_loadbalance.c

diff --git a/drivers/net/team/team_mode_loadbalance.c b/drivers/net/team/team_mode_loadbalance.c
index d7be9b3..a1536d0 100644 (file)
--- a/drivers/net/team/team_mode_loadbalance.c
+++ b/drivers/net/team/team_mode_loadbalance.c
@@ -58,7 +58,7 @@ struct lb_priv_ex {
 };
 
 struct lb_priv {
-       struct sk_filter __rcu *fp;
+       struct bpf_prog __rcu *fp;
        lb_select_tx_port_func_t __rcu *select_tx_port_func;
        struct lb_pcpu_stats __percpu *pcpu_stats;
        struct lb_priv_ex *ex; /* priv extension */
@@ -174,14 +174,14 @@ static lb_select_tx_port_func_t *lb_select_tx_port_get_func(const char *name)
 static unsigned int lb_get_skb_hash(struct lb_priv *lb_priv,
                                    struct sk_buff *skb)
 {
-       struct sk_filter *fp;
+       struct bpf_prog *fp;
        uint32_t lhash;
        unsigned char *c;
 
        fp = rcu_dereference_bh(lb_priv->fp);
        if (unlikely(!fp))
                return 0;
-       lhash = SK_RUN_FILTER(fp, skb);
+       lhash = BPF_PROG_RUN(fp, skb);
        c = (char *) &lhash;
        return c[0] ^ c[1] ^ c[2] ^ c[3];
 }
@@ -271,8 +271,8 @@ static void __fprog_destroy(struct sock_fprog_kern *fprog)
 static int lb_bpf_func_set(struct team *team, struct team_gsetter_ctx *ctx)
 {
        struct lb_priv *lb_priv = get_lb_priv(team);
-       struct sk_filter *fp = NULL;
-       struct sk_filter *orig_fp = NULL;
+       struct bpf_prog *fp = NULL;
+       struct bpf_prog *orig_fp = NULL;
        struct sock_fprog_kern *fprog = NULL;
        int err;
 
@@ -281,7 +281,7 @@ static int lb_bpf_func_set(struct team *team, struct team_gsetter_ctx *ctx)
                                     ctx->data.bin_val.ptr);
                if (err)
                        return err;
-               err = sk_unattached_filter_create(&fp, fprog);
+               err = bpf_prog_create(&fp, fprog);
                if (err) {
                        __fprog_destroy(fprog);
                        return err;
@@ -300,7 +300,7 @@ static int lb_bpf_func_set(struct team *team, struct team_gsetter_ctx *ctx)
 
        if (orig_fp) {
                synchronize_rcu();
-               sk_unattached_filter_destroy(orig_fp);
+               bpf_prog_destroy(orig_fp);
        }
        return 0;
 }