1 files changed, 128 insertions, 138 deletions

diff --git a/drivers/net/niu.c b/drivers/net/niu.c
index fe6983af6918..cc25bff0bd3b 100644
--- a/drivers/net/niu.c
+++ b/drivers/net/niu.c
@@ -283,7 +283,7 @@ static int niu_enable_interrupts(struct niu *np, int on)
 
 static u32 phy_encode(u32 type, int port)
 {
-        return (type << (port * 2));
+        return type << (port * 2);
 }
 
 static u32 phy_decode(u32 val, int port)
@@ -1233,7 +1233,7 @@ static int link_status_1g_rgmii(struct niu *np, int *link_up_p)
 
         bmsr = err;
         if (bmsr & BMSR_LSTATUS) {
-                u16 adv, lpa, common, estat;
+                u16 adv, lpa;
 
                 err = mii_read(np, np->phy_addr, MII_ADVERTISE);
                 if (err < 0)
@@ -1245,12 +1245,9 @@ static int link_status_1g_rgmii(struct niu *np, int *link_up_p)
                         goto out;
                 lpa = err;
 
-                common = adv & lpa;
-
                 err = mii_read(np, np->phy_addr, MII_ESTATUS);
                 if (err < 0)
                         goto out;
-                estat = err;
                 link_up = 1;
                 current_speed = SPEED_1000;
                 current_duplex = DUPLEX_FULL;
@@ -1650,7 +1647,7 @@ static int xcvr_init_10g(struct niu *np)
                 break;
         }
 
-        return 0;
+        return err;
 }
 
 static int mii_reset(struct niu *np)
@@ -2381,17 +2378,14 @@ static int serdes_init_10g_serdes(struct niu *np)
         struct niu_link_config *lp = &np->link_config;
         unsigned long ctrl_reg, test_cfg_reg, pll_cfg, i;
         u64 ctrl_val, test_cfg_val, sig, mask, val;
-        u64 reset_val;
 
         switch (np->port) {
         case 0:
-                reset_val =  ENET_SERDES_RESET_0;
                 ctrl_reg = ENET_SERDES_0_CTRL_CFG;
                 test_cfg_reg = ENET_SERDES_0_TEST_CFG;
                 pll_cfg = ENET_SERDES_0_PLL_CFG;
                 break;
         case 1:
-                reset_val =  ENET_SERDES_RESET_1;
                 ctrl_reg = ENET_SERDES_1_CTRL_CFG;
                 test_cfg_reg = ENET_SERDES_1_TEST_CFG;
                 pll_cfg = ENET_SERDES_1_PLL_CFG;
@@ -3043,8 +3037,7 @@ static int tcam_flush_all(struct niu *np)
 
 static u64 hash_addr_regval(unsigned long index, unsigned long num_entries)
 {
-        return ((u64)index | (num_entries == 1 ?
-                              HASH_TBL_ADDR_AUTOINC : 0));
+        return (u64)index | (num_entries == 1 ? HASH_TBL_ADDR_AUTOINC : 0);
 }
 
 #if 0
@@ -3276,7 +3269,7 @@ static u16 tcam_get_index(struct niu *np, u16 idx)
         /* One entry reserved for IP fragment rule */
         if (idx >= (np->clas.tcam_sz - 1))
                 idx = 0;
-        return (np->clas.tcam_top + ((idx+1) * np->parent->num_ports));
+        return np->clas.tcam_top + ((idx+1) * np->parent->num_ports);
 }
 
 static u16 tcam_get_size(struct niu *np)
@@ -3313,7 +3306,7 @@ static unsigned int niu_hash_rxaddr(struct rx_ring_info *rp, u64 a)
         a >>= PAGE_SHIFT;
         a ^= (a >> ilog2(MAX_RBR_RING_SIZE));
 
-        return (a & (MAX_RBR_RING_SIZE - 1));
+        return a & (MAX_RBR_RING_SIZE - 1);
 }
 
 static struct page *niu_find_rxpage(struct rx_ring_info *rp, u64 addr,
@@ -3484,7 +3477,7 @@ static int niu_process_rx_pkt(struct napi_struct *napi, struct niu *np,
                                      RCR_ENTRY_ERROR)))
                                 skb->ip_summed = CHECKSUM_UNNECESSARY;
                         else
-                                skb->ip_summed = CHECKSUM_NONE;
+                                skb_checksum_none_assert(skb);
                 } else if (!(val & RCR_ENTRY_MULTI))
                         append_size = len - skb->len;
 
@@ -4490,6 +4483,9 @@ static int niu_alloc_channels(struct niu *np)
 {
         struct niu_parent *parent = np->parent;
         int first_rx_channel, first_tx_channel;
+        int num_rx_rings, num_tx_rings;
+        struct rx_ring_info *rx_rings;
+        struct tx_ring_info *tx_rings;
         int i, port, err;
 
         port = np->port;
@@ -4499,17 +4495,21 @@ static int niu_alloc_channels(struct niu *np)
                 first_tx_channel += parent->txchan_per_port[i];
         }
 
-        np->num_rx_rings = parent->rxchan_per_port[port];
-        np->num_tx_rings = parent->txchan_per_port[port];
+        num_rx_rings = parent->rxchan_per_port[port];
+        num_tx_rings = parent->txchan_per_port[port];
 
-        np->dev->real_num_tx_queues = np->num_tx_rings;
-
-        np->rx_rings = kzalloc(np->num_rx_rings * sizeof(struct rx_ring_info),
-                               GFP_KERNEL);
+        rx_rings = kcalloc(num_rx_rings, sizeof(struct rx_ring_info),
+                           GFP_KERNEL);
         err = -ENOMEM;
-        if (!np->rx_rings)
+        if (!rx_rings)
                 goto out_err;
 
+        np->num_rx_rings = num_rx_rings;
+        smp_wmb();
+        np->rx_rings = rx_rings;
+
+        netif_set_real_num_rx_queues(np->dev, num_rx_rings);
+
         for (i = 0; i < np->num_rx_rings; i++) {
                 struct rx_ring_info *rp = &np->rx_rings[i];
 
@@ -4538,12 +4538,18 @@ static int niu_alloc_channels(struct niu *np)
                         return err;
         }
 
-        np->tx_rings = kzalloc(np->num_tx_rings * sizeof(struct tx_ring_info),
-                               GFP_KERNEL);
+        tx_rings = kcalloc(num_tx_rings, sizeof(struct tx_ring_info),
+                           GFP_KERNEL);
         err = -ENOMEM;
-        if (!np->tx_rings)
+        if (!tx_rings)
                 goto out_err;
 
+        np->num_tx_rings = num_tx_rings;
+        smp_wmb();
+        np->tx_rings = tx_rings;
+
+        netif_set_real_num_tx_queues(np->dev, num_tx_rings);
+
         for (i = 0; i < np->num_tx_rings; i++) {
                 struct tx_ring_info *rp = &np->tx_rings[i];
 
@@ -6059,8 +6065,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;
@@ -6246,11 +6251,17 @@ static void niu_sync_mac_stats(struct niu *np)
 static void niu_get_rx_stats(struct niu *np)
 {
         unsigned long pkts, dropped, errors, bytes;
+        struct rx_ring_info *rx_rings;
         int i;
 
         pkts = dropped = errors = bytes = 0;
+
+        rx_rings = ACCESS_ONCE(np->rx_rings);
+        if (!rx_rings)
+                goto no_rings;
+
         for (i = 0; i < np->num_rx_rings; i++) {
-                struct rx_ring_info *rp = &np->rx_rings[i];
+                struct rx_ring_info *rp = &rx_rings[i];
 
                 niu_sync_rx_discard_stats(np, rp, 0);
 
@@ -6259,6 +6270,8 @@ static void niu_get_rx_stats(struct niu *np)
                 dropped += rp->rx_dropped;
                 errors += rp->rx_errors;
         }
+
+no_rings:
         np->dev->stats.rx_packets = pkts;
         np->dev->stats.rx_bytes = bytes;
         np->dev->stats.rx_dropped = dropped;
@@ -6268,16 +6281,24 @@ static void niu_get_rx_stats(struct niu *np)
 static void niu_get_tx_stats(struct niu *np)
 {
         unsigned long pkts, errors, bytes;
+        struct tx_ring_info *tx_rings;
         int i;
 
         pkts = errors = bytes = 0;
+
+        tx_rings = ACCESS_ONCE(np->tx_rings);
+        if (!tx_rings)
+                goto no_rings;
+
         for (i = 0; i < np->num_tx_rings; i++) {
-                struct tx_ring_info *rp = &np->tx_rings[i];
+                struct tx_ring_info *rp = &tx_rings[i];
 
                 pkts += rp->tx_packets;
                 bytes += rp->tx_bytes;
                 errors += rp->tx_errors;
         }
+
+no_rings:
         np->dev->stats.tx_packets = pkts;
         np->dev->stats.tx_bytes = bytes;
         np->dev->stats.tx_errors = errors;
@@ -6287,9 +6308,10 @@ static struct net_device_stats *niu_get_stats(struct net_device *dev)
 {
         struct niu *np = netdev_priv(dev);
 
-        niu_get_rx_stats(np);
-        niu_get_tx_stats(np);
-
+        if (netif_running(dev)) {
+                niu_get_rx_stats(np);
+                niu_get_tx_stats(np);
+        }
         return &dev->stats;
 }
 
@@ -6589,7 +6611,7 @@ static u64 niu_compute_tx_flags(struct sk_buff *skb, struct ethhdr *ehdr,
                              (ip_proto == IPPROTO_UDP ?
                               TXHDR_CSUM_UDP : TXHDR_CSUM_SCTP));
 
-                start = skb_transport_offset(skb) -
+                start = skb_checksum_start_offset(skb) -
                         (pad_bytes + sizeof(struct tx_pkt_hdr));
                 stuff = start + skb->csum_offset;
 
@@ -6822,7 +6844,7 @@ static int niu_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
         cmd->supported = lp->supported;
         cmd->advertising = lp->active_advertising;
         cmd->autoneg = lp->active_autoneg;
-        cmd->speed = lp->active_speed;
+        ethtool_cmd_speed_set(cmd, lp->active_speed);
         cmd->duplex = lp->active_duplex;
         cmd->port = (np->flags & NIU_FLAGS_FIBER) ? PORT_FIBRE : PORT_TP;
         cmd->transceiver = (np->flags & NIU_FLAGS_XCVR_SERDES) ?
@@ -6837,7 +6859,7 @@ static int niu_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
         struct niu_link_config *lp = &np->link_config;
 
         lp->advertising = cmd->advertising;
-        lp->speed = cmd->speed;
+        lp->speed = ethtool_cmd_speed(cmd);
         lp->duplex = cmd->duplex;
         lp->autoneg = cmd->autoneg;
         return niu_init_link(np);
@@ -6994,6 +7016,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;
@@ -7007,6 +7030,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;
@@ -7090,24 +7114,20 @@ static int niu_get_hash_opts(struct niu *np, struct ethtool_rxnfc *nfc)
 static void niu_get_ip4fs_from_tcam_key(struct niu_tcam_entry *tp,
                                         struct ethtool_rx_flow_spec *fsp)
 {
+        u32 tmp;
+        u16 prt;
+
+        tmp = (tp->key[3] & TCAM_V4KEY3_SADDR) >> TCAM_V4KEY3_SADDR_SHIFT;
+        fsp->h_u.tcp_ip4_spec.ip4src = cpu_to_be32(tmp);
+
+        tmp = (tp->key[3] & TCAM_V4KEY3_DADDR) >> TCAM_V4KEY3_DADDR_SHIFT;
+        fsp->h_u.tcp_ip4_spec.ip4dst = cpu_to_be32(tmp);
+
+        tmp = (tp->key_mask[3] & TCAM_V4KEY3_SADDR) >> TCAM_V4KEY3_SADDR_SHIFT;
+        fsp->m_u.tcp_ip4_spec.ip4src = cpu_to_be32(tmp);
 
-        fsp->h_u.tcp_ip4_spec.ip4src = (tp->key[3] & TCAM_V4KEY3_SADDR) >>
-                TCAM_V4KEY3_SADDR_SHIFT;
-        fsp->h_u.tcp_ip4_spec.ip4dst = (tp->key[3] & TCAM_V4KEY3_DADDR) >>
-                TCAM_V4KEY3_DADDR_SHIFT;
-        fsp->m_u.tcp_ip4_spec.ip4src = (tp->key_mask[3] & TCAM_V4KEY3_SADDR) >>
-                TCAM_V4KEY3_SADDR_SHIFT;
-        fsp->m_u.tcp_ip4_spec.ip4dst = (tp->key_mask[3] & TCAM_V4KEY3_DADDR) >>
-                TCAM_V4KEY3_DADDR_SHIFT;
-
-        fsp->h_u.tcp_ip4_spec.ip4src =
-                cpu_to_be32(fsp->h_u.tcp_ip4_spec.ip4src);
-        fsp->m_u.tcp_ip4_spec.ip4src =
-                cpu_to_be32(fsp->m_u.tcp_ip4_spec.ip4src);
-        fsp->h_u.tcp_ip4_spec.ip4dst =
-                cpu_to_be32(fsp->h_u.tcp_ip4_spec.ip4dst);
-        fsp->m_u.tcp_ip4_spec.ip4dst =
-                cpu_to_be32(fsp->m_u.tcp_ip4_spec.ip4dst);
+        tmp = (tp->key_mask[3] & TCAM_V4KEY3_DADDR) >> TCAM_V4KEY3_DADDR_SHIFT;
+        fsp->m_u.tcp_ip4_spec.ip4dst = cpu_to_be32(tmp);
 
         fsp->h_u.tcp_ip4_spec.tos = (tp->key[2] & TCAM_V4KEY2_TOS) >>
                 TCAM_V4KEY2_TOS_SHIFT;
@@ -7118,54 +7138,40 @@ static void niu_get_ip4fs_from_tcam_key(struct niu_tcam_entry *tp,
         case TCP_V4_FLOW:
         case UDP_V4_FLOW:
         case SCTP_V4_FLOW:
-                fsp->h_u.tcp_ip4_spec.psrc =
-                        ((tp->key[2] & TCAM_V4KEY2_PORT_SPI) >>
-                         TCAM_V4KEY2_PORT_SPI_SHIFT) >> 16;
-                fsp->h_u.tcp_ip4_spec.pdst =
-                        ((tp->key[2] & TCAM_V4KEY2_PORT_SPI) >>
-                         TCAM_V4KEY2_PORT_SPI_SHIFT) & 0xffff;
-                fsp->m_u.tcp_ip4_spec.psrc =
-                        ((tp->key_mask[2] & TCAM_V4KEY2_PORT_SPI) >>
-                         TCAM_V4KEY2_PORT_SPI_SHIFT) >> 16;
-                fsp->m_u.tcp_ip4_spec.pdst =
-                        ((tp->key_mask[2] & TCAM_V4KEY2_PORT_SPI) >>
-                         TCAM_V4KEY2_PORT_SPI_SHIFT) & 0xffff;
+                prt = ((tp->key[2] & TCAM_V4KEY2_PORT_SPI) >>
+                        TCAM_V4KEY2_PORT_SPI_SHIFT) >> 16;
+                fsp->h_u.tcp_ip4_spec.psrc = cpu_to_be16(prt);
+
+                prt = ((tp->key[2] & TCAM_V4KEY2_PORT_SPI) >>
+                        TCAM_V4KEY2_PORT_SPI_SHIFT) & 0xffff;
+                fsp->h_u.tcp_ip4_spec.pdst = cpu_to_be16(prt);
 
-                fsp->h_u.tcp_ip4_spec.psrc =
-                        cpu_to_be16(fsp->h_u.tcp_ip4_spec.psrc);
-                fsp->h_u.tcp_ip4_spec.pdst =
-                        cpu_to_be16(fsp->h_u.tcp_ip4_spec.pdst);
-                fsp->m_u.tcp_ip4_spec.psrc =
-                        cpu_to_be16(fsp->m_u.tcp_ip4_spec.psrc);
-                fsp->m_u.tcp_ip4_spec.pdst =
-                        cpu_to_be16(fsp->m_u.tcp_ip4_spec.pdst);
+                prt = ((tp->key_mask[2] & TCAM_V4KEY2_PORT_SPI) >>
+                        TCAM_V4KEY2_PORT_SPI_SHIFT) >> 16;
+                fsp->m_u.tcp_ip4_spec.psrc = cpu_to_be16(prt);
+
+                prt = ((tp->key_mask[2] & TCAM_V4KEY2_PORT_SPI) >>
+                         TCAM_V4KEY2_PORT_SPI_SHIFT) & 0xffff;
+                fsp->m_u.tcp_ip4_spec.pdst = cpu_to_be16(prt);
                 break;
         case AH_V4_FLOW:
         case ESP_V4_FLOW:
-                fsp->h_u.ah_ip4_spec.spi =
-                        (tp->key[2] & TCAM_V4KEY2_PORT_SPI) >>
-                        TCAM_V4KEY2_PORT_SPI_SHIFT;
-                fsp->m_u.ah_ip4_spec.spi =
-                        (tp->key_mask[2] & TCAM_V4KEY2_PORT_SPI) >>
+                tmp = (tp->key[2] & TCAM_V4KEY2_PORT_SPI) >>
                         TCAM_V4KEY2_PORT_SPI_SHIFT;
+                fsp->h_u.ah_ip4_spec.spi = cpu_to_be32(tmp);
 
-                fsp->h_u.ah_ip4_spec.spi =
-                        cpu_to_be32(fsp->h_u.ah_ip4_spec.spi);
-                fsp->m_u.ah_ip4_spec.spi =
-                        cpu_to_be32(fsp->m_u.ah_ip4_spec.spi);
+                tmp = (tp->key_mask[2] & TCAM_V4KEY2_PORT_SPI) >>
+                        TCAM_V4KEY2_PORT_SPI_SHIFT;
+                fsp->m_u.ah_ip4_spec.spi = cpu_to_be32(tmp);
                 break;
         case IP_USER_FLOW:
-                fsp->h_u.usr_ip4_spec.l4_4_bytes =
-                        (tp->key[2] & TCAM_V4KEY2_PORT_SPI) >>
-                        TCAM_V4KEY2_PORT_SPI_SHIFT;
-                fsp->m_u.usr_ip4_spec.l4_4_bytes =
-                        (tp->key_mask[2] & TCAM_V4KEY2_PORT_SPI) >>
+                tmp = (tp->key[2] & TCAM_V4KEY2_PORT_SPI) >>
                         TCAM_V4KEY2_PORT_SPI_SHIFT;
+                fsp->h_u.usr_ip4_spec.l4_4_bytes = cpu_to_be32(tmp);
 
-                fsp->h_u.usr_ip4_spec.l4_4_bytes =
-                        cpu_to_be32(fsp->h_u.usr_ip4_spec.l4_4_bytes);
-                fsp->m_u.usr_ip4_spec.l4_4_bytes =
-                        cpu_to_be32(fsp->m_u.usr_ip4_spec.l4_4_bytes);
+                tmp = (tp->key_mask[2] & TCAM_V4KEY2_PORT_SPI) >>
+                        TCAM_V4KEY2_PORT_SPI_SHIFT;
+                fsp->m_u.usr_ip4_spec.l4_4_bytes = cpu_to_be32(tmp);
 
                 fsp->h_u.usr_ip4_spec.proto =
                         (tp->key[2] & TCAM_V4KEY2_PROTO) >>
@@ -7462,10 +7468,12 @@ static int niu_add_ethtool_tcam_entry(struct niu *np,
         if (fsp->flow_type == IP_USER_FLOW) {
                 int i;
                 int add_usr_cls = 0;
-                int ipv6 = 0;
                 struct ethtool_usrip4_spec *uspec = &fsp->h_u.usr_ip4_spec;
                 struct ethtool_usrip4_spec *umask = &fsp->m_u.usr_ip4_spec;
 
+                if (uspec->ip_ver != ETH_RX_NFC_IP4)
+                        return -EINVAL;
+
                 niu_lock_parent(np, flags);
 
                 for (i = 0; i < NIU_L3_PROG_CLS; i++) {
@@ -7494,9 +7502,7 @@ static int niu_add_ethtool_tcam_entry(struct niu *np,
                                 default:
                                         break;
                                 }
-                                if (uspec->ip_ver == ETH_RX_NFC_IP6)
-                                        ipv6 = 1;
-                                ret = tcam_user_ip_class_set(np, class, ipv6,
+                                ret = tcam_user_ip_class_set(np, class, 0,
                                                              uspec->proto,
                                                              uspec->tos,
                                                              umask->tos);
@@ -7553,16 +7559,7 @@ static int niu_add_ethtool_tcam_entry(struct niu *np,
                 ret = -EINVAL;
                 goto out;
         case IP_USER_FLOW:
-                if (fsp->h_u.usr_ip4_spec.ip_ver == ETH_RX_NFC_IP4) {
-                        niu_get_tcamkey_from_ip4fs(fsp, tp, l2_rdc_table,
-                                                   class);
-                } else {
-                        /* Not yet implemented */
-                        netdev_info(np->dev, "niu%d: In %s(): usr flow for IPv6 not implemented\n",
-                                    parent->index, __func__);
-                        ret = -EINVAL;
-                        goto out;
-                }
+                niu_get_tcamkey_from_ip4fs(fsp, tp, l2_rdc_table, class);
                 break;
         default:
                 netdev_info(np->dev, "niu%d: In %s(): Unknown flow type %d\n",
@@ -7805,11 +7802,11 @@ static int niu_get_sset_count(struct net_device *dev, int stringset)
         if (stringset != ETH_SS_STATS)
                 return -EINVAL;
 
-        return ((np->flags & NIU_FLAGS_XMAC ?
+        return (np->flags & NIU_FLAGS_XMAC ?
                  NUM_XMAC_STAT_KEYS :
                  NUM_BMAC_STAT_KEYS) +
                 (np->num_rx_rings * NUM_RXCHAN_STAT_KEYS) +
-                (np->num_tx_rings * NUM_TXCHAN_STAT_KEYS));
+                (np->num_tx_rings * NUM_TXCHAN_STAT_KEYS);
 }
 
 static void niu_get_ethtool_stats(struct net_device *dev,
@@ -7887,37 +7884,35 @@ 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 1;       /* cycle on/off once per second */
 
-        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;
 }
 
-static int niu_set_flags(struct net_device *dev, u32 data)
-{
-        return ethtool_op_set_flags(dev, data, ETH_FLAG_RXHASH);
-}
-
 static const struct ethtool_ops niu_ethtool_ops = {
         .get_drvinfo            = niu_get_drvinfo,
         .get_link               = ethtool_op_get_link,
@@ -7931,11 +7926,9 @@ 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,
-        .get_flags              = ethtool_op_get_flags,
 };
 
 static int niu_ldg_assign_ldn(struct niu *np, struct niu_parent *parent,
@@ -8129,7 +8122,7 @@ static int __devinit niu_pci_vpd_scan_props(struct niu *np,
         netif_printk(np, probe, KERN_DEBUG, np->dev,
                      "VPD_SCAN: start[%x] end[%x]\n", start, end);
         while (start < end) {
-                int len, err, instance, type, prop_len;
+                int len, err, prop_len;
                 char namebuf[64];
                 u8 *prop_buf;
                 int max_len;
@@ -8145,8 +8138,6 @@ static int __devinit niu_pci_vpd_scan_props(struct niu *np,
                 len = err;
                 start += 3;
 
-                instance = niu_pci_eeprom_read(np, start);
-                type = niu_pci_eeprom_read(np, start + 3);
                 prop_len = niu_pci_eeprom_read(np, start + 4);
                 err = niu_pci_vpd_get_propname(np, start + 5, namebuf, 64);
                 if (err < 0)
@@ -9499,7 +9490,7 @@ static struct niu_parent * __devinit niu_new_parent(struct niu *np,
         struct niu_parent *p;
         int i;
 
-        plat_dev = platform_device_register_simple("niu", niu_parent_index,
+        plat_dev = platform_device_register_simple("niu-board", niu_parent_index,
                                                    NULL, 0);
         if (IS_ERR(plat_dev))
                 return NULL;
@@ -9766,8 +9757,8 @@ static void __devinit niu_device_announce(struct niu *np)
 
 static void __devinit niu_set_basic_features(struct net_device *dev)
 {
-        dev->features |= (NETIF_F_SG | NETIF_F_HW_CSUM |
-                          NETIF_F_GRO | NETIF_F_RXHASH);
+        dev->hw_features = NETIF_F_SG | NETIF_F_HW_CSUM | NETIF_F_RXHASH;
+        dev->features |= dev->hw_features | NETIF_F_RXCSUM;
 }
 
 static int __devinit niu_pci_init_one(struct pci_dev *pdev,
@@ -9944,7 +9935,7 @@ static int niu_suspend(struct pci_dev *pdev, pm_message_t state)
         if (!netif_running(dev))
                 return 0;
 
-        flush_scheduled_work();
+        flush_work_sync(&np->reset_task);
         niu_netif_stop(np);
 
         del_timer_sync(&np->timer);
@@ -10060,8 +10051,7 @@ static const struct niu_ops niu_phys_ops = {
         .unmap_single   = niu_phys_unmap_single,
 };
 
-static int __devinit niu_of_probe(struct platform_device *op,
-                                  const struct of_device_id *match)
+static int __devinit niu_of_probe(struct platform_device *op)
 {
         union niu_parent_id parent_id;
         struct net_device *dev;
@@ -10221,7 +10211,7 @@ static const struct of_device_id niu_match[] = {
 };
 MODULE_DEVICE_TABLE(of, niu_match);
 
-static struct of_platform_driver niu_of_driver = {
+static struct platform_driver niu_of_driver = {
         .driver = {
                 .name = "niu",
                 .owner = THIS_MODULE,
@@ -10242,14 +10232,14 @@ static int __init niu_init(void)
         niu_debug = netif_msg_init(debug, NIU_MSG_DEFAULT);
 
 #ifdef CONFIG_SPARC64
-        err = of_register_platform_driver(&niu_of_driver);
+        err = platform_driver_register(&niu_of_driver);
 #endif
 
         if (!err) {
                 err = pci_register_driver(&niu_pci_driver);
 #ifdef CONFIG_SPARC64
                 if (err)
-                        of_unregister_platform_driver(&niu_of_driver);
+                        platform_driver_unregister(&niu_of_driver);
 #endif
         }
 
@@ -10260,7 +10250,7 @@ static void __exit niu_exit(void)
 {
         pci_unregister_driver(&niu_pci_driver);
 #ifdef CONFIG_SPARC64
-        of_unregister_platform_driver(&niu_of_driver);
+        platform_driver_unregister(&niu_of_driver);
 #endif
 }