iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Merge in late fixes to prepare for the 6.10 net-next PR.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Jakub Kicinski
2024-05-14 10:52:25 -07:00
parent dc9dfd8ae4 aea27a92a4
commit 654de42f3f
36 changed files with 438 additions and 298 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/net/ax25.h
View File

@@ -218,7 +218,7 @@ typedef struct {
struct ctl_table;
typedef struct ax25_dev {
struct ax25_dev *next;
struct list_head list;
struct net_device *dev;
netdevice_tracker dev_tracker;
@@ -332,7 +332,6 @@ int ax25_addr_size(const ax25_digi *);
void ax25_digi_invert(const ax25_digi *, ax25_digi *);
/* ax25_dev.c */
extern ax25_dev *ax25_dev_list;
extern spinlock_t ax25_dev_lock;
#if IS_ENABLED(CONFIG_AX25)