benet: convert to set_phys_id

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/benet/be.h b/drivers/net/benet/be.h
index 3937bca3d4314c0c7e141c4d4d6b58696e0e00a4..0899d91222780ad2504708c6d01deaa4c2b0d6a5 100644 (file)
--- a/drivers/net/benet/be.h
+++ b/drivers/net/benet/be.h
@@ -313,6 +313,7 @@ struct be_adapter {
        char fw_ver[FW_VER_LEN];
        u32 if_handle;          /* Used to configure filtering */
        u32 pmac_id;            /* MAC addr handle used by BE card */
+       u32 beacon_state;       /* for set_phys_id */
 
        bool eeh_err;
        bool link_up;

diff --git a/drivers/net/benet/be_ethtool.c b/drivers/net/benet/be_ethtool.c
index 575ac659ceb40d7342572dad5e58fdd37fc760a6..a665697df824f5544fb826b6c8996111359cc5f0 100644 (file)
--- a/drivers/net/benet/be_ethtool.c
+++ b/drivers/net/benet/be_ethtool.c
@@ -526,29 +526,33 @@ be_set_pauseparam(struct net_device *netdev, struct ethtool_pauseparam *ecmd)
 }
 
 static int
-be_phys_id(struct net_device *netdev, u32 data)
+be_set_phys_id(struct net_device *netdev,
+              enum ethtool_phys_id_state state)
 {
        struct be_adapter *adapter = netdev_priv(netdev);
-       int status;
-       u32 cur;
-
-       be_cmd_get_beacon_state(adapter, adapter->hba_port_num, &cur);
 
-       if (cur == BEACON_STATE_ENABLED)
-               return 0;
+       switch (state) {
+       case ETHTOOL_ID_ACTIVE:
+               be_cmd_get_beacon_state(adapter, adapter->hba_port_num,
+                                       &adapter->beacon_state);
+               return -EINVAL;
 
-       if (data < 2)
-               data = 2;
+       case ETHTOOL_ID_ON:
+               be_cmd_set_beacon_state(adapter, adapter->hba_port_num, 0, 0,
+                                       BEACON_STATE_ENABLED);
+               break;
 
-       status = be_cmd_set_beacon_state(adapter, adapter->hba_port_num, 0, 0,
-                       BEACON_STATE_ENABLED);
-       set_current_state(TASK_INTERRUPTIBLE);
-       schedule_timeout(data*HZ);
+       case ETHTOOL_ID_OFF:
+               be_cmd_set_beacon_state(adapter, adapter->hba_port_num, 0, 0,
+                                       BEACON_STATE_DISABLED);
+               break;
 
-       status = be_cmd_set_beacon_state(adapter, adapter->hba_port_num, 0, 0,
-                       BEACON_STATE_DISABLED);
+       case ETHTOOL_ID_INACTIVE:
+               be_cmd_set_beacon_state(adapter, adapter->hba_port_num, 0, 0,
+                                       adapter->beacon_state);
+       }
 
-       return status;
+       return 0;
 }
 
 static bool
@@ -753,7 +757,7 @@ const struct ethtool_ops be_ethtool_ops = {
        .get_tso = ethtool_op_get_tso,
        .set_tso = ethtool_op_set_tso,
        .get_strings = be_get_stat_strings,
-       .phys_id = be_phys_id,
+       .set_phys_id = be_set_phys_id,
        .get_sset_count = be_get_sset_count,
        .get_ethtool_stats = be_get_ethtool_stats,
        .get_regs_len = be_get_reg_len,