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

Cross-merge networking fixes after downstream PR.

Conflicts:

include/net/inet_sock.h
  f866fbc842de ("ipv4: fix data-races around inet->inet_id")
  c274af224269 ("inet: introduce inet->inet_flags")
https://lore.kernel.org/all/679ddff6-db6e-4ff6-b177-574e90d0103d@tessares.net/

Adjacent changes:

drivers/net/bonding/bond_alb.c
  e74216b8def3 ("bonding: fix macvlan over alb bond support")
  f11e5bd159b0 ("bonding: support balance-alb with openvswitch")

drivers/net/ethernet/broadcom/bgmac.c
  d6499f0b7c7c ("net: bgmac: Return PTR_ERR() for fixed_phy_register()")
  23a14488ea58 ("net: bgmac: Fix return value check for fixed_phy_register()")

drivers/net/ethernet/broadcom/genet/bcmmii.c
  32bbe64a1386 ("net: bcmgenet: Fix return value check for fixed_phy_register()")
  acf50d1adbf4 ("net: bcmgenet: Return PTR_ERR() for fixed_phy_register()")

net/sctp/socket.c
  f866fbc842de ("ipv4: fix data-races around inet->inet_id")
  b09bde5c3554 ("inet: move inet->mc_loop to inet->inet_frags")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/leds/trigger/ledtrig-netdev.c
Simple merge

diff --cc drivers/net/bonding/bond_alb.c
Simple merge

diff --cc drivers/net/dsa/mt7530.c
Simple merge

diff --cc drivers/net/dsa/ocelot/felix_vsc9959.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bgmac.c
index 7c19ba58e9ccdbd87fe8aefcab1c5cacc6a17f28,52ee3751187a2836867b650a5f1128161cb33a52..448a1b90de5ebcf6de79a6b749f5bf279875d0e3
--- 1/drivers/net/ethernet/broadcom/bgmac.c
--- 2/drivers/net/ethernet/broadcom/bgmac.c
+++ b/drivers/net/ethernet/broadcom/bgmac.c
@@@ -1448,9 -1448,9 +1448,9 @@@ int bgmac_phy_connect_direct(struct bgm
        int err;
  
        phy_dev = fixed_phy_register(PHY_POLL, &fphy_status, NULL);
-       if (!phy_dev || IS_ERR(phy_dev)) {
+       if (IS_ERR(phy_dev)) {
                dev_err(bgmac->dev, "Failed to register fixed PHY device\n");
 -              return -ENODEV;
 +              return PTR_ERR(phy_dev);
        }
  
        err = phy_connect_direct(bgmac->net_dev, phy_dev, bgmac_adjust_link,

diff --cc drivers/net/ethernet/broadcom/genet/bcmmii.c
index 4012a141a229bffc906977f8ae05d50faf2848ba,cc3afb605b1ec83a2f988e6af773525e2f8ae7bc..97ea76d443abee84660c9ec3e8e1fb63c34c951a
--- 1/drivers/net/ethernet/broadcom/genet/bcmmii.c
--- 2/drivers/net/ethernet/broadcom/genet/bcmmii.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmmii.c
@@@ -617,9 -617,9 +617,9 @@@ static int bcmgenet_mii_pd_init(struct 
                };
  
                phydev = fixed_phy_register(PHY_POLL, &fphy_status, NULL);
-               if (!phydev || IS_ERR(phydev)) {
+               if (IS_ERR(phydev)) {
                        dev_err(kdev, "failed to register fixed PHY device\n");
 -                      return -ENODEV;
 +                      return PTR_ERR(phydev);
                }
  
                /* Make sure we initialize MoCA PHYs with a link down */

diff --cc drivers/net/ethernet/broadcom/tg3.c
Simple merge

diff --cc drivers/net/ethernet/intel/i40e/i40e_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice_base.c
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice_vf_lib.c
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice_virtchnl.c
Simple merge

diff --cc drivers/net/ethernet/mediatek/mtk_wed.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_keys.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlxsw/reg.h
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_flex_keys.c
Simple merge

diff --cc drivers/net/ethernet/sfc/selftest.c
Simple merge

diff --cc drivers/net/phy/phy.c
Simple merge

diff --cc drivers/net/veth.c
Simple merge

diff --cc include/net/inet_sock.h
index acbb93d7607ab873783802b4be6a23f54e2086d3,491ceb7ebe5d1c6cb502fbcae46c3369f4cb2681..2de0e4d4a027889706323b7ee4b96e406101bff4
--- 1/include/net/inet_sock.h
--- 2/include/net/inet_sock.h
+++ b/include/net/inet_sock.h
@@@ -218,12 -218,12 +218,12 @@@ struct inet_sock 
  #define inet_dport            sk.__sk_common.skc_dport
  #define inet_num              sk.__sk_common.skc_num
  
 +      unsigned long           inet_flags;
        __be32                  inet_saddr;
        __s16                   uc_ttl;
 -      __u16                   cmsg_flags;
 +      __be16                  inet_sport;
        struct ip_options_rcu __rcu     *inet_opt;
-       __u16                   inet_id;
+       atomic_t                inet_id;
 -      __be16                  inet_sport;
  
        __u8                    tos;
        __u8                    min_ttl;

diff --cc include/net/sock.h
Simple merge

diff --cc net/batman-adv/hard-interface.c
Simple merge

diff --cc net/batman-adv/netlink.c
Simple merge

diff --cc net/batman-adv/soft-interface.c
index f7947fad06f25943fe1d00743ed2c3d3178c3d6d,85d00dc9ce32c69fdeaff5ebb0d7098d846f830f..1bf1232a4f759501d2bb27b813b57706b980e88a
--- 1/net/batman-adv/soft-interface.c
--- 2/net/batman-adv/soft-interface.c
+++ b/net/batman-adv/soft-interface.c
@@@ -153,8 -153,10 +153,10 @@@ static int batadv_interface_set_mac_add
  
  static int batadv_interface_change_mtu(struct net_device *dev, int new_mtu)
  {
+       struct batadv_priv *bat_priv = netdev_priv(dev);
+ 
        /* check ranges */
 -      if (new_mtu < 68 || new_mtu > batadv_hardif_min_mtu(dev))
 +      if (new_mtu < ETH_MIN_MTU || new_mtu > batadv_hardif_min_mtu(dev))
                return -EINVAL;
  
        dev->mtu = new_mtu;

diff --cc net/batman-adv/types.h
Simple merge

diff --cc net/core/rtnetlink.c
Simple merge

diff --cc net/dccp/ipv4.c
Simple merge

diff --cc net/devlink/leftover.c
Simple merge

diff --cc net/ipv4/af_inet.c
Simple merge

diff --cc net/ipv4/tcp_ipv4.c
Simple merge

diff --cc net/netfilter/nf_tables_api.c
Simple merge

diff --cc net/sctp/socket.c
index 04b390892827b8abbb7e7433d71f4f54dd1dac21,76f1bce49a8e7b3eabfc53c66eaf6f68d41cfb77..fd0631e70d46a282be382e4edb5bcf91ff7798cc
--- 1/net/sctp/socket.c
--- 2/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@@ -9479,10 -9479,10 +9479,10 @@@ void sctp_copy_sock(struct sock *newsk
        newinet->inet_rcv_saddr = inet->inet_rcv_saddr;
        newinet->inet_dport = htons(asoc->peer.port);
        newinet->pmtudisc = inet->pmtudisc;
-       newinet->inet_id = get_random_u16();
+       atomic_set(&newinet->inet_id, get_random_u16());
  
        newinet->uc_ttl = inet->uc_ttl;
 -      newinet->mc_loop = 1;
 +      inet_set_bit(MC_LOOP, newsk);
        newinet->mc_ttl = 1;
        newinet->mc_index = 0;
        newinet->mc_list = NULL;