ARM: 6165/1: trap overflows on highmem pages from kmap_atomic when debugging

[safe/jmp/linux-2.6] / drivers / ieee1394 / eth1394.c

diff --git a/drivers/ieee1394/eth1394.c b/drivers/ieee1394/eth1394.c
index 1ad8785..a4e9dcb 100644 (file)
--- a/drivers/ieee1394/eth1394.c
+++ b/drivers/ieee1394/eth1394.c
@@ -173,7 +173,7 @@ static netdev_tx_t ether1394_tx(struct sk_buff *skb,
                                struct net_device *dev);
 static void ether1394_iso(struct hpsb_iso *iso);
 
-static struct ethtool_ops ethtool_ops;
+static const struct ethtool_ops ethtool_ops;
 
 static int ether1394_write(struct hpsb_host *host, int srcid, int destid,
                           quadlet_t *data, u64 addr, size_t len, u16 flags);
@@ -1301,7 +1301,6 @@ static void ether1394_iso(struct hpsb_iso *iso)
 
        hpsb_iso_recv_release_packets(iso, i);
 
-       dev->last_rx = jiffies;
 }
 
 /******************************************
@@ -1706,7 +1705,7 @@ static void ether1394_get_drvinfo(struct net_device *dev,
        strcpy(info->bus_info, "ieee1394"); /* FIXME provide more detail? */
 }
 
-static struct ethtool_ops ethtool_ops = {
+static const struct ethtool_ops ethtool_ops = {
        .get_drvinfo = ether1394_get_drvinfo
 };