Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 7 insertions, 6 deletions

diff --git a/drivers/net/znet.c b/drivers/net/znet.c
index b42347333750..dbfef8d70f2d 100644
--- a/drivers/net/znet.c
+++ b/drivers/net/znet.c
@@ -88,6 +88,7 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/slab.h>
 #include <linux/errno.h>
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
@@ -103,8 +104,7 @@
 #include <asm/io.h>
 #include <asm/dma.h>
 
-/* This include could be elsewhere, since it is not wireless specific */
-#include "wireless/i82593.h"
+#include <linux/i82593.h>
 
 static char version[] __initdata = "znet.c:v1.02 9/23/94 becker@scyld.com\n";
 
@@ -170,7 +170,7 @@ static int znet_request_resources (struct net_device *dev)
 {
         struct znet_private *znet = netdev_priv(dev);
 
-        if (request_irq (dev->irq, &znet_interrupt, 0, "ZNet", dev))
+        if (request_irq (dev->irq, znet_interrupt, 0, "ZNet", dev))
                 goto failed;
         if (request_dma (znet->rx_dma, "ZNet rx"))
                 goto free_irq;
@@ -314,7 +314,8 @@ static void znet_set_multicast_list (struct net_device *dev)
         /* Byte D */
         cfblk->dummy_1 = 1;     /* set to 1 */
         cfblk->tx_ifs_retrig = 3; /* Hmm... Disabled */
-        cfblk->mc_all = (dev->mc_list || (dev->flags&IFF_ALLMULTI));/* multicast all mode */
+        cfblk->mc_all = (!netdev_mc_empty(dev) ||
+                        (dev->flags & IFF_ALLMULTI)); /* multicast all mode */
         cfblk->rcv_mon = 0;     /* Monitor mode disabled */
         cfblk->frag_acpt = 0;   /* Do not accept fragments */
         cfblk->tstrttrs = 0;    /* No start transmission threshold */
@@ -698,8 +699,8 @@ static void znet_rx(struct net_device *dev)
            the same area of the backwards links we now have.  This allows us to
            pass packets to the upper layers in the order they were received --
            important for fast-path sequential operations. */
-         while (znet->rx_start + cur_frame_end_offset != znet->rx_cur
-                        && ++boguscount < 5) {
+        while (znet->rx_start + cur_frame_end_offset != znet->rx_cur &&
+               ++boguscount < 5) {
                 unsigned short hi_cnt, lo_cnt, hi_status, lo_status;
                 int count, status;