Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

wifi: cfg80211: Always call tracing

Call the tracing function even if the cfg80211 callbacks
are not set. This would allow better understanding of
user space actions.

Reviewed-by: Miriam Rachel Korenblit <miriam.rachel.korenblit@intel.com>
Signed-off-by: Ilan Peer <ilan.peer@intel.com>
Link: https://patch.msgid.link/20240614093541.018cb816e176.I28f68740a6b42144346f5c175c7874b0a669a364@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

authored by

Ilan Peer and committed by
Johannes Berg
5036eaff 9cc88678

+21 -35
+21 -35
net/wireless/rdev-ops.h
··· 578 578 static inline int 579 579 rdev_set_wiphy_params(struct cfg80211_registered_device *rdev, u32 changed) 580 580 { 581 - int ret; 582 - 583 - if (!rdev->ops->set_wiphy_params) 584 - return -EOPNOTSUPP; 581 + int ret = -EOPNOTSUPP; 585 582 586 583 trace_rdev_set_wiphy_params(&rdev->wiphy, changed); 587 - ret = rdev->ops->set_wiphy_params(&rdev->wiphy, changed); 584 + if (rdev->ops->set_wiphy_params) 585 + ret = rdev->ops->set_wiphy_params(&rdev->wiphy, changed); 588 586 trace_rdev_return_int(&rdev->wiphy, ret); 589 587 return ret; 590 588 } ··· 1423 1425 struct cfg80211_chan_def *chandef) 1424 1426 { 1425 1427 struct wiphy *wiphy = &rdev->wiphy; 1426 - int ret; 1427 - 1428 - if (!rdev->ops->set_radar_background) 1429 - return -EOPNOTSUPP; 1428 + int ret = -EOPNOTSUPP; 1430 1429 1431 1430 trace_rdev_set_radar_background(wiphy, chandef); 1432 - ret = rdev->ops->set_radar_background(wiphy, chandef); 1431 + if (rdev->ops->set_radar_background) 1432 + ret = rdev->ops->set_radar_background(wiphy, chandef); 1433 1433 trace_rdev_return_int(wiphy, ret); 1434 1434 1435 1435 return ret; ··· 1464 1468 struct net_device *dev, 1465 1469 struct link_station_parameters *params) 1466 1470 { 1467 - int ret; 1468 - 1469 - if (!rdev->ops->add_link_station) 1470 - return -EOPNOTSUPP; 1471 + int ret = -EOPNOTSUPP; 1471 1472 1472 1473 trace_rdev_add_link_station(&rdev->wiphy, dev, params); 1473 - ret = rdev->ops->add_link_station(&rdev->wiphy, dev, params); 1474 + if (rdev->ops->add_link_station) 1475 + ret = rdev->ops->add_link_station(&rdev->wiphy, dev, params); 1474 1476 trace_rdev_return_int(&rdev->wiphy, ret); 1475 1477 return ret; 1476 1478 } ··· 1478 1484 struct net_device *dev, 1479 1485 struct link_station_parameters *params) 1480 1486 { 1481 - int ret; 1482 - 1483 - if (!rdev->ops->mod_link_station) 1484 - return -EOPNOTSUPP; 1487 + int ret = -EOPNOTSUPP; 1485 1488 1486 1489 trace_rdev_mod_link_station(&rdev->wiphy, dev, params); 1487 - ret = rdev->ops->mod_link_station(&rdev->wiphy, dev, params); 1490 + if (rdev->ops->mod_link_station) 1491 + ret = rdev->ops->mod_link_station(&rdev->wiphy, dev, params); 1488 1492 trace_rdev_return_int(&rdev->wiphy, ret); 1489 1493 return ret; 1490 1494 } ··· 1492 1500 struct net_device *dev, 1493 1501 struct link_station_del_parameters *params) 1494 1502 { 1495 - int ret; 1496 - 1497 - if (!rdev->ops->del_link_station) 1498 - return -EOPNOTSUPP; 1503 + int ret = -EOPNOTSUPP; 1499 1504 1500 1505 trace_rdev_del_link_station(&rdev->wiphy, dev, params); 1501 - ret = rdev->ops->del_link_station(&rdev->wiphy, dev, params); 1506 + if (rdev->ops->del_link_station) 1507 + ret = rdev->ops->del_link_station(&rdev->wiphy, dev, params); 1502 1508 trace_rdev_return_int(&rdev->wiphy, ret); 1503 1509 return ret; 1504 1510 } ··· 1507 1517 struct cfg80211_set_hw_timestamp *hwts) 1508 1518 { 1509 1519 struct wiphy *wiphy = &rdev->wiphy; 1510 - int ret; 1511 - 1512 - if (!rdev->ops->set_hw_timestamp) 1513 - return -EOPNOTSUPP; 1520 + int ret = -EOPNOTSUPP; 1514 1521 1515 1522 trace_rdev_set_hw_timestamp(wiphy, dev, hwts); 1516 - ret = rdev->ops->set_hw_timestamp(wiphy, dev, hwts); 1523 + if (rdev->ops->set_hw_timestamp) 1524 + ret = rdev->ops->set_hw_timestamp(wiphy, dev, hwts); 1517 1525 trace_rdev_return_int(wiphy, ret); 1518 1526 1519 1527 return ret; ··· 1523 1535 struct cfg80211_ttlm_params *params) 1524 1536 { 1525 1537 struct wiphy *wiphy = &rdev->wiphy; 1526 - int ret; 1527 - 1528 - if (!rdev->ops->set_ttlm) 1529 - return -EOPNOTSUPP; 1538 + int ret = -EOPNOTSUPP; 1530 1539 1531 1540 trace_rdev_set_ttlm(wiphy, dev, params); 1532 - ret = rdev->ops->set_ttlm(wiphy, dev, params); 1541 + if (rdev->ops->set_ttlm) 1542 + ret = rdev->ops->set_ttlm(wiphy, dev, params); 1533 1543 trace_rdev_return_int(wiphy, ret); 1534 1544 1535 1545 return ret;