Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Thu, 17 Feb 2022 19:44:20 +0000 (11:44 -0800)
committerJakub Kicinski <kuba@kernel.org>
Thu, 17 Feb 2022 19:44:20 +0000 (11:44 -0800)
No conflicts.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
29 files changed:
1  2 
MAINTAINERS
drivers/net/bonding/bond_main.c
drivers/net/dsa/Kconfig
drivers/net/dsa/mv88e6xxx/chip.c
drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
drivers/net/ethernet/intel/ice/ice_lib.c
drivers/net/ethernet/mscc/ocelot.c
drivers/net/usb/cdc_mbim.c
drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
include/linux/netdevice.h
include/net/dsa.h
include/net/ip6_fib.h
include/net/ipv6.h
include/net/netns/ipv6.h
net/core/drop_monitor.c
net/core/rtnetlink.c
net/dsa/dsa_priv.h
net/ipv4/fib_frontend.c
net/ipv4/fib_lookup.h
net/ipv4/fib_semantics.c
net/ipv4/fib_trie.c
net/ipv4/route.c
net/ipv6/addrconf.c
net/ipv6/route.c
net/mac80211/mlme.c
net/mctp/route.c
net/sched/cls_api.c
net/smc/af_smc.c
tools/perf/util/bpf-loader.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -524,11 -523,11 +524,11 @@@ void rtmsg_fib(int event, __be32 key, s
        fri.tb_id = tb_id;
        fri.dst = key;
        fri.dst_len = dst_len;
 -      fri.tos = fa->fa_tos;
 +      fri.tos = inet_dscp_to_dsfield(fa->fa_dscp);
        fri.type = fa->fa_type;
-       fri.offload = fa->offload;
-       fri.trap = fa->trap;
-       fri.offload_failed = fa->offload_failed;
+       fri.offload = READ_ONCE(fa->offload);
+       fri.trap = READ_ONCE(fa->trap);
+       fri.offload_failed = READ_ONCE(fa->offload_failed);
        err = fib_dump_info(skb, info->portid, seq, event, &fri, nlm_flags);
        if (err < 0) {
                /* -EMSGSIZE implies BUG in fib_nlmsg_size() */
@@@ -2304,11 -2299,11 +2308,11 @@@ static int fn_trie_dump_leaf(struct key
                                fri.tb_id = tb->tb_id;
                                fri.dst = xkey;
                                fri.dst_len = KEYLENGTH - fa->fa_slen;
 -                              fri.tos = fa->fa_tos;
 +                              fri.tos = inet_dscp_to_dsfield(fa->fa_dscp);
                                fri.type = fa->fa_type;
-                               fri.offload = fa->offload;
-                               fri.trap = fa->trap;
-                               fri.offload_failed = fa->offload_failed;
+                               fri.offload = READ_ONCE(fa->offload);
+                               fri.trap = READ_ONCE(fa->trap);
+                               fri.offload_failed = READ_ONCE(fa->offload_failed);
                                err = fib_dump_info(skb,
                                                    NETLINK_CB(cb->skb).portid,
                                                    cb->nlh->nlmsg_seq,
@@@ -3397,11 -3392,11 +3397,11 @@@ static int inet_rtm_getroute(struct sk_
  
                                if (fa->fa_slen == slen &&
                                    fa->tb_id == fri.tb_id &&
 -                                  fa->fa_tos == fri.tos &&
 +                                  fa->fa_dscp == inet_dsfield_to_dscp(fri.tos) &&
                                    fa->fa_info == res.fi &&
                                    fa->fa_type == fri.type) {
-                                       fri.offload = fa->offload;
-                                       fri.trap = fa->trap;
+                                       fri.offload = READ_ONCE(fa->offload);
+                                       fri.trap = READ_ONCE(fa->trap);
                                        break;
                                }
                        }
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge