net: update netdev_lock_{type,name}
Subsystems (2)
PATCH v3 1/1 net: update netdev_lock_{type,name}
Add missing entries in netdev_lock_type[] and netdev_lock_name[] :
CAN, MCTP, RAWIP, CAIF, IP6GRE, 6LOWPAN, NETLINK, VSOCKMON, IEEE802154_MONITOR.
Also add a WARN_ONCE() in netdev_lock_pos() to help future bug hunting next time a protocol is added without updating these arrays.
---
v3: add IEEE802154_MONITOR.
v2: add NETLINK (Jakub), VSOCKMON.
v1: add CAN, MCTP, RAWIP, CAIF, IP6GRE, 6LOWPAN.
net/core/dev.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-)
net/core/dev.c +19 -6
@@ -478,15 +478,21 @@ static const unsigned short netdev_lock_type[] = {ARPHRD_IEEE1394 ,ARPHRD_EUI64 ,ARPHRD_INFINIBAND ,ARPHRD_SLIP ,ARPHRD_CSLIP ,ARPHRD_SLIP6 ,ARPHRD_CSLIP6 ,ARPHRD_RSRVD ,ARPHRD_ADAPT ,ARPHRD_ROSE ,ARPHRD_X25 ,ARPHRD_HWX25 , +ARPHRD_CAN ,ARPHRD_MCTP ,ARPHRD_PPP ,ARPHRD_CISCO ,ARPHRD_LAPB ,ARPHRD_DDCMP , -ARPHRD_RAWHDLC ,ARPHRD_TUNNEL ,ARPHRD_TUNNEL6 ,ARPHRD_FRAD , +ARPHRD_RAWHDLC ,ARPHRD_RAWIP , +ARPHRD_TUNNEL ,ARPHRD_TUNNEL6 ,ARPHRD_FRAD ,ARPHRD_SKIP ,ARPHRD_LOOPBACK ,ARPHRD_LOCALTLK ,ARPHRD_FDDI ,ARPHRD_BIF ,ARPHRD_SIT ,ARPHRD_IPDDP ,ARPHRD_IPGRE ,ARPHRD_PIMREG ,ARPHRD_HIPPI ,ARPHRD_ASH ,ARPHRD_ECONET ,ARPHRD_IRDA ,ARPHRD_FCPP ,ARPHRD_FCAL ,ARPHRD_FCPL ,ARPHRD_FCFABRIC ,ARPHRD_IEEE80211 ,ARPHRD_IEEE80211_PRISM , -ARPHRD_IEEE80211_RADIOTAP ,ARPHRD_PHONET ,ARPHRD_PHONET_PIPE , - ARPHRD_IEEE802154, ARPHRD_VOID, ARPHRD_NONE}; +ARPHRD_IEEE80211_RADIOTAP , +ARPHRD_IEEE802154 ,ARPHRD_IEEE802154_MONITOR , +ARPHRD_PHONET ,ARPHRD_PHONET_PIPE , +ARPHRD_CAIF ,ARPHRD_IP6GRE ,ARPHRD_NETLINK ,ARPHRD_6LOWPAN , +ARPHRD_VSOCKMON , + ARPHRD_VOID, ARPHRD_NONE};static const char *const netdev_lock_name[] = { "_xmit_NETROM", "_xmit_ETHER", "_xmit_EETHER", "_xmit_AX25",
@@ -495,15 +501,21 @@ static const char *const netdev_lock_name[] = {"_xmit_IEEE1394" ,"_xmit_EUI64" ,"_xmit_INFINIBAND" ,"_xmit_SLIP" ,"_xmit_CSLIP" ,"_xmit_SLIP6" ,"_xmit_CSLIP6" ,"_xmit_RSRVD" ,"_xmit_ADAPT" ,"_xmit_ROSE" ,"_xmit_X25" ,"_xmit_HWX25" , +"_xmit_CAN" ,"_xmit_MCTP" ,"_xmit_PPP" ,"_xmit_CISCO" ,"_xmit_LAPB" ,"_xmit_DDCMP" , -"_xmit_RAWHDLC" ,"_xmit_TUNNEL" ,"_xmit_TUNNEL6" ,"_xmit_FRAD" , +"_xmit_RAWHDLC" ,"_xmit_RAWIP" , +"_xmit_TUNNEL" ,"_xmit_TUNNEL6" ,"_xmit_FRAD" ,"_xmit_SKIP" ,"_xmit_LOOPBACK" ,"_xmit_LOCALTLK" ,"_xmit_FDDI" ,"_xmit_BIF" ,"_xmit_SIT" ,"_xmit_IPDDP" ,"_xmit_IPGRE" ,"_xmit_PIMREG" ,"_xmit_HIPPI" ,"_xmit_ASH" ,"_xmit_ECONET" ,"_xmit_IRDA" ,"_xmit_FCPP" ,"_xmit_FCAL" ,"_xmit_FCPL" ,"_xmit_FCFABRIC" ,"_xmit_IEEE80211" ,"_xmit_IEEE80211_PRISM" , -"_xmit_IEEE80211_RADIOTAP" ,"_xmit_PHONET" ,"_xmit_PHONET_PIPE" , - "_xmit_IEEE802154", "_xmit_VOID", "_xmit_NONE"}; +"_xmit_IEEE80211_RADIOTAP" , +"_xmit_IEEE802154" ,"_xmit_IEEE802154_MONITOR" , +"_xmit_PHONET" ,"_xmit_PHONET_PIPE" , +"_xmit_CAIF" ,"_xmit_IP6GRE" ,"_xmit_NETLINK" ,"_xmit_6LOWPAN" , +"_xmit_VSOCKMON" , + "_xmit_VOID", "_xmit_NONE"};static struct lock_class_key netdev_xmit_lock_key[ARRAY_SIZE (netdev_lock_type)];static struct lock_class_key netdev_addr_lock_key[ARRAY_SIZE (netdev_lock_type)];
@@ -516,6 +528,7 @@ static inline unsigned short netdev_lock_pos(unsigned short dev_type)if (netdev_lock_type[i] == dev_type)return i;/* the last key is used by default */ +WARN_ONCE (1 ,"netdev_lock_pos() could not find dev_type=%u\n" , dev_type);return ARRAY_SIZE (netdev_lock_type) -1 ; }
Signature · 1 line
2.52.0.351.gbe84eed79e-goog
This patch was applied to netdev/net.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net.git (main)
by Jakub Kicinski <[email protected]>:
Quoted 9 lines · On Thu, 8 Jan 2026 09:32:44 +0000 you wrote:
Add missing entries in netdev_lock_type[] and netdev_lock_name[] :
CAN, MCTP, RAWIP, CAIF, IP6GRE, 6LOWPAN, NETLINK, VSOCKMON,
IEEE802154_MONITOR.Also add a
WARN_ONCE()innetdev_lock_pos()to help future bug hunting next time a protocol is added without updating these arrays.[...]
Here is the summary with links:
- [v3,net] net: update netdev_lock_{type,name}
https://git.kernel.org/netdev/net/c/eb74c19fe108
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html