1 files changed, 19 insertions, 15 deletions

diff --git a/drivers/net/niu.c b/drivers/net/niu.c
index 32678b6c6b39..9e6330bc0531 100644
--- a/drivers/net/niu.c
+++ b/drivers/net/niu.c
@@ -6071,8 +6071,7 @@ static int niu_request_irq(struct niu *np)
         for (i = 0; i < np->num_ldg; i++) {
                 struct niu_ldg *lp = &np->ldg[i];
 
-                err = request_irq(lp->irq, niu_interrupt,
-                                  IRQF_SHARED | IRQF_SAMPLE_RANDOM,
+                err = request_irq(lp->irq, niu_interrupt, IRQF_SHARED,
                                   np->irq_name[i], lp);
                 if (err)
                         goto out_free_irqs;
@@ -7023,6 +7022,7 @@ static int niu_ethflow_to_class(int flow_type, u64 *class)
         case UDP_V4_FLOW:
                 *class = CLASS_CODE_UDP_IPV4;
                 break;
+        case AH_ESP_V4_FLOW:
         case AH_V4_FLOW:
         case ESP_V4_FLOW:
                 *class = CLASS_CODE_AH_ESP_IPV4;
@@ -7036,6 +7036,7 @@ static int niu_ethflow_to_class(int flow_type, u64 *class)
         case UDP_V6_FLOW:
                 *class = CLASS_CODE_UDP_IPV6;
                 break;
+        case AH_ESP_V6_FLOW:
         case AH_V6_FLOW:
         case ESP_V6_FLOW:
                 *class = CLASS_CODE_AH_ESP_IPV6;
@@ -7889,28 +7890,31 @@ static void niu_force_led(struct niu *np, int on)
         nw64_mac(reg, val);
 }
 
-static int niu_phys_id(struct net_device *dev, u32 data)
+static int niu_set_phys_id(struct net_device *dev,
+                           enum ethtool_phys_id_state state)
+
 {
         struct niu *np = netdev_priv(dev);
-        u64 orig_led_state;
-        int i;
 
         if (!netif_running(dev))
                 return -EAGAIN;
 
-        if (data == 0)
-                data = 2;
+        switch (state) {
+        case ETHTOOL_ID_ACTIVE:
+                np->orig_led_state = niu_led_state_save(np);
+                return -EINVAL;
 
-        orig_led_state = niu_led_state_save(np);
-        for (i = 0; i < (data * 2); i++) {
-                int on = ((i % 2) == 0);
+        case ETHTOOL_ID_ON:
+                niu_force_led(np, 1);
+                break;
 
-                niu_force_led(np, on);
+        case ETHTOOL_ID_OFF:
+                niu_force_led(np, 0);
+                break;
 
-                if (msleep_interruptible(500))
-                        break;
+        case ETHTOOL_ID_INACTIVE:
+                niu_led_state_restore(np, np->orig_led_state);
         }
-        niu_led_state_restore(np, orig_led_state);
 
         return 0;
 }
@@ -7933,7 +7937,7 @@ static const struct ethtool_ops niu_ethtool_ops = {
         .get_strings            = niu_get_strings,
         .get_sset_count         = niu_get_sset_count,
         .get_ethtool_stats      = niu_get_ethtool_stats,
-        .phys_id                = niu_phys_id,
+        .set_phys_id            = niu_set_phys_id,
         .get_rxnfc              = niu_get_nfc,
         .set_rxnfc              = niu_set_nfc,
         .set_flags              = niu_set_flags,