net: convert sunhme/sungem network drivers to hw_features

Side effects:
 - TX offloads (HW csum, scatter-gather) can be toggled now
 - RX checksum is reported correctly now (it's always active)

Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 6 insertions, 3 deletions

diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c
index c1a344829b54..a935426cbe63 100644
--- a/drivers/net/sungem.c
+++ b/drivers/net/sungem.c
@@ -3146,7 +3146,8 @@ static int __devinit gem_init_one(struct pci_dev *pdev,
                             gp->phy_mii.def ? gp->phy_mii.def->name : "no");
 
         /* GEM can do it all... */
-        dev->features |= NETIF_F_SG | NETIF_F_HW_CSUM | NETIF_F_LLTX;
+        dev->hw_features = NETIF_F_SG | NETIF_F_HW_CSUM;
+        dev->features |= dev->hw_features | NETIF_F_RXCSUM | NETIF_F_LLTX;
         if (pci_using_dac)
                 dev->features |= NETIF_F_HIGHDMA;
 
diff --git a/drivers/net/sunhme.c b/drivers/net/sunhme.c
index eb4f59fb01e9..80e907df36b4 100644
--- a/drivers/net/sunhme.c
+++ b/drivers/net/sunhme.c
@@ -2788,7 +2788,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];
 
@@ -3113,7 +3114,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. */