be2net: add rxhash support
[deliverable/linux.git] / drivers / net / benet / be_ethtool.c
index aac248fbd18b6ebe06c8686e94c2d39670ca94be..1565c81ff96ca9261d4649142fa1a7b83c4df10c 100644 (file)
@@ -155,6 +155,25 @@ be_get_drvinfo(struct net_device *netdev, struct ethtool_drvinfo *drvinfo)
        drvinfo->eedump_len = 0;
 }
 
+static int
+be_get_reg_len(struct net_device *netdev)
+{
+       struct be_adapter *adapter = netdev_priv(netdev);
+       u32 log_size = 0;
+
+       be_cmd_get_reg_len(adapter, &log_size);
+       return log_size;
+}
+
+static void
+be_get_regs(struct net_device *netdev, struct ethtool_regs *regs, void *buf)
+{
+       struct be_adapter *adapter = netdev_priv(netdev);
+
+       memset(buf, 0, regs->len);
+       be_cmd_get_regs(adapter, regs->len, buf);
+}
+
 static int
 be_get_coalesce(struct net_device *netdev, struct ethtool_coalesce *coalesce)
 {
@@ -507,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
@@ -712,6 +735,18 @@ be_read_eeprom(struct net_device *netdev, struct ethtool_eeprom *eeprom,
        return status;
 }
 
+static int be_set_flags(struct net_device *netdev, u32 data)
+{
+       struct be_adapter *adapter = netdev_priv(netdev);
+       int rc = -1;
+
+       if (be_multi_rxq(adapter))
+               rc = ethtool_op_set_flags(netdev, data, ETH_FLAG_RXHASH |
+                               ETH_FLAG_TXVLAN | ETH_FLAG_RXVLAN);
+
+       return rc;
+}
+
 const struct ethtool_ops be_ethtool_ops = {
        .get_settings = be_get_settings,
        .get_drvinfo = be_get_drvinfo,
@@ -734,9 +769,12 @@ 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,
+       .get_regs = be_get_regs,
        .flash_device = be_do_flash,
        .self_test = be_self_test,
+       .set_flags = be_set_flags,
 };
This page took 0.025497 seconds and 5 git commands to generate.