summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Hutchings <bhutchings@solarflare.com>2013-10-16 21:32:39 +0400
committerBen Hutchings <bhutchings@solarflare.com>2013-12-13 02:07:04 +0400
commitc1dbdea98d9b32090d5d3e575d60464eb68616d1 (patch)
tree6f5ebdff99d5152ea999e44d5f1c57b54147e112
parent8349f7f610263a2b469feb0eb07583ad0742e7ba (diff)
downloadlinux-c1dbdea98d9b32090d5d3e575d60464eb68616d1.tar.xz
sfc: Do not use MAC address as clock name
We'll be sharing clocks between multiple functions with their own MAC addresses. The name field is now documented as 'A short "friendly name" to identify the clock ...' and '... not meant to be a unique id.' So use the name 'sfc'. Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
-rw-r--r--drivers/net/ethernet/sfc/ptp.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/ethernet/sfc/ptp.c b/drivers/net/ethernet/sfc/ptp.c
index aa4876edaac6..5b434597ac63 100644
--- a/drivers/net/ethernet/sfc/ptp.c
+++ b/drivers/net/ethernet/sfc/ptp.c
@@ -965,9 +965,8 @@ int efx_ptp_probe(struct efx_nic *efx, struct efx_channel *channel)
ptp->evt_overflow = false;
ptp->phc_clock_info.owner = THIS_MODULE;
- snprintf(ptp->phc_clock_info.name,
- sizeof(ptp->phc_clock_info.name),
- "%pm", efx->net_dev->perm_addr);
+ strlcpy(ptp->phc_clock_info.name, "sfc",
+ sizeof(ptp->phc_clock_info.name));
ptp->phc_clock_info.max_adj = MAX_PPB;
ptp->phc_clock_info.n_alarm = 0;
ptp->phc_clock_info.n_ext_ts = 0;