Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 4 insertions, 30 deletions

diff --git a/drivers/net/ioc3-eth.c b/drivers/net/ioc3-eth.c
index 0b3f6df5cff7..32f07f868d89 100644
--- a/drivers/net/ioc3-eth.c
+++ b/drivers/net/ioc3-eth.c
@@ -90,8 +90,6 @@ struct ioc3_private {
         u32 emcr, ehar_h, ehar_l;
         spinlock_t ioc3_lock;
         struct mii_if_info mii;
-        unsigned long flags;
-#define IOC3_FLAG_RX_CHECKSUMS  1
 
         struct pci_dev *pdev;
 
@@ -609,7 +607,7 @@ static inline void ioc3_rx(struct net_device *dev)
                                 goto next;
                         }
 
-                        if (likely(ip->flags & IOC3_FLAG_RX_CHECKSUMS))
+                        if (likely(dev->features & NETIF_F_RXCSUM))
                                 ioc3_tcpudp_checksum(skb,
                                         w0 & ERXBUF_IPCKSUM_MASK, len);
 
@@ -827,7 +825,7 @@ static void ioc3_mii_start(struct ioc3_private *ip)
 {
         ip->ioc3_timer.expires = jiffies + (12 * HZ)/10;  /* 1.2 sec. */
         ip->ioc3_timer.data = (unsigned long) ip;
-        ip->ioc3_timer.function = &ioc3_timer;
+        ip->ioc3_timer.function = ioc3_timer;
         add_timer(&ip->ioc3_timer);
 }
 
@@ -917,7 +915,7 @@ static void ioc3_alloc_rings(struct net_device *dev)
 
                         skb = ioc3_alloc_skb(RX_BUF_ALLOC_SIZE, GFP_ATOMIC);
                         if (!skb) {
-                                show_free_areas();
+                                show_free_areas(0);
                                 continue;
                         }
 
@@ -1328,6 +1326,7 @@ static int __devinit ioc3_probe(struct pci_dev *pdev,
         dev->watchdog_timeo     = 5 * HZ;
         dev->netdev_ops         = &ioc3_netdev_ops;
         dev->ethtool_ops        = &ioc3_ethtool_ops;
+        dev->hw_features        = NETIF_F_IP_CSUM | NETIF_F_RXCSUM;
         dev->features           = NETIF_F_IP_CSUM;
 
         sw_physid1 = ioc3_mdio_read(dev, ip->mii.phy_id, MII_PHYSID1);
@@ -1618,37 +1617,12 @@ static u32 ioc3_get_link(struct net_device *dev)
         return rc;
 }
 
-static u32 ioc3_get_rx_csum(struct net_device *dev)
-{
-        struct ioc3_private *ip = netdev_priv(dev);
-
-        return ip->flags & IOC3_FLAG_RX_CHECKSUMS;
-}
-
-static int ioc3_set_rx_csum(struct net_device *dev, u32 data)
-{
-        struct ioc3_private *ip = netdev_priv(dev);
-
-        spin_lock_bh(&ip->ioc3_lock);
-        if (data)
-                ip->flags |= IOC3_FLAG_RX_CHECKSUMS;
-        else
-                ip->flags &= ~IOC3_FLAG_RX_CHECKSUMS;
-        spin_unlock_bh(&ip->ioc3_lock);
-
-        return 0;
-}
-
 static const struct ethtool_ops ioc3_ethtool_ops = {
         .get_drvinfo            = ioc3_get_drvinfo,
         .get_settings           = ioc3_get_settings,
         .set_settings           = ioc3_set_settings,
         .nway_reset             = ioc3_nway_reset,
         .get_link               = ioc3_get_link,
-        .get_rx_csum            = ioc3_get_rx_csum,
-        .set_rx_csum            = ioc3_set_rx_csum,
-        .get_tx_csum            = ethtool_op_get_tx_csum,
-        .set_tx_csum            = ethtool_op_set_tx_csum
 };
 
 static int ioc3_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)