include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit...

[mv-sheeva.git] / drivers / misc / sgi-xp / xpnet.c

diff --git a/drivers/misc/sgi-xp/xpnet.c b/drivers/misc/sgi-xp/xpnet.c
index 5d778ec8cdb2aa454224e7a5e5b9f76dc05a49fd..ee5109a3cd984f287c824fd71d3221ead361bccd 100644 (file)
--- a/drivers/misc/sgi-xp/xpnet.c
+++ b/drivers/misc/sgi-xp/xpnet.c
@@ -20,6 +20,7 @@
  *
  */
 
+#include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
@@ -240,7 +241,6 @@ xpnet_receive(short partid, int channel, struct xpnet_message *msg)
                (void *)skb->head, (void *)skb->data, skb_tail_pointer(skb),
                skb_end_pointer(skb), skb->len);
 
-       xpnet_device->last_rx = jiffies;
        xpnet_device->stats.rx_packets++;
        xpnet_device->stats.rx_bytes += skb->len + ETH_HLEN;
 
@@ -436,7 +436,7 @@ xpnet_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
        if (skb->data[0] == 0x33) {
                dev_kfree_skb(skb);
-               return 0;       /* nothing needed to be done */
+               return NETDEV_TX_OK;    /* nothing needed to be done */
        }
 
        /*
@@ -476,7 +476,7 @@ xpnet_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
        if (skb->data[0] == 0xff) {
                /* we are being asked to broadcast to all partitions */
-               for_each_bit(dest_partid, xpnet_broadcast_partitions,
+               for_each_set_bit(dest_partid, xpnet_broadcast_partitions,
                             xp_max_npartitions) {
 
                        xpnet_send(skb, queued_msg, start_addr, end_addr,
@@ -503,7 +503,7 @@ xpnet_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
        dev->stats.tx_packets++;
        dev->stats.tx_bytes += skb->len;
 
-       return 0;
+       return NETDEV_TX_OK;
 }
 
 /*