5 files changed, 2 insertions, 5 deletions

diff --git a/drivers/infiniband/hw/amso1100/c2.c b/drivers/infiniband/hw/amso1100/c2.c
index 8250740c94b0..c61fd2b4a556 100644
--- a/drivers/infiniband/hw/amso1100/c2.c
+++ b/drivers/infiniband/hw/amso1100/c2.c
@@ -526,7 +526,6 @@ static void c2_rx_interrupt(struct net_device *netdev)
 
                 netif_rx(skb);
 
-                netdev->last_rx = jiffies;
                 netdev->stats.rx_packets++;
                 netdev->stats.rx_bytes += buflen;
         }
diff --git a/drivers/infiniband/hw/nes/nes_hw.c b/drivers/infiniband/hw/nes/nes_hw.c
index 63a1a8e1e8a3..3512d6de3019 100644
--- a/drivers/infiniband/hw/nes/nes_hw.c
+++ b/drivers/infiniband/hw/nes/nes_hw.c
@@ -2743,7 +2743,7 @@ void nes_nic_ce_handler(struct nes_device *nesdev, struct nes_hw_nic_cq *cq)
                                 }
 
 skip_rx_indicate0:
-                                nesvnic->netdev->last_rx = jiffies;
+                                ;
                                 /* nesvnic->netstats.rx_packets++; */
                                 /* nesvnic->netstats.rx_bytes += rx_pkt_size; */
                         }
diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c
index c6e6611d3016..538e409d4515 100644
--- a/drivers/infiniband/hw/nes/nes_nic.c
+++ b/drivers/infiniband/hw/nes/nes_nic.c
@@ -1508,7 +1508,7 @@ static int nes_netdev_set_settings(struct net_device *netdev, struct ethtool_cmd
 }
 
 
-static struct ethtool_ops nes_ethtool_ops = {
+static const struct ethtool_ops nes_ethtool_ops = {
         .get_link = ethtool_op_get_link,
         .get_settings = nes_netdev_get_settings,
         .set_settings = nes_netdev_set_settings,
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_cm.c b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
index 8f4b4fca2a1d..30bdf427ee6d 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_cm.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
@@ -662,7 +662,6 @@ copied:
         skb_reset_mac_header(skb);
         skb_pull(skb, IPOIB_ENCAP_LEN);
 
-        dev->last_rx = jiffies;
         ++dev->stats.rx_packets;
         dev->stats.rx_bytes += skb->len;
 
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_ib.c b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
index e35f4a0ea9d5..8c91d9f37ada 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_ib.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
@@ -276,7 +276,6 @@ static void ipoib_ib_handle_rx_wc(struct net_device *dev, struct ib_wc *wc)
         skb_reset_mac_header(skb);
         skb_pull(skb, IPOIB_ENCAP_LEN);
 
-        dev->last_rx = jiffies;
         ++dev->stats.rx_packets;
         dev->stats.rx_bytes += skb->len;