1 files changed, 32 insertions, 22 deletions

diff --git a/drivers/net/sunhme.c b/drivers/net/sunhme.c
index bd0df1c14955..30aad54b1b3a 100644
--- a/drivers/net/sunhme.c
+++ b/drivers/net/sunhme.c
@@ -1383,7 +1383,7 @@ force_link:
                 if (ep == NULL || ep->autoneg == AUTONEG_ENABLE) {
                         hp->sw_bmcr = BMCR_SPEED100;
                 } else {
-                        if (ep->speed == SPEED_100)
+                        if (ethtool_cmd_speed(ep) == SPEED_100)
                                 hp->sw_bmcr = BMCR_SPEED100;
                         else
                                 hp->sw_bmcr = 0;
@@ -1409,7 +1409,7 @@ force_link:
         hp->timer_ticks = 0;
         hp->happy_timer.expires = jiffies + (12 * HZ)/10;  /* 1.2 sec. */
         hp->happy_timer.data = (unsigned long) hp;
-        hp->happy_timer.function = &happy_meal_timer;
+        hp->happy_timer.function = happy_meal_timer;
         add_timer(&hp->happy_timer);
 }
 
@@ -2266,7 +2266,7 @@ static netdev_tx_t happy_meal_start_xmit(struct sk_buff *skb,
 
         tx_flags = TXFLAG_OWN;
         if (skb->ip_summed == CHECKSUM_PARTIAL) {
-                const u32 csum_start_off = skb_transport_offset(skb);
+                const u32 csum_start_off = skb_checksum_start_offset(skb);
                 const u32 csum_stuff_off = csum_start_off + skb->csum_offset;
 
                 tx_flags = (TXFLAG_OWN | TXFLAG_CSENABLE |
@@ -2401,6 +2401,7 @@ static void happy_meal_set_multicast(struct net_device *dev)
 static int hme_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 {
         struct happy_meal *hp = netdev_priv(dev);
+        u32 speed;
 
         cmd->supported =
                 (SUPPORTED_10baseT_Half | SUPPORTED_10baseT_Full |
@@ -2420,10 +2421,9 @@ static int hme_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 
         if (hp->sw_bmcr & BMCR_ANENABLE) {
                 cmd->autoneg = AUTONEG_ENABLE;
-                cmd->speed =
-                        (hp->sw_lpa & (LPA_100HALF | LPA_100FULL)) ?
-                        SPEED_100 : SPEED_10;
-                if (cmd->speed == SPEED_100)
+                speed = ((hp->sw_lpa & (LPA_100HALF | LPA_100FULL)) ?
+                         SPEED_100 : SPEED_10);
+                if (speed == SPEED_100)
                         cmd->duplex =
                                 (hp->sw_lpa & (LPA_100FULL)) ?
                                 DUPLEX_FULL : DUPLEX_HALF;
@@ -2433,13 +2433,12 @@ static int hme_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
                                 DUPLEX_FULL : DUPLEX_HALF;
         } else {
                 cmd->autoneg = AUTONEG_DISABLE;
-                cmd->speed =
-                        (hp->sw_bmcr & BMCR_SPEED100) ?
-                        SPEED_100 : SPEED_10;
+                speed = (hp->sw_bmcr & BMCR_SPEED100) ? SPEED_100 : SPEED_10;
                 cmd->duplex =
                         (hp->sw_bmcr & BMCR_FULLDPLX) ?
                         DUPLEX_FULL : DUPLEX_HALF;
         }
+        ethtool_cmd_speed_set(cmd, speed);
         return 0;
 }
 
@@ -2452,8 +2451,8 @@ static int hme_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
             cmd->autoneg != AUTONEG_DISABLE)
                 return -EINVAL;
         if (cmd->autoneg == AUTONEG_DISABLE &&
-            ((cmd->speed != SPEED_100 &&
-              cmd->speed != SPEED_10) ||
+            ((ethtool_cmd_speed(cmd) != SPEED_100 &&
+              ethtool_cmd_speed(cmd) != SPEED_10) ||
              (cmd->duplex != DUPLEX_HALF &&
               cmd->duplex != DUPLEX_FULL)))
                 return -EINVAL;
@@ -2497,7 +2496,7 @@ static u32 hme_get_link(struct net_device *dev)
         hp->sw_bmcr = happy_meal_tcvr_read(hp, hp->tcvregs, MII_BMCR);
         spin_unlock_irq(&hp->happy_lock);
 
-        return (hp->sw_bmsr & BMSR_LSTATUS);
+        return hp->sw_bmsr & BMSR_LSTATUS;
 }
 
 static const struct ethtool_ops hme_ethtool_ops = {
@@ -2788,7 +2787,8 @@ static int __devinit happy_meal_sbus_probe_one(struct platform_device *op, int i
         dev->ethtool_ops = &hme_ethtool_ops;
 
         /* Happy Meal can do it all... */
-        dev->features |= NETIF_F_SG | NETIF_F_HW_CSUM;
+        dev->hw_features = NETIF_F_SG | NETIF_F_HW_CSUM;
+        dev->features |= dev->hw_features | NETIF_F_RXCSUM;
 
         dev->irq = op->archdata.irqs[0];
 
@@ -2808,7 +2808,8 @@ static int __devinit happy_meal_sbus_probe_one(struct platform_device *op, int i
         happy_meal_set_initial_advertisement(hp);
         spin_unlock_irq(&hp->happy_lock);
 
-        if (register_netdev(hp->dev)) {
+        err = register_netdev(hp->dev);
+        if (err) {
                 printk(KERN_ERR "happymeal: Cannot register net device, "
                        "aborting.\n");
                 goto err_out_free_coherent;
@@ -3112,7 +3113,8 @@ static int __devinit happy_meal_pci_probe(struct pci_dev *pdev,
         dev->dma = 0;
 
         /* Happy Meal can do it all... */
-        dev->features |= NETIF_F_SG | NETIF_F_HW_CSUM;
+        dev->hw_features = NETIF_F_SG | NETIF_F_HW_CSUM;
+        dev->features |= dev->hw_features | NETIF_F_RXCSUM;
 
 #if defined(CONFIG_SBUS) && defined(CONFIG_PCI)
         /* Hook up PCI register/descriptor accessors. */
@@ -3130,7 +3132,8 @@ static int __devinit happy_meal_pci_probe(struct pci_dev *pdev,
         happy_meal_set_initial_advertisement(hp);
         spin_unlock_irq(&hp->happy_lock);
 
-        if (register_netdev(hp->dev)) {
+        err = register_netdev(hp->dev);
+        if (err) {
                 printk(KERN_ERR "happymeal(PCI): Cannot register net device, "
                        "aborting.\n");
                 goto err_out_iounmap;
@@ -3235,11 +3238,18 @@ static void happy_meal_pci_exit(void)
 #endif
 
 #ifdef CONFIG_SBUS
-static int __devinit hme_sbus_probe(struct platform_device *op, const struct of_device_id *match)
+static const struct of_device_id hme_sbus_match[];
+static int __devinit hme_sbus_probe(struct platform_device *op)
 {
+        const struct of_device_id *match;
         struct device_node *dp = op->dev.of_node;
         const char *model = of_get_property(dp, "model", NULL);
-        int is_qfe = (match->data != NULL);
+        int is_qfe;
+
+        match = of_match_device(hme_sbus_match, &op->dev);
+        if (!match)
+                return -EINVAL;
+        is_qfe = (match->data != NULL);
 
         if (!is_qfe && model && !strcmp(model, "SUNW,sbus-qfe"))
                 is_qfe = 1;
@@ -3290,7 +3300,7 @@ static const struct of_device_id hme_sbus_match[] = {
 
 MODULE_DEVICE_TABLE(of, hme_sbus_match);
 
-static struct of_platform_driver hme_sbus_driver = {
+static struct platform_driver hme_sbus_driver = {
         .driver = {
                 .name = "hme",
                 .owner = THIS_MODULE,
@@ -3304,7 +3314,7 @@ static int __init happy_meal_sbus_init(void)
 {
         int err;
 
-        err = of_register_platform_driver(&hme_sbus_driver);
+        err = platform_driver_register(&hme_sbus_driver);
         if (!err)
                 err = quattro_sbus_register_irqs();
 
@@ -3313,7 +3323,7 @@ static int __init happy_meal_sbus_init(void)
 
 static void happy_meal_sbus_exit(void)
 {
-        of_unregister_platform_driver(&hme_sbus_driver);
+        platform_driver_unregister(&hme_sbus_driver);
         quattro_sbus_free_irqs();
 
         while (qfe_sbus_list) {