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

1 files changed, 9 insertions, 9 deletions

diff --git a/drivers/net/3c515.c b/drivers/net/3c515.c
index 4adcb950f5f1..2e17837be546 100644
--- a/drivers/net/3c515.c
+++ b/drivers/net/3c515.c
@@ -65,7 +65,6 @@ static int max_interrupt_work = 20;
 #include <linux/errno.h>
 #include <linux/in.h>
 #include <linux/ioport.h>
-#include <linux/slab.h>
 #include <linux/skbuff.h>
 #include <linux/etherdevice.h>
 #include <linux/interrupt.h>
@@ -764,13 +763,14 @@ static int corkscrew_open(struct net_device *dev)
         /* Use the now-standard shared IRQ implementation. */
         if (vp->capabilities == 0x11c7) {
                 /* Corkscrew: Cannot share ISA resources. */
-                if (dev->irq == 0
-                    || dev->dma == 0
-                    || request_irq(dev->irq, &corkscrew_interrupt, 0,
-                                   vp->product_name, dev)) return -EAGAIN;
+                if (dev->irq == 0 ||
+                    dev->dma == 0 ||
+                    request_irq(dev->irq, corkscrew_interrupt, 0,
+                                vp->product_name, dev))
+                        return -EAGAIN;
                 enable_dma(dev->dma);
                 set_dma_mode(dev->dma, DMA_MODE_CASCADE);
-        } else if (request_irq(dev->irq, &corkscrew_interrupt, IRQF_SHARED,
+        } else if (request_irq(dev->irq, corkscrew_interrupt, IRQF_SHARED,
                                vp->product_name, dev)) {
                 return -EAGAIN;
         }
@@ -1368,8 +1368,8 @@ static int boomerang_rx(struct net_device *dev)
 
                         /* Check if the packet is long enough to just accept without
                            copying to a properly sized skbuff. */
-                        if (pkt_len < rx_copybreak
-                            && (skb = dev_alloc_skb(pkt_len + 4)) != NULL) {
+                        if (pkt_len < rx_copybreak &&
+                            (skb = dev_alloc_skb(pkt_len + 4)) != NULL) {
                                 skb_reserve(skb, 2);    /* Align IP on 16 byte boundaries */
                                 /* 'skb_put()' points to the start of sk_buff data area. */
                                 memcpy(skb_put(skb, pkt_len),
@@ -1535,7 +1535,7 @@ static void set_rx_mode(struct net_device *dev)
                         pr_debug("%s: Setting promiscuous mode.\n",
                                dev->name);
                 new_mode = SetRxFilter | RxStation | RxMulticast | RxBroadcast | RxProm;
-        } else if ((dev->mc_list) || (dev->flags & IFF_ALLMULTI)) {
+        } else if (!netdev_mc_empty(dev) || dev->flags & IFF_ALLMULTI) {
                 new_mode = SetRxFilter | RxStation | RxMulticast | RxBroadcast;
         } else
                 new_mode = SetRxFilter | RxStation | RxBroadcast;