mirror of
https://github.com/torvalds/linux.git
synced 2026-04-18 06:44:00 -04:00
net: dsa: cpu_dp->orig_ethtool_ops might be NULL
In theory this would have been seen by now, but it seems that all drivers used as DSA conduit interfaces thus far have had ethtool_ops set, and it's hard to even find modern Ethernet drivers (and not VF ones) which don't use ethtool. Here is the unfiltered list of drivers which register any sort of net_device but don't set its ethtool_ops pointer. I don't think any of them 'risks' being used as a DSA conduit, maybe except for moxart, rnpbge and icssm, I'm not sure. - drivers/net/can/dev/dev.c - drivers/net/wwan/qcom_bam_dmux.c - drivers/net/wwan/t7xx/t7xx_netdev.c - drivers/net/arcnet/arcnet.c - drivers/net/hamradio/ - drivers/net/slip/slip.c - drivers/net/ethernet/ezchip/nps_enet.c - drivers/net/ethernet/moxa/moxart_ether.c - drivers/net/ethernet/wangxun/txgbevf/txgbevf_main.c - drivers/net/ethernet/wangxun/ngbevf/ngbevf_main.c - drivers/net/ethernet/huawei/hinic3/hinic3_main.c - drivers/net/ethernet/i825xx/ - drivers/net/ethernet/ti/icssm/icssm_prueth.c - drivers/net/ethernet/seeq/ - drivers/net/ethernet/litex/litex_liteeth.c - drivers/net/ethernet/sunplus/spl2sw_driver.c - drivers/net/ethernet/mucse/rnpgbe/rnpgbe_main.c - drivers/net/ipa/ - drivers/net/wireless/microchip/wilc1000/ - drivers/net/wireless/mediatek/mt76/dma.c - drivers/net/wireless/ath/ath12k/ - drivers/net/wireless/ath/ath11k/ - drivers/net/wireless/ath/ath6kl/ - drivers/net/wireless/ath/ath10k/ - drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/trans.c - drivers/net/wireless/virtual/mac80211_hwsim.c - drivers/net/wireless/quantenna/qtnfmac/pcie/pcie.c - drivers/net/wireless/realtek/rtw89/core.c - drivers/net/wireless/realtek/rtw88/pci.c - drivers/net/caif/ - drivers/net/plip/ - drivers/net/wan/ - drivers/net/mctp/ - drivers/net/ppp/ - drivers/net/thunderbolt/ Nonetheless, it's good for the framework not to make such assumptions, and not panic when coming across such kind of host device in the future. Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Link: https://patch.msgid.link/20251122112311.138784-2-vladimir.oltean@nxp.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
committed by
Jakub Kicinski
parent
380d19db6e
commit
eba81b0a6d
@@ -26,7 +26,7 @@ static int dsa_conduit_get_regs_len(struct net_device *dev)
|
||||
int ret = 0;
|
||||
int len;
|
||||
|
||||
if (ops->get_regs_len) {
|
||||
if (ops && ops->get_regs_len) {
|
||||
netdev_lock_ops(dev);
|
||||
len = ops->get_regs_len(dev);
|
||||
netdev_unlock_ops(dev);
|
||||
@@ -59,7 +59,7 @@ static void dsa_conduit_get_regs(struct net_device *dev,
|
||||
int port = cpu_dp->index;
|
||||
int len;
|
||||
|
||||
if (ops->get_regs_len && ops->get_regs) {
|
||||
if (ops && ops->get_regs_len && ops->get_regs) {
|
||||
netdev_lock_ops(dev);
|
||||
len = ops->get_regs_len(dev);
|
||||
if (len < 0) {
|
||||
@@ -97,7 +97,7 @@ static void dsa_conduit_get_ethtool_stats(struct net_device *dev,
|
||||
int port = cpu_dp->index;
|
||||
int count = 0;
|
||||
|
||||
if (ops->get_sset_count && ops->get_ethtool_stats) {
|
||||
if (ops && ops->get_sset_count && ops->get_ethtool_stats) {
|
||||
netdev_lock_ops(dev);
|
||||
count = ops->get_sset_count(dev, ETH_SS_STATS);
|
||||
ops->get_ethtool_stats(dev, stats, data);
|
||||
@@ -118,11 +118,11 @@ static void dsa_conduit_get_ethtool_phy_stats(struct net_device *dev,
|
||||
int port = cpu_dp->index;
|
||||
int count = 0;
|
||||
|
||||
if (dev->phydev && !ops->get_ethtool_phy_stats) {
|
||||
if (dev->phydev && (!ops || !ops->get_ethtool_phy_stats)) {
|
||||
count = phy_ethtool_get_sset_count(dev->phydev);
|
||||
if (count >= 0)
|
||||
phy_ethtool_get_stats(dev->phydev, stats, data);
|
||||
} else if (ops->get_sset_count && ops->get_ethtool_phy_stats) {
|
||||
} else if (ops && ops->get_sset_count && ops->get_ethtool_phy_stats) {
|
||||
netdev_lock_ops(dev);
|
||||
count = ops->get_sset_count(dev, ETH_SS_PHY_STATS);
|
||||
ops->get_ethtool_phy_stats(dev, stats, data);
|
||||
@@ -145,9 +145,9 @@ static int dsa_conduit_get_sset_count(struct net_device *dev, int sset)
|
||||
|
||||
netdev_lock_ops(dev);
|
||||
if (sset == ETH_SS_PHY_STATS && dev->phydev &&
|
||||
!ops->get_ethtool_phy_stats)
|
||||
(!ops || !ops->get_ethtool_phy_stats))
|
||||
count = phy_ethtool_get_sset_count(dev->phydev);
|
||||
else if (ops->get_sset_count)
|
||||
else if (ops && ops->get_sset_count)
|
||||
count = ops->get_sset_count(dev, sset);
|
||||
netdev_unlock_ops(dev);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user