Merge https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next

[linux-2.6-microblaze.git] / net / ipv6 / udp.c

diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index e43b31d..6a0e569 100644 (file)
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -195,7 +195,7 @@ static inline struct sock *udp6_lookup_run_bpf(struct net *net,
                                               const struct in6_addr *saddr,
                                               __be16 sport,
                                               const struct in6_addr *daddr,
-                                              u16 hnum)
+                                              u16 hnum, const int dif)
 {
        struct sock *sk, *reuse_sk;
        bool no_reuseport;
@@ -203,8 +203,8 @@ static inline struct sock *udp6_lookup_run_bpf(struct net *net,
        if (udptable != &udp_table)
                return NULL; /* only UDP is supported */
 
-       no_reuseport = bpf_sk_lookup_run_v6(net, IPPROTO_UDP,
-                                           saddr, sport, daddr, hnum, &sk);
+       no_reuseport = bpf_sk_lookup_run_v6(net, IPPROTO_UDP, saddr, sport,
+                                           daddr, hnum, dif, &sk);
        if (no_reuseport || IS_ERR_OR_NULL(sk))
                return sk;
 
@@ -240,7 +240,7 @@ struct sock *__udp6_lib_lookup(struct net *net,
        /* Lookup redirect from BPF */
        if (static_branch_unlikely(&bpf_sk_lookup_enabled)) {
                sk = udp6_lookup_run_bpf(net, udptable, skb,
-                                        saddr, sport, daddr, hnum);
+                                        saddr, sport, daddr, hnum, dif);
                if (sk) {
                        result = sk;
                        goto done;