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

1 files changed, 13 insertions, 13 deletions

diff --git a/drivers/net/ks8851.c b/drivers/net/ks8851.c
index a23f739d222f..9e9f9b349766 100644
--- a/drivers/net/ks8851.c
+++ b/drivers/net/ks8851.c
@@ -1,4 +1,4 @@
-/* drivers/net/ks8651.c
+/* drivers/net/ks8851.c
  *
  * Copyright 2009 Simtec Electronics
  *      http://www.simtec.co.uk/
@@ -407,7 +407,7 @@ static irqreturn_t ks8851_irq(int irq, void *pw)
  * @buff: The buffer address
  * @len: The length of the data to read
  *
- * Issue an RXQ FIFO read command and read the @len ammount of data from
+ * Issue an RXQ FIFO read command and read the @len amount of data from
  * the FIFO into the buffer specified by @buff.
  */
 static void ks8851_rdfifo(struct ks8851_net *ks, u8 *buff, unsigned len)
@@ -714,7 +714,7 @@ static void ks8851_tx_work(struct work_struct *work)
 {
         struct ks8851_net *ks = container_of(work, struct ks8851_net, tx_work);
         struct sk_buff *txb;
-        bool last = false;
+        bool last = skb_queue_empty(&ks->txq);
 
         mutex_lock(&ks->lock);
 
@@ -722,12 +722,14 @@ static void ks8851_tx_work(struct work_struct *work)
                 txb = skb_dequeue(&ks->txq);
                 last = skb_queue_empty(&ks->txq);
 
-                ks8851_wrreg16(ks, KS_RXQCR, ks->rc_rxqcr | RXQCR_SDA);
-                ks8851_wrpkt(ks, txb, last);
-                ks8851_wrreg16(ks, KS_RXQCR, ks->rc_rxqcr);
-                ks8851_wrreg16(ks, KS_TXQCR, TXQCR_METFE);
+                if (txb != NULL) {
+                        ks8851_wrreg16(ks, KS_RXQCR, ks->rc_rxqcr | RXQCR_SDA);
+                        ks8851_wrpkt(ks, txb, last);
+                        ks8851_wrreg16(ks, KS_RXQCR, ks->rc_rxqcr);
+                        ks8851_wrreg16(ks, KS_TXQCR, TXQCR_METFE);
 
-                ks8851_done_tx(ks, txb);
+                        ks8851_done_tx(ks, txb);
+                }
         }
 
         mutex_unlock(&ks->lock);
@@ -965,19 +967,17 @@ static void ks8851_set_rx_mode(struct net_device *dev)
 
                 rxctrl.rxcr1 = (RXCR1_RXME | RXCR1_RXAE |
                                 RXCR1_RXPAFMA | RXCR1_RXMAFMA);
-        } else if (dev->flags & IFF_MULTICAST && dev->mc_count > 0) {
-                struct dev_mc_list *mcptr = dev->mc_list;
+        } else if (dev->flags & IFF_MULTICAST && !netdev_mc_empty(dev)) {
+                struct dev_mc_list *mcptr;
                 u32 crc;
-                int i;
 
                 /* accept some multicast */
 
-                for (i = dev->mc_count; i > 0; i--) {
+                netdev_for_each_mc_addr(mcptr, dev) {
                         crc = ether_crc(ETH_ALEN, mcptr->dmi_addr);
                         crc >>= (32 - 6);  /* get top six bits */
 
                         rxctrl.mchash[crc >> 4] |= (1 << (crc & 0xf));
-                        mcptr = mcptr->next;
                 }
 
                 rxctrl.rxcr1 = RXCR1_RXME | RXCR1_RXPAFMA;