X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=drivers%2Fnet%2Fcris%2Feth_v10.c;h=c9309eadebc1d8ad3a2e8eb3e9ec6f523d5c444a;hb=4cd24eaf0c6ee7f0242e34ee77ec899f255e66b5;hp=d70d2039bc4655432ce1dd05d927b9a8707f6910;hpb=e6cd19743bfc76ca81804c2a259e3a0d7b03fd73;p=safe%2Fjmp%2Flinux-2.6

diff --git a/drivers/net/cris/eth_v10.c b/drivers/net/cris/eth_v10.c
index d70d203..c9309ea 100644
--- a/drivers/net/cris/eth_v10.c
+++ b/drivers/net/cris/eth_v10.c
@@ -1122,7 +1122,7 @@ e100_send_packet(struct sk_buff *skb, struct net_device *dev)
 
 	spin_unlock_irqrestore(&np->lock, flags);
 
-	return 0;
+	return NETDEV_TX_OK;
 }
 
 /*
@@ -1564,7 +1564,7 @@ static void
 set_multicast_list(struct net_device *dev)
 {
 	struct net_local *lp = netdev_priv(dev);
-	int num_addr = dev->mc_count;
+	int num_addr = netdev_mc_count(dev);
 	unsigned long int lo_bits;
 	unsigned long int hi_bits;