Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64...

[firefly-linux-kernel-4.4.55.git] / drivers / isdn / i4l / isdn_ppp.c

diff --git a/drivers/isdn/i4l/isdn_ppp.c b/drivers/isdn/i4l/isdn_ppp.c
index 62f0688d45a500530fd65014432be9fbfd5a7d69..c4198fa490bfac50dd3c05fa324502d4e6f228c8 100644 (file)
--- a/drivers/isdn/i4l/isdn_ppp.c
+++ b/drivers/isdn/i4l/isdn_ppp.c
@@ -379,12 +379,12 @@ isdn_ppp_release(int min, struct file *file)
 #endif
 #ifdef CONFIG_IPPP_FILTER
        if (is->pass_filter) {
-               sk_unattached_filter_destroy(is->pass_filter);
+               bpf_prog_destroy(is->pass_filter);
                is->pass_filter = NULL;
        }
 
        if (is->active_filter) {
-               sk_unattached_filter_destroy(is->active_filter);
+               bpf_prog_destroy(is->active_filter);
                is->active_filter = NULL;
        }
 #endif
@@ -639,12 +639,11 @@ isdn_ppp_ioctl(int min, struct file *file, unsigned int cmd, unsigned long arg)
                fprog.filter = code;
 
                if (is->pass_filter) {
-                       sk_unattached_filter_destroy(is->pass_filter);
+                       bpf_prog_destroy(is->pass_filter);
                        is->pass_filter = NULL;
                }
                if (fprog.filter != NULL)
-                       err = sk_unattached_filter_create(&is->pass_filter,
-                                                         &fprog);
+                       err = bpf_prog_create(&is->pass_filter, &fprog);
                else
                        err = 0;
                kfree(code);
@@ -664,12 +663,11 @@ isdn_ppp_ioctl(int min, struct file *file, unsigned int cmd, unsigned long arg)
                fprog.filter = code;
 
                if (is->active_filter) {
-                       sk_unattached_filter_destroy(is->active_filter);
+                       bpf_prog_destroy(is->active_filter);
                        is->active_filter = NULL;
                }
                if (fprog.filter != NULL)
-                       err = sk_unattached_filter_create(&is->active_filter,
-                                                         &fprog);
+                       err = bpf_prog_create(&is->active_filter, &fprog);
                else
                        err = 0;
                kfree(code);
@@ -1174,14 +1172,14 @@ isdn_ppp_push_higher(isdn_net_dev *net_dev, isdn_net_local *lp, struct sk_buff *
        }
 
        if (is->pass_filter
-           && SK_RUN_FILTER(is->pass_filter, skb) == 0) {
+           && BPF_PROG_RUN(is->pass_filter, skb) == 0) {
                if (is->debug & 0x2)
                        printk(KERN_DEBUG "IPPP: inbound frame filtered.\n");
                kfree_skb(skb);
                return;
        }
        if (!(is->active_filter
-             && SK_RUN_FILTER(is->active_filter, skb) == 0)) {
+             && BPF_PROG_RUN(is->active_filter, skb) == 0)) {
                if (is->debug & 0x2)
                        printk(KERN_DEBUG "IPPP: link-active filter: resetting huptimer.\n");
                lp->huptimer = 0;
@@ -1320,14 +1318,14 @@ isdn_ppp_xmit(struct sk_buff *skb, struct net_device *netdev)
        }
 
        if (ipt->pass_filter
-           && SK_RUN_FILTER(ipt->pass_filter, skb) == 0) {
+           && BPF_PROG_RUN(ipt->pass_filter, skb) == 0) {
                if (ipt->debug & 0x4)
                        printk(KERN_DEBUG "IPPP: outbound frame filtered.\n");
                kfree_skb(skb);
                goto unlock;
        }
        if (!(ipt->active_filter
-             && SK_RUN_FILTER(ipt->active_filter, skb) == 0)) {
+             && BPF_PROG_RUN(ipt->active_filter, skb) == 0)) {
                if (ipt->debug & 0x4)
                        printk(KERN_DEBUG "IPPP: link-active filter: resetting huptimer.\n");
                lp->huptimer = 0;
@@ -1517,9 +1515,9 @@ int isdn_ppp_autodial_filter(struct sk_buff *skb, isdn_net_local *lp)
        }
 
        drop |= is->pass_filter
-               && SK_RUN_FILTER(is->pass_filter, skb) == 0;
+               && BPF_PROG_RUN(is->pass_filter, skb) == 0;
        drop |= is->active_filter
-               && SK_RUN_FILTER(is->active_filter, skb) == 0;
+               && BPF_PROG_RUN(is->active_filter, skb) == 0;
 
        skb_push(skb, IPPP_MAX_HEADER - 4);
        return drop;