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

1 files changed, 19 insertions, 20 deletions

diff --git a/drivers/net/tokenring/tms380tr.c b/drivers/net/tokenring/tms380tr.c
index a7b6888829b5..8b508c922410 100644
--- a/drivers/net/tokenring/tms380tr.c
+++ b/drivers/net/tokenring/tms380tr.c
@@ -85,7 +85,6 @@ static const char version[] = "tms380tr.c: v1.10 30/12/2002 by Christoph Goos, A
 #include <linux/ptrace.h>
 #include <linux/ioport.h>
 #include <linux/in.h>
-#include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/time.h>
 #include <linux/errno.h>
@@ -693,7 +692,7 @@ static netdev_tx_t tms380tr_hardware_send_packet(struct sk_buff *skb,
  * NOTE: This function should be used whenever the status of any TPL must be
  * modified by the driver, because the compiler may otherwise change the
  * order of instructions such that writing the TPL status may be executed at
- * an undesireable time. When this function is used, the status is always
+ * an undesirable time. When this function is used, the status is always
  * written when the function is called.
  */
 static void tms380tr_write_tpl_status(TPL *tpl, unsigned int Status)
@@ -729,8 +728,8 @@ static void tms380tr_timer_chk(unsigned long data)
                 return;
 
         tms380tr_chk_outstanding_cmds(dev);
-        if(time_before(tp->LastSendTime + SEND_TIMEOUT, jiffies)
-                && (tp->TplFree != tp->TplBusy))
+        if(time_before(tp->LastSendTime + SEND_TIMEOUT, jiffies) &&
+           (tp->TplFree != tp->TplBusy))
         {
                 /* Anything to send, but stalled too long */
                 tp->LastSendTime = jiffies;
@@ -830,8 +829,8 @@ irqreturn_t tms380tr_interrupt(int irq, void *dev_id)
                 }
 
                 /* Reset system interrupt if not already done. */
-                if(irq_type != STS_IRQ_TRANSMIT_STATUS
-                        && irq_type != STS_IRQ_RECEIVE_STATUS) {
+                if(irq_type != STS_IRQ_TRANSMIT_STATUS &&
+                   irq_type != STS_IRQ_RECEIVE_STATUS) {
                         tms380tr_reset_interrupt(dev);
                 }
 
@@ -895,10 +894,10 @@ static unsigned char tms380tr_chk_ssb(struct net_local *tp, unsigned short IrqTy
 
         /* Check if this interrupt does use the SSB. */
 
-        if(IrqType != STS_IRQ_TRANSMIT_STATUS
-                && IrqType != STS_IRQ_RECEIVE_STATUS
-                && IrqType != STS_IRQ_COMMAND_STATUS
-                && IrqType != STS_IRQ_RING_STATUS)
+        if(IrqType != STS_IRQ_TRANSMIT_STATUS &&
+           IrqType != STS_IRQ_RECEIVE_STATUS &&
+           IrqType != STS_IRQ_COMMAND_STATUS &&
+           IrqType != STS_IRQ_RING_STATUS)
         {
                 return (1);     /* SSB not involved. */
         }
@@ -1212,10 +1211,9 @@ static void tms380tr_set_multicast_list(struct net_device *dev)
                 }
                 else
                 {
-                        int i;
-                        struct dev_mc_list *mclist = dev->mc_list;
-                        for (i=0; i< dev->mc_count; i++)
-                        {
+                        struct dev_mc_list *mclist;
+
+                        netdev_for_each_mc_addr(mclist, dev) {
                                 ((char *)(&tp->ocpl.FunctAddr))[0] |=
                                         mclist->dmi_addr[2];
                                 ((char *)(&tp->ocpl.FunctAddr))[1] |=
@@ -1224,7 +1222,6 @@ static void tms380tr_set_multicast_list(struct net_device *dev)
                                         mclist->dmi_addr[4];
                                 ((char *)(&tp->ocpl.FunctAddr))[3] |=
                                         mclist->dmi_addr[5];
-                                mclist = mclist->next;
                         }
                 }
                 tms380tr_exec_cmd(dev, OC_SET_FUNCT_ADDR);
@@ -1364,6 +1361,8 @@ static int tms380tr_reset_adapter(struct net_device *dev)
         return (-1);
 }
 
+MODULE_FIRMWARE("tms380tr.bin");
+
 /*
  * Starts bring up diagnostics of token ring adapter and evaluates
  * diagnostic results.
@@ -1483,8 +1482,8 @@ static int tms380tr_init_adapter(struct net_device *dev)
                         /* Mask interesting status bits */
                         Status = SIFREADW(SIFSTS);
                         Status &= STS_MASK;
-                } while(((Status &(STS_INITIALIZE | STS_ERROR | STS_TEST)) != 0)
-                        && ((Status & STS_ERROR) == 0) && (loop_cnt != 0));
+                } while(((Status &(STS_INITIALIZE | STS_ERROR | STS_TEST)) != 0) &&
+                        ((Status & STS_ERROR) == 0) && (loop_cnt != 0));
 
                 if((Status & (STS_INITIALIZE | STS_ERROR | STS_TEST)) == 0)
                 {
@@ -2181,8 +2180,8 @@ static void tms380tr_rcv_status_irq(struct net_device *dev)
                                 }
                         }
 
-                        if(skb && (rpl->SkbStat == SKB_DATA_COPY
-                                || rpl->SkbStat == SKB_DMA_DIRECT))
+                        if(skb && (rpl->SkbStat == SKB_DATA_COPY ||
+                                   rpl->SkbStat == SKB_DMA_DIRECT))
                         {
                                 if(rpl->SkbStat == SKB_DATA_COPY)
                                         skb_copy_to_linear_data(skb, ReceiveDataPtr,
@@ -2264,7 +2263,7 @@ static void tms380tr_rcv_status_irq(struct net_device *dev)
  * This function should be used whenever the status of any RPL must be
  * modified by the driver, because the compiler may otherwise change the
  * order of instructions such that writing the RPL status may be executed
- * at an undesireable time. When this function is used, the status is
+ * at an undesirable time. When this function is used, the status is
  * always written when the function is called.
  */
 static void tms380tr_write_rpl_status(RPL *rpl, unsigned int Status)