igb: Store the MAC address in the name in the PTP struct.
authorMatthew Vick <matthew.vick@intel.com>
Fri, 10 Aug 2012 05:40:46 +0000 (05:40 +0000)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Mon, 17 Sep 2012 09:04:20 +0000 (02:04 -0700)
Change the name of the adapter in the PTP struct to enable easier
correlation between interface and PTP device.

Cc: Richard Cochran <richardcochran@gmail.com>
Signed-off-by: Matthew Vick <matthew.vick@intel.com>
Acked-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Jeff Pieper <jeffrey.e.pieper@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ethernet/intel/igb/igb_ptp.c

index 34e0d698cbb45797ec5c5b18f687fa6f39b9d9c0..e69555f1f73eff084a372f3146547bc220d74d2c 100644 (file)
@@ -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;