RE: [net-next-2.6 04/24] e1000: convert to set_phys_id

[Jeff Kirsher <jeffrey.t.kirsher@intel.com>]

[-- Attachment #1: Type: text/plain, Size: 3063 bytes --]

On Wed, 2011-04-13 at 18:12 -0700, Allan, Bruce W wrote:
> >-----Original Message-----
> >From:
> netdev-owner@vger.kernel.org [mailto:netdev-owner@vger.kernel.org] On
> >Behalf Of Jeff Kirsher
> >Sent: Wednesday, April 13, 2011 6:02 PM
> >To: davem@davemloft.net
> >Cc: stephen hemminger; netdev@vger.kernel.org; gospo@redhat.com;
> >bphilips@novell.com; Kirsher, Jeffrey T
> >Subject: [net-next-2.6 04/24] e1000: convert to set_phys_id
> >
> >From: stephen hemminger <shemminger@vyatta.com>
> >
> >Convert to new LED control infrastucture and remove no longer
> >necessary bits.
> >
> >Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
> >Tested-by: Aaron Brown <aaron.f.brown@intel.com>
> >Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> >---
> > drivers/net/e1000/e1000.h         |    3 --
> > drivers/net/e1000/e1000_ethtool.c |   50
> ++++++++++++-------------------------
> > 2 files changed, 16 insertions(+), 37 deletions(-)
> >
> >diff --git a/drivers/net/e1000/e1000.h b/drivers/net/e1000/e1000.h
> >index a881dd0..f96475c 100644
> >--- a/drivers/net/e1000/e1000.h
> >+++ b/drivers/net/e1000/e1000.h
> >@@ -238,9 +238,6 @@ struct e1000_adapter {
> >       struct work_struct reset_task;
> >       u8 fc_autoneg;
> >
> >-      struct timer_list blink_timer;
> >-      unsigned long led_status;
> >-
> >       /* TX */
> >       struct e1000_tx_ring *tx_ring;      /* One per active queue */
> >       unsigned int restart_queue;
> >diff --git a/drivers/net/e1000/e1000_ethtool.c
> >b/drivers/net/e1000/e1000_ethtool.c
> >index dd70738..5c998a9 100644
> >--- a/drivers/net/e1000/e1000_ethtool.c
> >+++ b/drivers/net/e1000/e1000_ethtool.c
> >@@ -1753,46 +1753,28 @@ static int e1000_set_wol(struct net_device
> *netdev,
> >struct ethtool_wolinfo *wol)
> >       return 0;
> > }
> >
> >-/* toggle LED 4 times per second = 2 "blinks" per second */
> >-#define E1000_ID_INTERVAL     (HZ/4)
> >-
> >-/* bit defines for adapter->led_status */
> >-#define E1000_LED_ON          0
> >-
> >-static void e1000_led_blink_callback(unsigned long data)
> >+static int e1000_set_phys_id(struct net_device *netdev,
> >+                           enum ethtool_phys_id_state state)
> > {
> >-      struct e1000_adapter *adapter = (struct e1000_adapter *) data;
> >+      struct e1000_adapter *adapter = netdev_priv(netdev);
> >       struct e1000_hw *hw = &adapter->hw;
> >
> >-      if (test_and_change_bit(E1000_LED_ON, &adapter->led_status))
> >-              e1000_led_off(hw);
> >-      else
> >-              e1000_led_on(hw);
> >-
> >-      mod_timer(&adapter->blink_timer, jiffies + E1000_ID_INTERVAL);
> >-}
> >+      switch (state) {
> >+      case ETHTOOL_ID_ACTIVE:
> >+              e1000_setup_led(hw);
> >+              return -EINVAL;
> 
> This conflicts with the patch I submitted a few hours ago - with it,
> this
> feature is broken for e1000.

Dave - I will remove this patch from my tree and send you an updated
pull request when my tree is updated.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 490 bytes --]