diff options
Diffstat (limited to 'drivers/firewire')
-rw-r--r-- | drivers/firewire/net.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/firewire/net.c b/drivers/firewire/net.c index a42209a73aed..cbaf420c36c5 100644 --- a/drivers/firewire/net.c +++ b/drivers/firewire/net.c | |||
@@ -663,8 +663,6 @@ static int fwnet_finish_incoming_packet(struct net_device *net, | |||
663 | if (netif_queue_stopped(net)) | 663 | if (netif_queue_stopped(net)) |
664 | netif_wake_queue(net); | 664 | netif_wake_queue(net); |
665 | 665 | ||
666 | net->last_rx = jiffies; | ||
667 | |||
668 | return 0; | 666 | return 0; |
669 | } | 667 | } |
670 | 668 | ||
@@ -1188,7 +1186,7 @@ static int fwnet_stop(struct net_device *net) | |||
1188 | return 0; | 1186 | return 0; |
1189 | } | 1187 | } |
1190 | 1188 | ||
1191 | static int fwnet_tx(struct sk_buff *skb, struct net_device *net) | 1189 | static netdev_tx_t fwnet_tx(struct sk_buff *skb, struct net_device *net) |
1192 | { | 1190 | { |
1193 | struct fwnet_header hdr_buf; | 1191 | struct fwnet_header hdr_buf; |
1194 | struct fwnet_device *dev = netdev_priv(net); | 1192 | struct fwnet_device *dev = netdev_priv(net); |
@@ -1342,7 +1340,7 @@ static void fwnet_get_drvinfo(struct net_device *net, | |||
1342 | strcpy(info->bus_info, "ieee1394"); | 1340 | strcpy(info->bus_info, "ieee1394"); |
1343 | } | 1341 | } |
1344 | 1342 | ||
1345 | static struct ethtool_ops fwnet_ethtool_ops = { | 1343 | static const struct ethtool_ops fwnet_ethtool_ops = { |
1346 | .get_drvinfo = fwnet_get_drvinfo, | 1344 | .get_drvinfo = fwnet_get_drvinfo, |
1347 | }; | 1345 | }; |
1348 | 1346 | ||