Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

[~andy/linux] / drivers / s390 / net / qeth_l3_main.c

diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c
index d9fabe30c0dac15d992a35ce7ae1f94dcf0ff716..073b6d3549150eb4e91b5dc5ed2f3f12342bc758 100644 (file)
--- a/drivers/s390/net/qeth_l3_main.c
+++ b/drivers/s390/net/qeth_l3_main.c
@@ -1987,7 +1987,6 @@ static void qeth_l3_process_inbound_buffer(struct qeth_card *card,
                        continue;
                }
 
-               card->dev->last_rx = jiffies;
                card->stats.rx_packets++;
                card->stats.rx_bytes += len;
        }
@@ -2946,7 +2945,7 @@ static int qeth_l3_ethtool_set_tso(struct net_device *dev, u32 data)
        return 0;
 }
 
-static struct ethtool_ops qeth_l3_ethtool_ops = {
+static const struct ethtool_ops qeth_l3_ethtool_ops = {
        .get_link = ethtool_op_get_link,
        .get_tx_csum = ethtool_op_get_tx_csum,
        .set_tx_csum = ethtool_op_set_tx_hw_csum,