mirror-linux/drivers/net/ethernet/broadcom
Jakub Kicinski 57ce6427e0 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
  f866fbc842 ("ipv4: fix data-races around inet->inet_id")
  c274af2242 ("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
  e74216b8de ("bonding: fix macvlan over alb bond support")
  f11e5bd159 ("bonding: support balance-alb with openvswitch")

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

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

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

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2023-08-24 10:51:39 -07:00
..
asp2 net: bcmasp: Prevent array undereflow in bcmasp_netfilt_get_init() 2023-08-08 15:06:15 -07:00
bnx2x Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2023-08-24 10:51:39 -07:00
bnxt bnxt: use the NAPI skb allocation cache 2023-08-23 11:45:54 +01:00
genet Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2023-08-24 10:51:39 -07:00
Kconfig bcmasp: BCMASP should depend on ARCH_BRCMSTB 2023-07-26 21:46:41 -07:00
Makefile net: bcmasp: Add support for ASP2.0 Ethernet controller 2023-07-17 07:39:04 +01:00
b44.c broadcom: b44: Use b44_writephy() return value 2023-08-16 07:08:29 +01:00
b44.h
bcm63xx_enet.c bcm63xx_enet: Remove redundant initialization owner 2023-08-09 13:03:23 -07:00
bcm63xx_enet.h
bcm4908_enet.c
bcm4908_enet.h
bcmsysport.c net: systemport: Replace platform_get_irq with platform_get_irq_optional 2023-06-02 09:56:23 +01:00
bcmsysport.h
bgmac-bcma-mdio.c
bgmac-bcma.c net: bgmac: fix BCM5358 support by setting correct flags 2023-02-09 22:25:31 -08:00
bgmac-platform.c
bgmac.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2023-08-24 10:51:39 -07:00
bgmac.h bgmac: fix *initial* chip reset to support BCM5358 2023-02-28 11:10:05 +01:00
bnx2.c net: remove __skb_frag_set_page() 2023-05-13 19:47:56 +01:00
bnx2.h bnx2: Drop redundant pci_enable_pcie_error_reporting() 2023-03-08 23:34:38 -08:00
bnx2_fw.h
cnic.c
cnic.h
cnic_defs.h
cnic_if.h
sb1250-mac.c ethernet: broadcom/sb1250-mac: clean up after SIBYTE_BCM1x55 removal 2023-03-24 09:04:01 +00:00
tg3.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2023-08-24 10:51:39 -07:00
tg3.h
unimac.h