Commit 023b1e9d authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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



Merge in late fixes to prepare for the 6.15 net-next PR.

No conflicts, adjacent changes:

drivers/net/ethernet/broadcom/bnxt/bnxt.c
  919f9f49 ("eth: bnxt: fix out-of-range access of vnic_info array")
  fe96d717 ("bnxt_en: Extend queue stop/start for TX rings")

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 705094f6 70facbf9

CREDITS

+4 −0
Original line number Diff line number Diff line
@@ -3233,6 +3233,10 @@ N: Rui Prior 
E: rprior@inescn.pt

D: ATM device driver for NICStAR based cards



N: Roopa Prabhu

E: roopa@nvidia.com

D: Bridge co-maintainer, vxlan and networking contributor



N: Stefan Probst

E: sp@caldera.de

D: The Linux Support Team Erlangen, 1993-97

MAINTAINERS

+3 −1
Original line number Diff line number Diff line
@@ -8593,12 +8593,14 @@ F: Documentation/networking/devlink/etas_es58x.rst 
F:	drivers/net/can/usb/etas_es58x/









ETHERNET BRIDGE









M:	Roopa Prabhu <roopa@nvidia.com>









M:	Nikolay Aleksandrov <razor@blackwall.org>









M:	Ido Schimmel <idosch@nvidia.com>









L:	bridge@lists.linux.dev









L:	netdev@vger.kernel.org









S:	Maintained









W:	http://www.linuxfoundation.org/en/Net:Bridge









F:	include/linux/if_bridge.h









F:	include/uapi/linux/if_bridge.h









F:	include/linux/netfilter_bridge/









F:	net/bridge/








































arch/parisc/include/uapi/asm/socket.h



+6
−6






























Original line number
Diff line number
Diff line







@@ -132,16 +132,16 @@







#define SO_PASSPIDFD		0x404A









#define SO_PEERPIDFD		0x404B



















#define SO_DEVMEM_LINEAR	78









#define SCM_DEVMEM_LINEAR	SO_DEVMEM_LINEAR









#define SO_DEVMEM_DMABUF	79









#define SCM_DEVMEM_DMABUF	SO_DEVMEM_DMABUF









#define SO_DEVMEM_DONTNEED	80



















#define SCM_TS_OPT_ID		0x404C



















#define SO_RCVPRIORITY		0x404D



















#define SO_DEVMEM_LINEAR	0x404E









#define SCM_DEVMEM_LINEAR	SO_DEVMEM_LINEAR









#define SO_DEVMEM_DMABUF	0x404F









#define SCM_DEVMEM_DMABUF	SO_DEVMEM_DMABUF









#define SO_DEVMEM_DONTNEED	0x4050



















#if !defined(__KERNEL__)



















#if __BITS_PER_LONG == 64
































drivers/net/bonding/bond_main.c



+4
−4






























Original line number
Diff line number
Diff line







@@ -323,9 +323,9 @@ static bool bond_sk_check(struct bonding *bond)







	}









}



















static bool bond_xdp_check(struct bonding *bond)









bool bond_xdp_check(struct bonding *bond, int mode)









{









	switch (BOND_MODE(bond)) {









	switch (mode) {









	case BOND_MODE_ROUNDROBIN:









	case BOND_MODE_ACTIVEBACKUP:









		return true;








@@ -1928,7 +1928,7 @@ void bond_xdp_set_features(struct net_device *bond_dev)

















	ASSERT_RTNL();



















	if (!bond_xdp_check(bond) || !bond_has_slaves(bond)) {









	if (!bond_xdp_check(bond, BOND_MODE(bond)) || !bond_has_slaves(bond)) {









		xdp_clear_features_flag(bond_dev);









		return;









	}








@@ -5693,7 +5693,7 @@ static int bond_xdp_set(struct net_device *dev, struct bpf_prog *prog,

















	ASSERT_RTNL();



















	if (!bond_xdp_check(bond)) {









	if (!bond_xdp_check(bond, BOND_MODE(bond))) {









		BOND_NL_ERR(dev, extack,









			    "No native XDP support for the current bonding mode");









		return -EOPNOTSUPP;
































drivers/net/bonding/bond_options.c



+3
−0






























Original line number
Diff line number
Diff line







@@ -868,6 +868,9 @@ static bool bond_set_xfrm_features(struct bonding *bond)







static int bond_option_mode_set(struct bonding *bond,









				const struct bond_opt_value *newval)









{









	if (bond->xdp_prog && !bond_xdp_check(bond, newval->value))









		return -EOPNOTSUPP;



















	if (!bond_mode_uses_arp(newval->value)) {









		if (bond->params.arp_interval) {









			netdev_dbg(bond->dev, "%s mode is incompatible with arp monitoring, start mii monitoring\n",