diff options
Diffstat (limited to 'drivers/net/jme.c')
-rw-r--r-- | drivers/net/jme.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/drivers/net/jme.c b/drivers/net/jme.c index 665e70d620fc..0430ffb62364 100644 --- a/drivers/net/jme.c +++ b/drivers/net/jme.c | |||
@@ -931,7 +931,6 @@ jme_alloc_and_feed_skb(struct jme_adapter *jme, int idx) | |||
931 | cpu_to_le16(RXWBFLAG_DEST_MUL)) | 931 | cpu_to_le16(RXWBFLAG_DEST_MUL)) |
932 | ++(NET_STAT(jme).multicast); | 932 | ++(NET_STAT(jme).multicast); |
933 | 933 | ||
934 | jme->dev->last_rx = jiffies; | ||
935 | NET_STAT(jme).rx_bytes += framesize; | 934 | NET_STAT(jme).rx_bytes += framesize; |
936 | ++(NET_STAT(jme).rx_packets); | 935 | ++(NET_STAT(jme).rx_packets); |
937 | } | 936 | } |
@@ -2861,18 +2860,10 @@ jme_init_one(struct pci_dev *pdev, | |||
2861 | goto err_out_free_shadow; | 2860 | goto err_out_free_shadow; |
2862 | } | 2861 | } |
2863 | 2862 | ||
2864 | msg_probe(jme, | 2863 | msg_probe(jme, "JMC250 gigabit%s ver:%x rev:%x macaddr:%pM\n", |
2865 | "JMC250 gigabit%s ver:%x rev:%x " | ||
2866 | "macaddr:%02x:%02x:%02x:%02x:%02x:%02x\n", | ||
2867 | (jme->fpgaver != 0) ? " (FPGA)" : "", | 2864 | (jme->fpgaver != 0) ? " (FPGA)" : "", |
2868 | (jme->fpgaver != 0) ? jme->fpgaver : jme->chiprev, | 2865 | (jme->fpgaver != 0) ? jme->fpgaver : jme->chiprev, |
2869 | jme->rev, | 2866 | jme->rev, netdev->dev_addr); |
2870 | netdev->dev_addr[0], | ||
2871 | netdev->dev_addr[1], | ||
2872 | netdev->dev_addr[2], | ||
2873 | netdev->dev_addr[3], | ||
2874 | netdev->dev_addr[4], | ||
2875 | netdev->dev_addr[5]); | ||
2876 | 2867 | ||
2877 | return 0; | 2868 | return 0; |
2878 | 2869 | ||