git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gianfar: Remove legacy PM callbacks
[safe/jmp/linux-2.6]
/
drivers
/
net
/
sunvnet.c
diff --git
a/drivers/net/sunvnet.c
b/drivers/net/sunvnet.c
index
bc74db0
..
d281a7b
100644
(file)
--- a/
drivers/net/sunvnet.c
+++ b/
drivers/net/sunvnet.c
@@
-717,7
+717,6
@@
static int vnet_start_xmit(struct sk_buff *skb, struct net_device *dev)
dev_kfree_skb(skb);
dev_kfree_skb(skb);
- dev->trans_start = jiffies;
return NETDEV_TX_OK;
out_dropped_unlock:
return NETDEV_TX_OK;
out_dropped_unlock:
@@
-763,12
+762,12
@@
static struct vnet_mcast_entry *__vnet_mc_find(struct vnet *vp, u8 *addr)
static void __update_mc_list(struct vnet *vp, struct net_device *dev)
{
static void __update_mc_list(struct vnet *vp, struct net_device *dev)
{
- struct
dev_addr_list *p
;
+ struct
netdev_hw_addr *ha
;
-
for (p = dev->mc_list; p; p = p->next
) {
+
netdev_for_each_mc_addr(ha, dev
) {
struct vnet_mcast_entry *m;
struct vnet_mcast_entry *m;
- m = __vnet_mc_find(vp,
p->dmi_
addr);
+ m = __vnet_mc_find(vp,
ha->
addr);
if (m) {
m->hit = 1;
continue;
if (m) {
m->hit = 1;
continue;
@@
-778,7
+777,7
@@
static void __update_mc_list(struct vnet *vp, struct net_device *dev)
m = kzalloc(sizeof(*m), GFP_ATOMIC);
if (!m)
continue;
m = kzalloc(sizeof(*m), GFP_ATOMIC);
if (!m)
continue;
- memcpy(m->addr,
p->dmi_
addr, ETH_ALEN);
+ memcpy(m->addr,
ha->
addr, ETH_ALEN);
m->hit = 1;
m->next = vp->mcast_list;
m->hit = 1;
m->next = vp->mcast_list;
@@
-1062,10
+1061,7
@@
static struct vnet * __devinit vnet_new(const u64 *local_mac)
goto err_out_free_dev;
}
goto err_out_free_dev;
}
- printk(KERN_INFO "%s: Sun LDOM vnet ", dev->name);
-
- for (i = 0; i < 6; i++)
- printk("%2.2x%c", dev->dev_addr[i], i == 5 ? '\n' : ':');
+ printk(KERN_INFO "%s: Sun LDOM vnet %pM\n", dev->name, dev->dev_addr);
list_add(&vp->list, &vnet_list);
list_add(&vp->list, &vnet_list);