git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
[pandora-kernel.git]
/
drivers
/
net
/
arm
/
ks8695net.c
diff --git
a/drivers/net/arm/ks8695net.c
b/drivers/net/arm/ks8695net.c
index
35cd264
..
2a7b774
100644
(file)
--- a/
drivers/net/arm/ks8695net.c
+++ b/
drivers/net/arm/ks8695net.c
@@
-467,7
+467,6
@@
ks8695_rx_irq(int irq, void *dev_id)
netif_rx(skb);
/* Record stats */
netif_rx(skb);
/* Record stats */
- ndev->last_rx = jiffies;
ndev->stats.rx_packets++;
ndev->stats.rx_bytes += pktlen;
goto rx_finished;
ndev->stats.rx_packets++;
ndev->stats.rx_bytes += pktlen;
goto rx_finished;
@@
-1063,7
+1062,7
@@
ks8695_get_drvinfo(struct net_device *ndev, struct ethtool_drvinfo *info)
sizeof(info->bus_info));
}
sizeof(info->bus_info));
}
-static struct ethtool_ops ks8695_ethtool_ops = {
+static
const
struct ethtool_ops ks8695_ethtool_ops = {
.get_msglevel = ks8695_get_msglevel,
.set_msglevel = ks8695_set_msglevel,
.get_settings = ks8695_get_settings,
.get_msglevel = ks8695_get_msglevel,
.set_msglevel = ks8695_set_msglevel,
.get_settings = ks8695_get_settings,