diff options
| author | Nicolas Pitre | 2016-09-21 01:25:58 +0200 |
|---|---|---|
| committer | David S. Miller | 2016-09-22 08:18:33 +0200 |
| commit | efee95f42b5dddedcaff0a0eaa44e170fc7522e8 (patch) | |
| tree | e5d83b374d57e1bced53af0345db98f0f6cd4373 /drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c | |
| parent | net: ethernet: hisilicon: hns: use new api ethtool_{get|set}_link_ksettings (diff) | |
| download | kernel-qcow2-linux-efee95f42b5dddedcaff0a0eaa44e170fc7522e8.tar.gz kernel-qcow2-linux-efee95f42b5dddedcaff0a0eaa44e170fc7522e8.tar.xz kernel-qcow2-linux-efee95f42b5dddedcaff0a0eaa44e170fc7522e8.zip | |
ptp_clock: future-proofing drivers against PTP subsystem becoming optional
Drivers must be ready to accept NULL from ptp_clock_register() if the
PTP clock subsystem is configured out.
This patch documents that and ensures that all drivers cope well
with a NULL return.
Signed-off-by: Nicolas Pitre <nico@linaro.org>
Reviewed-by: Eugenia Emantayev <eugenia@mellanox.com>
Acked-by: Richard Cochran <richardcochran@gmail.com>
Acked-by: Edward Cree <ecree@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c')
| -rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c index e5431bfe3339..a92277683a64 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c @@ -1254,7 +1254,7 @@ static long ixgbe_ptp_create_clock(struct ixgbe_adapter *adapter) adapter->ptp_clock = NULL; e_dev_err("ptp_clock_register failed\n"); return err; - } else + } else if (adapter->ptp_clock) e_dev_info("registered PHC device on %s\n", netdev->name); /* set default timestamp mode to disabled here. We do this in |