]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
sfc: Do not use MAC address as clock name
authorBen Hutchings <bhutchings@solarflare.com>
Wed, 16 Oct 2013 17:32:39 +0000 (18:32 +0100)
committerBen Hutchings <bhutchings@solarflare.com>
Thu, 12 Dec 2013 22:07:04 +0000 (22:07 +0000)
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>
drivers/net/ethernet/sfc/ptp.c

index aa4876edaac60b3d7d5d527f0b8d57a69b7fc01e..5b434597ac6359b80aed3730f911f9f36b9610f0 100644 (file)
@@ -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;