lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Mon, 17 Sep 2012 02:21:47 -0700 From: Jeff Kirsher <jeffrey.t.kirsher@...el.com> To: davem@...emloft.net Cc: Matthew Vick <matthew.vick@...el.com>, netdev@...r.kernel.org, gospo@...hat.com, sassmann@...hat.com, Richard Cochran <richardcochran@...il.com>, Jeff Kirsher <jeffrey.t.kirsher@...el.com> Subject: [net-next 4/6] igb: Store the MAC address in the name in the PTP struct. From: Matthew Vick <matthew.vick@...el.com> Change the name of the adapter in the PTP struct to enable easier correlation between interface and PTP device. Cc: Richard Cochran <richardcochran@...il.com> Signed-off-by: Matthew Vick <matthew.vick@...el.com> Acked-by: Jacob Keller <jacob.e.keller@...el.com> Tested-by: Jeff Pieper <jeffrey.e.pieper@...el.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@...el.com> --- drivers/net/ethernet/intel/igb/igb_ptp.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/intel/igb/igb_ptp.c b/drivers/net/ethernet/intel/igb/igb_ptp.c index 34e0d69..e69555f 100644 --- a/drivers/net/ethernet/intel/igb/igb_ptp.c +++ b/drivers/net/ethernet/intel/igb/igb_ptp.c @@ -547,14 +547,15 @@ int igb_ptp_hwtstamp_ioctl(struct net_device *netdev, void igb_ptp_init(struct igb_adapter *adapter) { struct e1000_hw *hw = &adapter->hw; + struct net_device *netdev = adapter->netdev; switch (hw->mac.type) { case e1000_i210: case e1000_i211: case e1000_i350: case e1000_82580: + snprintf(adapter->ptp_caps.name, 16, "%pm", netdev->dev_addr); adapter->ptp_caps.owner = THIS_MODULE; - strcpy(adapter->ptp_caps.name, "igb-82580"); adapter->ptp_caps.max_adj = 62499999; adapter->ptp_caps.n_ext_ts = 0; adapter->ptp_caps.pps = 0; @@ -570,10 +571,9 @@ void igb_ptp_init(struct igb_adapter *adapter) /* Enable the timer functions by clearing bit 31. */ wr32(E1000_TSAUXC, 0x0); break; - case e1000_82576: + snprintf(adapter->ptp_caps.name, 16, "%pm", netdev->dev_addr); adapter->ptp_caps.owner = THIS_MODULE; - strcpy(adapter->ptp_caps.name, "igb-82576"); adapter->ptp_caps.max_adj = 1000000000; adapter->ptp_caps.n_ext_ts = 0; adapter->ptp_caps.pps = 0; @@ -589,7 +589,6 @@ void igb_ptp_init(struct igb_adapter *adapter) /* Dial the nominal frequency. */ wr32(E1000_TIMINCA, INCPERIOD_82576 | INCVALUE_82576); break; - default: adapter->ptp_clock = NULL; return; -- 1.7.11.4 -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists