projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
igb: make dev_spec a union and remove dynamic allocation
[deliverable/linux.git]
/
drivers
/
net
/
sunlance.c
diff --git
a/drivers/net/sunlance.c
b/drivers/net/sunlance.c
index 704301a5a7ffed417655912cbc0a61552d55bf71..281373281756e381d24125eb841f903eda0a8286 100644
(file)
--- a/
drivers/net/sunlance.c
+++ b/
drivers/net/sunlance.c
@@
-555,7
+555,6
@@
static void lance_rx_dvma(struct net_device *dev)
len);
skb->protocol = eth_type_trans(skb, dev);
netif_rx(skb);
len);
skb->protocol = eth_type_trans(skb, dev);
netif_rx(skb);
- dev->last_rx = jiffies;
dev->stats.rx_packets++;
}
dev->stats.rx_packets++;
}
@@
-726,7
+725,6
@@
static void lance_rx_pio(struct net_device *dev)
lance_piocopy_to_skb(skb, &(ib->rx_buf[entry][0]), len);
skb->protocol = eth_type_trans(skb, dev);
netif_rx(skb);
lance_piocopy_to_skb(skb, &(ib->rx_buf[entry][0]), len);
skb->protocol = eth_type_trans(skb, dev);
netif_rx(skb);
- dev->last_rx = jiffies;
dev->stats.rx_packets++;
}
dev->stats.rx_packets++;
}
@@
-1321,7
+1319,6
@@
static int __devinit sparc_lance_probe_one(struct of_device *op,
static unsigned version_printed;
struct lance_private *lp;
struct net_device *dev;
static unsigned version_printed;
struct lance_private *lp;
struct net_device *dev;
- DECLARE_MAC_BUF(mac);
int i;
dev = alloc_etherdev(sizeof(struct lance_private) + 8);
int i;
dev = alloc_etherdev(sizeof(struct lance_private) + 8);
@@
-1491,8
+1488,8
@@
no_link_test:
dev_set_drvdata(&op->dev, lp);
dev_set_drvdata(&op->dev, lp);
- printk(KERN_INFO "%s: LANCE %
s
\n",
- dev->name,
print_mac(mac, dev->dev_addr)
);
+ printk(KERN_INFO "%s: LANCE %
pM
\n",
+ dev->name,
dev->dev_addr
);
return 0;
return 0;
This page took
0.027806 seconds
and
5
git commands to generate.