Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

net/sched/cls_api.c has overlapping changes to a call to
nlmsg_parse(), one (from 'net') added rtm_tca_policy instead of NULL
to the 5th argument, and another (from 'net-next') added cb->extack
instead of NULL to the 6th argument.

net/ipv4/ipmr_base.c is a case of a bug fix in 'net' being done to
code which moved (to mr_table_dump)) in 'net-next'.  Thanks to David
Ahern for the heads up.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 2 insertions, 8 deletions

diff --git a/kernel/bpf/xskmap.c b/kernel/bpf/xskmap.c
index ef0b7b6ef8a5..686d244e798d 100644
--- a/kernel/bpf/xskmap.c
+++ b/kernel/bpf/xskmap.c
@@ -192,11 +192,8 @@ static int xsk_map_update_elem(struct bpf_map *map, void *key, void *value,
         sock_hold(sock->sk);
 
         old_xs = xchg(&m->xsk_map[i], xs);
-        if (old_xs) {
-                /* Make sure we've flushed everything. */
-                synchronize_net();
+        if (old_xs)
                 sock_put((struct sock *)old_xs);
-        }
 
         sockfd_put(sock);
         return 0;
@@ -212,11 +209,8 @@ static int xsk_map_delete_elem(struct bpf_map *map, void *key)
                 return -EINVAL;
 
         old_xs = xchg(&m->xsk_map[k], NULL);
-        if (old_xs) {
-                /* Make sure we've flushed everything. */
-                synchronize_net();
+        if (old_xs)
                 sock_put((struct sock *)old_xs);
-        }
 
         return 0;
 }