99 files changed, 3975 insertions, 1873 deletions

diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
index d7ad19d2603..51eed679a05 100644
--- a/drivers/atm/solos-pci.c
+++ b/drivers/atm/solos-pci.c
@@ -531,34 +531,37 @@ static int flash_upgrade(struct solos_card *card, int chip)
         int numblocks = 0;
         int offset;
 
-        if (chip == 0) {
+        switch (chip) {
+        case 0:
                 fw_name = "solos-FPGA.bin";
                 blocksize = FPGA_BLOCK;
-        } 
-        
-        if (chip == 1) {
+                break;
+        case 1:
                 fw_name = "solos-Firmware.bin";
                 blocksize = SOLOS_BLOCK;
-        }
-        
-        if (chip == 2){
+                break;
+        case 2:
                 if (card->fpga_version > LEGACY_BUFFERS){
                         fw_name = "solos-db-FPGA.bin";
                         blocksize = FPGA_BLOCK;
                 } else {
-                        dev_info(&card->dev->dev, "FPGA version doesn't support daughter board upgrades\n");
+                        dev_info(&card->dev->dev, "FPGA version doesn't support"
+                                        " daughter board upgrades\n");
                         return -EPERM;
                 }
-        }
-        
-        if (chip == 3){
+                break;
+        case 3:
                 if (card->fpga_version > LEGACY_BUFFERS){
                         fw_name = "solos-Firmware.bin";
                         blocksize = SOLOS_BLOCK;
                 } else {
-                dev_info(&card->dev->dev, "FPGA version doesn't support daughter board upgrades\n");
-                return -EPERM;
+                        dev_info(&card->dev->dev, "FPGA version doesn't support"
+                                        " daughter board upgrades\n");
+                        return -EPERM;
                 }
+                break;
+        default:
+                return -ENODEV;
         }
 
         if (request_firmware(&fw, fw_name, &card->dev->dev))
diff --git a/drivers/isdn/hardware/mISDN/hfcmulti.c b/drivers/isdn/hardware/mISDN/hfcmulti.c
index faed794cf75..a6624ad252c 100644
--- a/drivers/isdn/hardware/mISDN/hfcmulti.c
+++ b/drivers/isdn/hardware/mISDN/hfcmulti.c
@@ -5481,7 +5481,7 @@ HFCmulti_init(void)
                 if (err) {
                         printk(KERN_ERR "error registering embedded driver: "
                                 "%x\n", err);
-                        return -err;
+                        return err;
                 }
                 HFC_cnt++;
                 printk(KERN_INFO "%d devices registered\n", HFC_cnt);
diff --git a/drivers/isdn/i4l/isdn_ppp.c b/drivers/isdn/i4l/isdn_ppp.c
index 2d14b64202a..642d5aaf53c 100644
--- a/drivers/isdn/i4l/isdn_ppp.c
+++ b/drivers/isdn/i4l/isdn_ppp.c
@@ -1535,10 +1535,8 @@ static int isdn_ppp_mp_bundle_array_init(void)
         int sz = ISDN_MAX_CHANNELS*sizeof(ippp_bundle);
         if( (isdn_ppp_bundle_arr = kzalloc(sz, GFP_KERNEL)) == NULL )
                 return -ENOMEM;
-        for (i = 0; i < ISDN_MAX_CHANNELS; i++) {
+        for( i = 0; i < ISDN_MAX_CHANNELS; i++ )
                 spin_lock_init(&isdn_ppp_bundle_arr[i].lock);
-                skb_queue_head_init(&isdn_ppp_bundle_arr[i].frags);
-        }
         return 0;
 }
 
@@ -1571,7 +1569,7 @@ static int isdn_ppp_mp_init( isdn_net_local * lp, ippp_bundle * add_to )
                 if ((lp->netdev->pb = isdn_ppp_mp_bundle_alloc()) == NULL)
                         return -ENOMEM;
                 lp->next = lp->last = lp;       /* nobody else in a queue */
-                skb_queue_head_init(&lp->netdev->pb->frags);
+                lp->netdev->pb->frags = NULL;
                 lp->netdev->pb->frames = 0;
                 lp->netdev->pb->seq = UINT_MAX;
         }
@@ -1583,29 +1581,28 @@ static int isdn_ppp_mp_init( isdn_net_local * lp, ippp_bundle * add_to )
 
 static u32 isdn_ppp_mp_get_seq( int short_seq, 
                                         struct sk_buff * skb, u32 last_seq );
-static void isdn_ppp_mp_discard(ippp_bundle *mp, struct sk_buff *from,
-                                struct sk_buff *to);
-static void isdn_ppp_mp_reassembly(isdn_net_dev *net_dev, isdn_net_local *lp,
-                                   struct sk_buff *from, struct sk_buff *to,
-                                   u32 lastseq);
-static void isdn_ppp_mp_free_skb(ippp_bundle *mp, struct sk_buff *skb);
+static struct sk_buff * isdn_ppp_mp_discard( ippp_bundle * mp,
+                        struct sk_buff * from, struct sk_buff * to );
+static void isdn_ppp_mp_reassembly( isdn_net_dev * net_dev, isdn_net_local * lp,
+                                struct sk_buff * from, struct sk_buff * to );
+static void isdn_ppp_mp_free_skb( ippp_bundle * mp, struct sk_buff * skb );
 static void isdn_ppp_mp_print_recv_pkt( int slot, struct sk_buff * skb );
 
 static void isdn_ppp_mp_receive(isdn_net_dev * net_dev, isdn_net_local * lp, 
-                                struct sk_buff *skb)
+                                                        struct sk_buff *skb)
 {
-        struct sk_buff *newfrag, *frag, *start, *nextf;
-        u32 newseq, minseq, thisseq;
-        isdn_mppp_stats *stats;
         struct ippp_struct *is;
+        isdn_net_local * lpq;
+        ippp_bundle * mp;
+        isdn_mppp_stats * stats;
+        struct sk_buff * newfrag, * frag, * start, *nextf;
+        u32 newseq, minseq, thisseq;
         unsigned long flags;
-        isdn_net_local *lpq;
-        ippp_bundle *mp;
         int slot;
 
         spin_lock_irqsave(&net_dev->pb->lock, flags);
-        mp = net_dev->pb;
-        stats = &mp->stats;
+        mp = net_dev->pb;
+        stats = &mp->stats;
         slot = lp->ppp_slot;
         if (slot < 0 || slot >= ISDN_MAX_CHANNELS) {
                 printk(KERN_ERR "%s: lp->ppp_slot(%d)\n",
@@ -1616,19 +1613,20 @@ static void isdn_ppp_mp_receive(isdn_net_dev * net_dev, isdn_net_local * lp,
                 return;
         }
         is = ippp_table[slot];
-        if (++mp->frames > stats->max_queue_len)
+        if( ++mp->frames > stats->max_queue_len )
                 stats->max_queue_len = mp->frames;
-
+        
         if (is->debug & 0x8)
                 isdn_ppp_mp_print_recv_pkt(lp->ppp_slot, skb);
 
-        newseq = isdn_ppp_mp_get_seq(is->mpppcfg & SC_IN_SHORT_SEQ,
-                                     skb, is->last_link_seqno);
+        newseq = isdn_ppp_mp_get_seq(is->mpppcfg & SC_IN_SHORT_SEQ, 
+                                                skb, is->last_link_seqno);
+
 
         /* if this packet seq # is less than last already processed one,
          * toss it right away, but check for sequence start case first 
          */
-        if (mp->seq > MP_LONGSEQ_MAX && (newseq & MP_LONGSEQ_MAXBIT)) {
+        if( mp->seq > MP_LONGSEQ_MAX && (newseq & MP_LONGSEQ_MAXBIT) ) {
                 mp->seq = newseq;       /* the first packet: required for
                                          * rfc1990 non-compliant clients --
                                          * prevents constant packet toss */
@@ -1638,7 +1636,7 @@ static void isdn_ppp_mp_receive(isdn_net_dev * net_dev, isdn_net_local * lp,
                 spin_unlock_irqrestore(&mp->lock, flags);
                 return;
         }
-
+        
         /* find the minimum received sequence number over all links */
         is->last_link_seqno = minseq = newseq;
         for (lpq = net_dev->queue;;) {
@@ -1659,31 +1657,22 @@ static void isdn_ppp_mp_receive(isdn_net_dev * net_dev, isdn_net_local * lp,
                                          * packets */
         newfrag = skb;
 
-        /* Insert new fragment into the proper sequence slot.  */
-        skb_queue_walk(&mp->frags, frag) {
-                if (MP_SEQ(frag) == newseq) {
-                        isdn_ppp_mp_free_skb(mp, newfrag);
-                        newfrag = NULL;
-                        break;
-                }
-                if (MP_LT(newseq, MP_SEQ(frag))) {
-                        __skb_queue_before(&mp->frags, frag, newfrag);
-                        newfrag = NULL;
-                        break;
-                }
-        }
-        if (newfrag)
-                __skb_queue_tail(&mp->frags, newfrag);
+        /* if this new fragment is before the first one, then enqueue it now. */
+        if ((frag = mp->frags) == NULL || MP_LT(newseq, MP_SEQ(frag))) {
+                newfrag->next = frag;
+                mp->frags = frag = newfrag;
+                newfrag = NULL;
+        }
 
-        frag = skb_peek(&mp->frags);
-        start = ((MP_FLAGS(frag) & MP_BEGIN_FRAG) &&
-                 (MP_SEQ(frag) == mp->seq)) ? frag : NULL;
-        if (!start)
-                goto check_overflow;
+        start = MP_FLAGS(frag) & MP_BEGIN_FRAG &&
+                                MP_SEQ(frag) == mp->seq ? frag : NULL;
 
-        /* main fragment traversing loop
+        /* 
+         * main fragment traversing loop
          *
          * try to accomplish several tasks:
+         * - insert new fragment into the proper sequence slot (once that's done
+         *   newfrag will be set to NULL)
          * - reassemble any complete fragment sequence (non-null 'start'
          *   indicates there is a continguous sequence present)
          * - discard any incomplete sequences that are below minseq -- due
@@ -1692,46 +1681,71 @@ static void isdn_ppp_mp_receive(isdn_net_dev * net_dev, isdn_net_local * lp,
          *   come to complete such sequence and it should be discarded
          *
          * loop completes when we accomplished the following tasks:
+         * - new fragment is inserted in the proper sequence ('newfrag' is 
+         *   set to NULL)
          * - we hit a gap in the sequence, so no reassembly/processing is 
          *   possible ('start' would be set to NULL)
          *
          * algorithm for this code is derived from code in the book
          * 'PPP Design And Debugging' by James Carlson (Addison-Wesley)
          */
-        skb_queue_walk_safe(&mp->frags, frag, nextf) {
-                thisseq = MP_SEQ(frag);
-
-                /* check for misplaced start */
-                if (start != frag && (MP_FLAGS(frag) & MP_BEGIN_FRAG)) {
-                        printk(KERN_WARNING"isdn_mppp(seq %d): new "
-                               "BEGIN flag with no prior END", thisseq);
-                        stats->seqerrs++;
-                        stats->frame_drops++;
-                        isdn_ppp_mp_discard(mp, start, frag);
-                        start = frag;
-                } else if (MP_LE(thisseq, minseq)) {            
-                        if (MP_FLAGS(frag) & MP_BEGIN_FRAG)
+        while (start != NULL || newfrag != NULL) {
+
+                thisseq = MP_SEQ(frag);
+                nextf = frag->next;
+
+                /* drop any duplicate fragments */
+                if (newfrag != NULL && thisseq == newseq) {
+                        isdn_ppp_mp_free_skb(mp, newfrag);
+                        newfrag = NULL;
+                }
+
+                /* insert new fragment before next element if possible. */
+                if (newfrag != NULL && (nextf == NULL || 
+                                                MP_LT(newseq, MP_SEQ(nextf)))) {
+                        newfrag->next = nextf;
+                        frag->next = nextf = newfrag;
+                        newfrag = NULL;
+                }
+
+                if (start != NULL) {
+                        /* check for misplaced start */
+                        if (start != frag && (MP_FLAGS(frag) & MP_BEGIN_FRAG)) {
+                                printk(KERN_WARNING"isdn_mppp(seq %d): new "
+                                      "BEGIN flag with no prior END", thisseq);
+                                stats->seqerrs++;
+                                stats->frame_drops++;
+                                start = isdn_ppp_mp_discard(mp, start,frag);
+                                nextf = frag->next;
+                        }
+                } else if (MP_LE(thisseq, minseq)) {            
+                        if (MP_FLAGS(frag) & MP_BEGIN_FRAG)
                                 start = frag;
-                        else {
+                        else {
                                 if (MP_FLAGS(frag) & MP_END_FRAG)
-                                        stats->frame_drops++;
-                                __skb_unlink(skb, &mp->frags);
+                                        stats->frame_drops++;
+                                if( mp->frags == frag )
+                                        mp->frags = nextf;      
                                 isdn_ppp_mp_free_skb(mp, frag);
+                                frag = nextf;
                                 continue;
-                        }
+                        }
                 }
-
-                /* if we have end fragment, then we have full reassembly
-                 * sequence -- reassemble and process packet now
+                
+                /* if start is non-null and we have end fragment, then
+                 * we have full reassembly sequence -- reassemble 
+                 * and process packet now
                  */
-                if (MP_FLAGS(frag) & MP_END_FRAG) {
-                        minseq = mp->seq = (thisseq+1) & MP_LONGSEQ_MASK;
-                        /* Reassemble the packet then dispatch it */
-                        isdn_ppp_mp_reassembly(net_dev, lp, start, frag, thisseq);
+                if (start != NULL && (MP_FLAGS(frag) & MP_END_FRAG)) {
+                        minseq = mp->seq = (thisseq+1) & MP_LONGSEQ_MASK;
+                        /* Reassemble the packet then dispatch it */
+                        isdn_ppp_mp_reassembly(net_dev, lp, start, nextf);
+      
+                        start = NULL;
+                        frag = NULL;
 
-                        start = NULL;
-                        frag = NULL;
-                }
+                        mp->frags = nextf;
+                }
 
                 /* check if need to update start pointer: if we just
                  * reassembled the packet and sequence is contiguous
@@ -1742,25 +1756,26 @@ static void isdn_ppp_mp_receive(isdn_net_dev * net_dev, isdn_net_local * lp,
                  * below low watermark and set start to the next frag or
                  * clear start ptr.
                  */ 
-                if (nextf != (struct sk_buff *)&mp->frags && 
+                if (nextf != NULL && 
                     ((thisseq+1) & MP_LONGSEQ_MASK) == MP_SEQ(nextf)) {
-                        /* if we just reassembled and the next one is here, 
-                         * then start another reassembly.
-                         */
-                        if (frag == NULL) {
+                        /* if we just reassembled and the next one is here, 
+                         * then start another reassembly. */
+
+                        if (frag == NULL) {
                                 if (MP_FLAGS(nextf) & MP_BEGIN_FRAG)
-                                        start = nextf;
-                                else {
-                                        printk(KERN_WARNING"isdn_mppp(seq %d):"
-                                               " END flag with no following "
-                                               "BEGIN", thisseq);
+                                        start = nextf;
+                                else
+                                {
+                                        printk(KERN_WARNING"isdn_mppp(seq %d):"
+                                                " END flag with no following "
+                                                "BEGIN", thisseq);
                                         stats->seqerrs++;
                                 }
                         }
-                } else {
-                        if (nextf != (struct sk_buff *)&mp->frags &&
-                            frag != NULL &&
-                            MP_LT(thisseq, minseq)) {
+
+                } else {
+                        if ( nextf != NULL && frag != NULL &&
+                                                MP_LT(thisseq, minseq)) {
                                 /* we've got a break in the sequence
                                  * and we not at the end yet
                                  * and we did not just reassembled
@@ -1769,39 +1784,41 @@ static void isdn_ppp_mp_receive(isdn_net_dev * net_dev, isdn_net_local * lp,
                                  * discard all the frames below low watermark 
                                  * and start over */
                                 stats->frame_drops++;
-                                isdn_ppp_mp_discard(mp, start, nextf);
+                                mp->frags = isdn_ppp_mp_discard(mp,start,nextf);
                         }
                         /* break in the sequence, no reassembly */
-                        start = NULL;
-                }
-                if (!start)
-                        break;
-        }
-
-check_overflow:
+                        start = NULL;
+                }
+                                
+                frag = nextf;
+        }       /* while -- main loop */
+        
+        if (mp->frags == NULL)
+                mp->frags = frag;
+                
         /* rather straighforward way to deal with (not very) possible 
-         * queue overflow
-         */
+         * queue overflow */
         if (mp->frames > MP_MAX_QUEUE_LEN) {
                 stats->overflows++;
-                skb_queue_walk_safe(&mp->frags, frag, nextf) {
-                        if (mp->frames <= MP_MAX_QUEUE_LEN)
-                                break;
-                        __skb_unlink(frag, &mp->frags);
-                        isdn_ppp_mp_free_skb(mp, frag);
+                while (mp->frames > MP_MAX_QUEUE_LEN) {
+                        frag = mp->frags->next;
+                        isdn_ppp_mp_free_skb(mp, mp->frags);
+                        mp->frags = frag;
                 }
         }
         spin_unlock_irqrestore(&mp->lock, flags);
 }
 
-static void isdn_ppp_mp_cleanup(isdn_net_local *lp)
+static void isdn_ppp_mp_cleanup( isdn_net_local * lp )
 {
-        struct sk_buff *skb, *tmp;
-
-        skb_queue_walk_safe(&lp->netdev->pb->frags, skb, tmp) {
-                __skb_unlink(skb, &lp->netdev->pb->frags);
-                isdn_ppp_mp_free_skb(lp->netdev->pb, skb);
-        }
+        struct sk_buff * frag = lp->netdev->pb->frags;
+        struct sk_buff * nextfrag;
+        while( frag ) {
+                nextfrag = frag->next;
+                isdn_ppp_mp_free_skb(lp->netdev->pb, frag);
+                frag = nextfrag;
+        }
+        lp->netdev->pb->frags = NULL;
 }
 
 static u32 isdn_ppp_mp_get_seq( int short_seq, 
@@ -1838,115 +1855,72 @@ static u32 isdn_ppp_mp_get_seq( int short_seq,
         return seq;
 }
 
-static void isdn_ppp_mp_discard(ippp_bundle *mp, struct sk_buff *from,
-                                struct sk_buff *to)
+struct sk_buff * isdn_ppp_mp_discard( ippp_bundle * mp,
+                        struct sk_buff * from, struct sk_buff * to )
 {
-        if (from) {
-                struct sk_buff *skb, *tmp;
-                int freeing = 0;
-
-                skb_queue_walk_safe(&mp->frags, skb, tmp) {
-                        if (skb == to)
-                                break;
-                        if (skb == from)
-                                freeing = 1;
-                        if (!freeing)
-                                continue;
-                        __skb_unlink(skb, &mp->frags);
-                        isdn_ppp_mp_free_skb(mp, skb);
+        if( from )
+                while (from != to) {
+                        struct sk_buff * next = from->next;
+                        isdn_ppp_mp_free_skb(mp, from);
+                        from = next;
                 }
-        }
-}
-
-static unsigned int calc_tot_len(struct sk_buff_head *queue,
-                                 struct sk_buff *from, struct sk_buff *to)
-{
-        unsigned int tot_len = 0;
-        struct sk_buff *skb;
-        int found_start = 0;
-
-        skb_queue_walk(queue, skb) {
-                if (skb == from)
-                        found_start = 1;
-                if (!found_start)
-                        continue;
-                tot_len += skb->len - MP_HEADER_LEN;
-                if (skb == to)
-                        break;
-        }
-        return tot_len;
+        return from;
 }
 
-/* Reassemble packet using fragments in the reassembly queue from
- * 'from' until 'to', inclusive.
- */
-static void isdn_ppp_mp_reassembly(isdn_net_dev *net_dev, isdn_net_local *lp,
-                                   struct sk_buff *from, struct sk_buff *to,
-                                   u32 lastseq)
+void isdn_ppp_mp_reassembly( isdn_net_dev * net_dev, isdn_net_local * lp,
+                                struct sk_buff * from, struct sk_buff * to )
 {
-        ippp_bundle *mp = net_dev->pb;
-        unsigned int tot_len;
-        struct sk_buff *skb;
+        ippp_bundle * mp = net_dev->pb;
         int proto;
+        struct sk_buff * skb;
+        unsigned int tot_len;
 
         if (lp->ppp_slot < 0 || lp->ppp_slot >= ISDN_MAX_CHANNELS) {
                 printk(KERN_ERR "%s: lp->ppp_slot(%d) out of range\n",
                         __func__, lp->ppp_slot);
                 return;
         }
-
-        tot_len = calc_tot_len(&mp->frags, from, to);
-
-        if (MP_FLAGS(from) == (MP_BEGIN_FRAG | MP_END_FRAG)) {
-                if (ippp_table[lp->ppp_slot]->debug & 0x40)
+        if( MP_FLAGS(from) == (MP_BEGIN_FRAG | MP_END_FRAG) ) {
+                if( ippp_table[lp->ppp_slot]->debug & 0x40 )
                         printk(KERN_DEBUG "isdn_mppp: reassembly: frame %d, "
-                               "len %d\n", MP_SEQ(from), from->len);
+                                        "len %d\n", MP_SEQ(from), from->len );
                 skb = from;
                 skb_pull(skb, MP_HEADER_LEN);
-                __skb_unlink(skb, &mp->frags);
                 mp->frames--;   
         } else {
-                struct sk_buff *walk, *tmp;
-                int found_start = 0;
+                struct sk_buff * frag;
+                int n;
 
-                if (ippp_table[lp->ppp_slot]->debug & 0x40)
-                        printk(KERN_DEBUG"isdn_mppp: reassembling frames %d "
-                               "to %d, len %d\n", MP_SEQ(from), lastseq,
-                               tot_len);
+                for(tot_len=n=0, frag=from; frag != to; frag=frag->next, n++)
+                        tot_len += frag->len - MP_HEADER_LEN;
 
-                skb = dev_alloc_skb(tot_len);
-                if (!skb)
+                if( ippp_table[lp->ppp_slot]->debug & 0x40 )
+                        printk(KERN_DEBUG"isdn_mppp: reassembling frames %d "
+                                "to %d, len %d\n", MP_SEQ(from), 
+                                (MP_SEQ(from)+n-1) & MP_LONGSEQ_MASK, tot_len );
+                if( (skb = dev_alloc_skb(tot_len)) == NULL ) {
                         printk(KERN_ERR "isdn_mppp: cannot allocate sk buff "
-                               "of size %d\n", tot_len);
-
-                found_start = 0;
-                skb_queue_walk_safe(&mp->frags, walk, tmp) {
-                        if (walk == from)
-                                found_start = 1;
-                        if (!found_start)
-                                continue;
+                                        "of size %d\n", tot_len);
+                        isdn_ppp_mp_discard(mp, from, to);
+                        return;
+                }
 
-                        if (skb) {
-                                unsigned int len = walk->len - MP_HEADER_LEN;
-                                skb_copy_from_linear_data_offset(walk, MP_HEADER_LEN,
-                                                                 skb_put(skb, len),
-                                                                 len);
-                        }
-                        __skb_unlink(walk, &mp->frags);
-                        isdn_ppp_mp_free_skb(mp, walk);
+                while( from != to ) {
+                        unsigned int len = from->len - MP_HEADER_LEN;
 
-                        if (walk == to)
-                                break;
+                        skb_copy_from_linear_data_offset(from, MP_HEADER_LEN,
+                                                         skb_put(skb,len),
+                                                         len);
+                        frag = from->next;
+                        isdn_ppp_mp_free_skb(mp, from);
+                        from = frag; 
                 }
         }
-        if (!skb)
-                return;
-
         proto = isdn_ppp_strip_proto(skb);
         isdn_ppp_push_higher(net_dev, lp, skb, proto);
 }
 
-static void isdn_ppp_mp_free_skb(ippp_bundle *mp, struct sk_buff *skb)
+static void isdn_ppp_mp_free_skb(ippp_bundle * mp, struct sk_buff * skb)
 {
         dev_kfree_skb(skb);
         mp->frames--;
diff --git a/drivers/misc/iwmc3200top/main.c b/drivers/misc/iwmc3200top/main.c
index 6e4e49113ab..02b3dadc8ab 100644
--- a/drivers/misc/iwmc3200top/main.c
+++ b/drivers/misc/iwmc3200top/main.c
@@ -41,36 +41,13 @@
 #define DRIVER_DESCRIPTION "Intel(R) IWMC 3200 Top Driver"
 #define DRIVER_COPYRIGHT "Copyright (c) 2008 Intel Corporation."
 
-#define IWMCT_VERSION "0.1.62"
-
-#ifdef REPOSITORY_LABEL
-#define RL REPOSITORY_LABEL
-#else
-#define RL local
-#endif
-
-#ifdef CONFIG_IWMC3200TOP_DEBUG
-#define VD "-d"
-#else
-#define VD
-#endif
-
-#define DRIVER_VERSION IWMCT_VERSION "-"  __stringify(RL) VD
+#define DRIVER_VERSION  "0.1.62"
 
 MODULE_DESCRIPTION(DRIVER_DESCRIPTION);
 MODULE_VERSION(DRIVER_VERSION);
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR(DRIVER_COPYRIGHT);
 
-
-/* FIXME: These can be found in sdio_ids.h in newer kernels */
-#ifndef SDIO_INTEL_VENDOR_ID
-#define SDIO_INTEL_VENDOR_ID                    0x0089
-#endif
-#ifndef SDIO_DEVICE_ID_INTEL_IWMC3200TOP
-#define SDIO_DEVICE_ID_INTEL_IWMC3200TOP        0x1404
-#endif
-
 /*
  * This workers main task is to wait for OP_OPR_ALIVE
  * from TOP FW until ALIVE_MSG_TIMOUT timeout is elapsed.
@@ -662,8 +639,9 @@ static void iwmct_remove(struct sdio_func *func)
 
 
 static const struct sdio_device_id iwmct_ids[] = {
-        { SDIO_DEVICE(SDIO_INTEL_VENDOR_ID, SDIO_DEVICE_ID_INTEL_IWMC3200TOP)},
-        { /* end: all zeroes */ },
+        /* Intel Wireless MultiCom 3200 Top Driver */
+        { SDIO_DEVICE(SDIO_VENDOR_ID_INTEL, 0x1404)},
+        { },    /* Terminating entry */
 };
 
 MODULE_DEVICE_TABLE(sdio, iwmct_ids);
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index e012c2e0825..6399abbdad6 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -3235,7 +3235,7 @@ config VIRTIO_NET
 
 config VMXNET3
        tristate "VMware VMXNET3 ethernet driver"
-       depends on PCI && X86 && INET
+       depends on PCI && INET
        help
          This driver supports VMware's vmxnet3 virtual ethernet NIC.
          To compile this driver as a module, choose M here: the
diff --git a/drivers/net/arm/ks8695net.c b/drivers/net/arm/ks8695net.c
index 0073d198715..be256b34cea 100644
--- a/drivers/net/arm/ks8695net.c
+++ b/drivers/net/arm/ks8695net.c
@@ -433,24 +433,16 @@ ks8695_rx_irq(int irq, void *dev_id)
 {
         struct net_device *ndev = (struct net_device *)dev_id;
         struct ks8695_priv *ksp = netdev_priv(ndev);
-        unsigned long status;
-
-        unsigned long mask_bit = 1 << ks8695_get_rx_enable_bit(ksp);
 
         spin_lock(&ksp->rx_lock);
 
-        status = readl(KS8695_IRQ_VA + KS8695_INTST);
-
-        /*clean rx status bit*/
-        writel(status | mask_bit , KS8695_IRQ_VA + KS8695_INTST);
-
-        if (status & mask_bit) {
-                if (napi_schedule_prep(&ksp->napi)) {
-                        /*disable rx interrupt*/
-                        status &= ~mask_bit;
-                        writel(status , KS8695_IRQ_VA + KS8695_INTEN);
-                        __napi_schedule(&ksp->napi);
-                }
+        if (napi_schedule_prep(&ksp->napi)) {
+                unsigned long status = readl(KS8695_IRQ_VA + KS8695_INTEN);
+                unsigned long mask_bit = 1 << ks8695_get_rx_enable_bit(ksp);
+                /*disable rx interrupt*/
+                status &= ~mask_bit;
+                writel(status , KS8695_IRQ_VA + KS8695_INTEN);
+                __napi_schedule(&ksp->napi);
         }
 
         spin_unlock(&ksp->rx_lock);
@@ -552,14 +544,13 @@ rx_finished:
                                 ksp->next_rx_desc_read =
                                         (last_rx_processed + 1) &
                                         MAX_RX_DESC_MASK;
-
-                        /* And refill the buffers */
-                        ks8695_refill_rxbuffers(ksp);
-
-                        /* Kick the RX DMA engine, in case it became
-                         *  suspended */
-                        ks8695_writereg(ksp, KS8695_DRSC, 0);
         }
+        /* And refill the buffers */
+        ks8695_refill_rxbuffers(ksp);
+
+        /* Kick the RX DMA engine, in case it became
+         *  suspended */
+        ks8695_writereg(ksp, KS8695_DRSC, 0);
         return received;
 }
 
diff --git a/drivers/net/arm/w90p910_ether.c b/drivers/net/arm/w90p910_ether.c
index 25e2627eb11..b7f3866d546 100644
--- a/drivers/net/arm/w90p910_ether.c
+++ b/drivers/net/arm/w90p910_ether.c
@@ -160,8 +160,8 @@ struct  w90p910_ether {
         struct mii_if_info mii;
         struct timer_list check_timer;
         void __iomem *reg;
-        unsigned int rxirq;
-        unsigned int txirq;
+        int rxirq;
+        int txirq;
         unsigned int cur_tx;
         unsigned int cur_rx;
         unsigned int finish_tx;
diff --git a/drivers/net/atl1c/atl1c_main.c b/drivers/net/atl1c/atl1c_main.c
index 5ef9e23435f..1e2f57d4c36 100644
--- a/drivers/net/atl1c/atl1c_main.c
+++ b/drivers/net/atl1c/atl1c_main.c
@@ -2135,7 +2135,7 @@ static int atl1c_request_irq(struct atl1c_adapter *adapter)
 
         if (!adapter->have_msi)
                 flags |= IRQF_SHARED;
-        err = request_irq(adapter->pdev->irq, &atl1c_intr, flags,
+        err = request_irq(adapter->pdev->irq, atl1c_intr, flags,
                         netdev->name, netdev);
         if (err) {
                 if (netif_msg_ifup(adapter))
diff --git a/drivers/net/bnx2x.h b/drivers/net/bnx2x.h
index 928942b74ce..602ab86b639 100644
--- a/drivers/net/bnx2x.h
+++ b/drivers/net/bnx2x.h
@@ -259,9 +259,6 @@ struct bnx2x_eth_q_stats {
 struct bnx2x_fastpath {
 
         struct napi_struct      napi;
-
-        u8                      is_rx_queue;
-
         struct host_status_block *status_blk;
         dma_addr_t              status_blk_mapping;
 
@@ -970,8 +967,7 @@ struct bnx2x {
 #define BNX2X_STATE_ERROR               0xf000
 
         int                     multi_mode;
-        int                     num_rx_queues;
-        int                     num_tx_queues;
+        int                     num_queues;
 
         u32                     rx_mode;
 #define BNX2X_RX_MODE_NONE              0
@@ -1074,20 +1070,15 @@ struct bnx2x {
 };
 
 
-#define BNX2X_MAX_QUEUES(bp)    (IS_E1HMF(bp) ? (MAX_CONTEXT/(2 * E1HVN_MAX)) \
-                                              : (MAX_CONTEXT/2))
-#define BNX2X_NUM_QUEUES(bp)    (bp->num_rx_queues + bp->num_tx_queues)
-#define is_multi(bp)            (BNX2X_NUM_QUEUES(bp) > 2)
+#define BNX2X_MAX_QUEUES(bp)    (IS_E1HMF(bp) ? (MAX_CONTEXT/E1HVN_MAX) \
+                                              : MAX_CONTEXT)
+#define BNX2X_NUM_QUEUES(bp)    (bp->num_queues)
+#define is_multi(bp)            (BNX2X_NUM_QUEUES(bp) > 1)
 
-#define for_each_rx_queue(bp, var) \
-                        for (var = 0; var < bp->num_rx_queues; var++)
-#define for_each_tx_queue(bp, var) \
-                        for (var = bp->num_rx_queues; \
-                             var < BNX2X_NUM_QUEUES(bp); var++)
 #define for_each_queue(bp, var) \
                         for (var = 0; var < BNX2X_NUM_QUEUES(bp); var++)
 #define for_each_nondefault_queue(bp, var) \
-                        for (var = 1; var < bp->num_rx_queues; var++)
+                        for (var = 1; var < BNX2X_NUM_QUEUES(bp); var++)
 
 
 void bnx2x_read_dmae(struct bnx2x *bp, u32 src_addr, u32 len32);
diff --git a/drivers/net/bnx2x_main.c b/drivers/net/bnx2x_main.c
index e2cf686d111..77ba13520d8 100644
--- a/drivers/net/bnx2x_main.c
+++ b/drivers/net/bnx2x_main.c
@@ -57,7 +57,7 @@
 #include "bnx2x_init_ops.h"
 #include "bnx2x_dump.h"
 
-#define DRV_MODULE_VERSION      "1.52.1-4"
+#define DRV_MODULE_VERSION      "1.52.1-5"
 #define DRV_MODULE_RELDATE      "2009/11/09"
 #define BNX2X_BC_VER            0x040200
 
@@ -91,15 +91,10 @@ module_param(multi_mode, int, 0);
 MODULE_PARM_DESC(multi_mode, " Multi queue mode "
                              "(0 Disable; 1 Enable (default))");
 
-static int num_rx_queues;
-module_param(num_rx_queues, int, 0);
-MODULE_PARM_DESC(num_rx_queues, " Number of Rx queues for multi_mode=1"
-                                " (default is half number of CPUs)");
-
-static int num_tx_queues;
-module_param(num_tx_queues, int, 0);
-MODULE_PARM_DESC(num_tx_queues, " Number of Tx queues for multi_mode=1"
-                                " (default is half number of CPUs)");
+static int num_queues;
+module_param(num_queues, int, 0);
+MODULE_PARM_DESC(num_queues, " Number of queues for multi_mode=1"
+                                " (default is as a number of CPUs)");
 
 static int disable_tpa;
 module_param(disable_tpa, int, 0);
@@ -558,7 +553,7 @@ static void bnx2x_panic_dump(struct bnx2x *bp)
                   bp->def_att_idx, bp->attn_state, bp->spq_prod_idx);
 
         /* Rx */
-        for_each_rx_queue(bp, i) {
+        for_each_queue(bp, i) {
                 struct bnx2x_fastpath *fp = &bp->fp[i];
 
                 BNX2X_ERR("fp%d: rx_bd_prod(%x)  rx_bd_cons(%x)"
@@ -575,7 +570,7 @@ static void bnx2x_panic_dump(struct bnx2x *bp)
         }
 
         /* Tx */
-        for_each_tx_queue(bp, i) {
+        for_each_queue(bp, i) {
                 struct bnx2x_fastpath *fp = &bp->fp[i];
 
                 BNX2X_ERR("fp%d: tx_pkt_prod(%x)  tx_pkt_cons(%x)"
@@ -590,7 +585,7 @@ static void bnx2x_panic_dump(struct bnx2x *bp)
 
         /* Rings */
         /* Rx */
-        for_each_rx_queue(bp, i) {
+        for_each_queue(bp, i) {
                 struct bnx2x_fastpath *fp = &bp->fp[i];
 
                 start = RX_BD(le16_to_cpu(*fp->rx_cons_sb) - 10);
@@ -624,7 +619,7 @@ static void bnx2x_panic_dump(struct bnx2x *bp)
         }
 
         /* Tx */
-        for_each_tx_queue(bp, i) {
+        for_each_queue(bp, i) {
                 struct bnx2x_fastpath *fp = &bp->fp[i];
 
                 start = TX_BD(le16_to_cpu(*fp->tx_cons_sb) - 10);
@@ -792,21 +787,13 @@ static inline void bnx2x_ack_sb(struct bnx2x *bp, u8 sb_id,
         barrier();
 }
 
-static inline u16 bnx2x_update_fpsb_idx(struct bnx2x_fastpath *fp)
+static inline void bnx2x_update_fpsb_idx(struct bnx2x_fastpath *fp)
 {
         struct host_status_block *fpsb = fp->status_blk;
-        u16 rc = 0;
 
         barrier(); /* status block is written to by the chip */
-        if (fp->fp_c_idx != fpsb->c_status_block.status_block_index) {
-                fp->fp_c_idx = fpsb->c_status_block.status_block_index;
-                rc |= 1;
-        }
-        if (fp->fp_u_idx != fpsb->u_status_block.status_block_index) {
-                fp->fp_u_idx = fpsb->u_status_block.status_block_index;
-                rc |= 2;
-        }
-        return rc;
+        fp->fp_c_idx = fpsb->c_status_block.status_block_index;
+        fp->fp_u_idx = fpsb->u_status_block.status_block_index;
 }
 
 static u16 bnx2x_ack_int(struct bnx2x *bp)
@@ -846,6 +833,9 @@ static u16 bnx2x_free_tx_pkt(struct bnx2x *bp, struct bnx2x_fastpath *fp,
         u16 bd_idx = TX_BD(tx_buf->first_bd), new_cons;
         int nbd;
 
+        /* prefetch skb end pointer to speedup dev_kfree_skb() */
+        prefetch(&skb->end);
+
         DP(BNX2X_MSG_OFF, "pkt_idx %d  buff @(%p)->skb %p\n",
            idx, tx_buf, skb);
 
@@ -890,7 +880,7 @@ static u16 bnx2x_free_tx_pkt(struct bnx2x *bp, struct bnx2x_fastpath *fp,
 
         /* release skb */
         WARN_ON(!skb);
-        dev_kfree_skb_any(skb);
+        dev_kfree_skb(skb);
         tx_buf->first_bd = 0;
         tx_buf->skb = NULL;
 
@@ -920,19 +910,28 @@ static inline u16 bnx2x_tx_avail(struct bnx2x_fastpath *fp)
         return (s16)(fp->bp->tx_ring_size) - used;
 }
 
-static void bnx2x_tx_int(struct bnx2x_fastpath *fp)
+static inline int bnx2x_has_tx_work(struct bnx2x_fastpath *fp)
+{
+        u16 hw_cons;
+
+        /* Tell compiler that status block fields can change */
+        barrier();
+        hw_cons = le16_to_cpu(*fp->tx_cons_sb);
+        return hw_cons != fp->tx_pkt_cons;
+}
+
+static int bnx2x_tx_int(struct bnx2x_fastpath *fp)
 {
         struct bnx2x *bp = fp->bp;
         struct netdev_queue *txq;
         u16 hw_cons, sw_cons, bd_cons = fp->tx_bd_cons;
-        int done = 0;
 
 #ifdef BNX2X_STOP_ON_ERROR
         if (unlikely(bp->panic))
-                return;
+                return -1;
 #endif
 
-        txq = netdev_get_tx_queue(bp->dev, fp->index - bp->num_rx_queues);
+        txq = netdev_get_tx_queue(bp->dev, fp->index);
         hw_cons = le16_to_cpu(*fp->tx_cons_sb);
         sw_cons = fp->tx_pkt_cons;
 
@@ -953,7 +952,6 @@ static void bnx2x_tx_int(struct bnx2x_fastpath *fp)
 */
                 bd_cons = bnx2x_free_tx_pkt(bp, fp, pkt_cons);
                 sw_cons++;
-                done++;
         }
 
         fp->tx_pkt_cons = sw_cons;
@@ -975,6 +973,7 @@ static void bnx2x_tx_int(struct bnx2x_fastpath *fp)
                     (bnx2x_tx_avail(fp) >= MAX_SKB_FRAGS + 3))
                         netif_tx_wake_queue(txq);
         }
+        return 0;
 }
 
 #ifdef BCM_CNIC
@@ -1561,6 +1560,8 @@ static int bnx2x_rx_int(struct bnx2x_fastpath *fp, int budget)
                 } else {
                         rx_buf = &fp->rx_buf_ring[bd_cons];
                         skb = rx_buf->skb;
+                        prefetch(skb);
+                        prefetch((u8 *)skb + 256);
                         len = le16_to_cpu(cqe->fast_path_cqe.pkt_len);
                         pad = cqe->fast_path_cqe.placement_offset;
 
@@ -1742,27 +1743,13 @@ static irqreturn_t bnx2x_msix_fp_int(int irq, void *fp_cookie)
         if (unlikely(bp->panic))
                 return IRQ_HANDLED;
 #endif
-        /* Handle Rx or Tx according to MSI-X vector */
-        if (fp->is_rx_queue) {
-                prefetch(fp->rx_cons_sb);
-                prefetch(&fp->status_blk->u_status_block.status_block_index);
-
-                napi_schedule(&bnx2x_fp(bp, fp->index, napi));
-
-        } else {
-                prefetch(fp->tx_cons_sb);
-                prefetch(&fp->status_blk->c_status_block.status_block_index);
-
-                bnx2x_update_fpsb_idx(fp);
-                rmb();
-                bnx2x_tx_int(fp);
 
-                /* Re-enable interrupts */
-                bnx2x_ack_sb(bp, fp->sb_id, USTORM_ID,
-                             le16_to_cpu(fp->fp_u_idx), IGU_INT_NOP, 1);
-                bnx2x_ack_sb(bp, fp->sb_id, CSTORM_ID,
-                             le16_to_cpu(fp->fp_c_idx), IGU_INT_ENABLE, 1);
-        }
+        /* Handle Rx and Tx according to MSI-X vector */
+        prefetch(fp->rx_cons_sb);
+        prefetch(fp->tx_cons_sb);
+        prefetch(&fp->status_blk->u_status_block.status_block_index);
+        prefetch(&fp->status_blk->c_status_block.status_block_index);
+        napi_schedule(&bnx2x_fp(bp, fp->index, napi));
 
         return IRQ_HANDLED;
 }
@@ -1797,31 +1784,14 @@ static irqreturn_t bnx2x_interrupt(int irq, void *dev_instance)
 
                 mask = 0x2 << fp->sb_id;
                 if (status & mask) {
-                        /* Handle Rx or Tx according to SB id */
-                        if (fp->is_rx_queue) {
-                                prefetch(fp->rx_cons_sb);
-                                prefetch(&fp->status_blk->u_status_block.
-                                                        status_block_index);
-
-                                napi_schedule(&bnx2x_fp(bp, fp->index, napi));
-
-                        } else {
-                                prefetch(fp->tx_cons_sb);
-                                prefetch(&fp->status_blk->c_status_block.
-                                                        status_block_index);
-
-                                bnx2x_update_fpsb_idx(fp);
-                                rmb();
-                                bnx2x_tx_int(fp);
-
-                                /* Re-enable interrupts */
-                                bnx2x_ack_sb(bp, fp->sb_id, USTORM_ID,
-                                             le16_to_cpu(fp->fp_u_idx),
-                                             IGU_INT_NOP, 1);
-                                bnx2x_ack_sb(bp, fp->sb_id, CSTORM_ID,
-                                             le16_to_cpu(fp->fp_c_idx),
-                                             IGU_INT_ENABLE, 1);
-                        }
+                        /* Handle Rx and Tx according to SB id */
+                        prefetch(fp->rx_cons_sb);
+                        prefetch(&fp->status_blk->u_status_block.
+                                                status_block_index);
+                        prefetch(fp->tx_cons_sb);
+                        prefetch(&fp->status_blk->c_status_block.
+                                                status_block_index);
+                        napi_schedule(&bnx2x_fp(bp, fp->index, napi));
                         status &= ~mask;
                 }
         }
@@ -2587,7 +2557,6 @@ static void bnx2x_e1h_disable(struct bnx2x *bp)
         int port = BP_PORT(bp);
 
         netif_tx_disable(bp->dev);
-        bp->dev->trans_start = jiffies; /* prevent tx timeout */
 
         REG_WR(bp, NIG_REG_LLH0_FUNC_EN + port*8, 0);
 
@@ -4027,7 +3996,7 @@ static int bnx2x_storm_stats_update(struct bnx2x *bp)
         estats->no_buff_discard_hi = 0;
         estats->no_buff_discard_lo = 0;
 
-        for_each_rx_queue(bp, i) {
+        for_each_queue(bp, i) {
                 struct bnx2x_fastpath *fp = &bp->fp[i];
                 int cl_id = fp->cl_id;
                 struct tstorm_per_client_stats *tclient =
@@ -4244,7 +4213,7 @@ static void bnx2x_net_stats_update(struct bnx2x *bp)
         nstats->tx_bytes = bnx2x_hilo(&estats->total_bytes_transmitted_hi);
 
         nstats->rx_dropped = estats->mac_discard;
-        for_each_rx_queue(bp, i)
+        for_each_queue(bp, i)
                 nstats->rx_dropped +=
                         le32_to_cpu(bp->fp[i].old_tclient.checksum_discard);
 
@@ -4298,7 +4267,7 @@ static void bnx2x_drv_stats_update(struct bnx2x *bp)
         estats->rx_err_discard_pkt = 0;
         estats->rx_skb_alloc_failed = 0;
         estats->hw_csum_err = 0;
-        for_each_rx_queue(bp, i) {
+        for_each_queue(bp, i) {
                 struct bnx2x_eth_q_stats *qstats = &bp->fp[i].eth_q_stats;
 
                 estats->driver_xoff += qstats->driver_xoff;
@@ -4329,7 +4298,7 @@ static void bnx2x_stats_update(struct bnx2x *bp)
 
         if (bp->msglevel & NETIF_MSG_TIMER) {
                 struct bnx2x_fastpath *fp0_rx = bp->fp;
-                struct bnx2x_fastpath *fp0_tx = &(bp->fp[bp->num_rx_queues]);
+                struct bnx2x_fastpath *fp0_tx = bp->fp;
                 struct tstorm_per_client_stats *old_tclient =
                                                         &bp->fp->old_tclient;
                 struct bnx2x_eth_q_stats *qstats = &bp->fp->eth_q_stats;
@@ -4984,7 +4953,7 @@ static void bnx2x_init_rx_rings(struct bnx2x *bp)
 
         if (bp->flags & TPA_ENABLE_FLAG) {
 
-                for_each_rx_queue(bp, j) {
+                for_each_queue(bp, j) {
                         struct bnx2x_fastpath *fp = &bp->fp[j];
 
                         for (i = 0; i < max_agg_queues; i++) {
@@ -5007,16 +4976,13 @@ static void bnx2x_init_rx_rings(struct bnx2x *bp)
                 }
         }
 
-        for_each_rx_queue(bp, j) {
+        for_each_queue(bp, j) {
                 struct bnx2x_fastpath *fp = &bp->fp[j];
 
                 fp->rx_bd_cons = 0;
                 fp->rx_cons_sb = BNX2X_RX_SB_INDEX;
                 fp->rx_bd_cons_sb = BNX2X_RX_SB_BD_INDEX;
 
-                /* Mark queue as Rx */
-                fp->is_rx_queue = 1;
-
                 /* "next page" elements initialization */
                 /* SGE ring */
                 for (i = 1; i <= NUM_RX_SGE_PAGES; i++) {
@@ -5122,7 +5088,7 @@ static void bnx2x_init_tx_ring(struct bnx2x *bp)
 {
         int i, j;
 
-        for_each_tx_queue(bp, j) {
+        for_each_queue(bp, j) {
                 struct bnx2x_fastpath *fp = &bp->fp[j];
 
                 for (i = 1; i <= NUM_TX_RINGS; i++) {
@@ -5148,10 +5114,6 @@ static void bnx2x_init_tx_ring(struct bnx2x *bp)
                 fp->tx_cons_sb = BNX2X_TX_SB_INDEX;
                 fp->tx_pkt = 0;
         }
-
-        /* clean tx statistics */
-        for_each_rx_queue(bp, i)
-                bnx2x_fp(bp, i, tx_pkt) = 0;
 }
 
 static void bnx2x_init_sp_ring(struct bnx2x *bp)
@@ -5180,7 +5142,8 @@ static void bnx2x_init_context(struct bnx2x *bp)
 {
         int i;
 
-        for_each_rx_queue(bp, i) {
+        /* Rx */
+        for_each_queue(bp, i) {
                 struct eth_context *context = bnx2x_sp(bp, context[i].eth);
                 struct bnx2x_fastpath *fp = &bp->fp[i];
                 u8 cl_id = fp->cl_id;
@@ -5232,10 +5195,11 @@ static void bnx2x_init_context(struct bnx2x *bp)
                                                ETH_CONNECTION_TYPE);
         }
 
-        for_each_tx_queue(bp, i) {
+        /* Tx */
+        for_each_queue(bp, i) {
                 struct bnx2x_fastpath *fp = &bp->fp[i];
                 struct eth_context *context =
-                        bnx2x_sp(bp, context[i - bp->num_rx_queues].eth);
+                        bnx2x_sp(bp, context[i].eth);
 
                 context->cstorm_st_context.sb_index_number =
                                                 C_SB_ETH_TX_CQ_INDEX;
@@ -5263,7 +5227,7 @@ static void bnx2x_init_ind_table(struct bnx2x *bp)
         for (i = 0; i < TSTORM_INDIRECTION_TABLE_SIZE; i++)
                 REG_WR8(bp, BAR_TSTRORM_INTMEM +
                         TSTORM_INDIRECTION_TABLE_OFFSET(func) + i,
-                        bp->fp->cl_id + (i % bp->num_rx_queues));
+                        bp->fp->cl_id + (i % bp->num_queues));
 }
 
 static void bnx2x_set_client_config(struct bnx2x *bp)
@@ -5507,7 +5471,7 @@ static void bnx2x_init_internal_func(struct bnx2x *bp)
                 min((u32)(min((u32)8, (u32)MAX_SKB_FRAGS) *
                           SGE_PAGE_SIZE * PAGES_PER_SGE),
                     (u32)0xffff);
-        for_each_rx_queue(bp, i) {
+        for_each_queue(bp, i) {
                 struct bnx2x_fastpath *fp = &bp->fp[i];
 
                 REG_WR(bp, BAR_USTRORM_INTMEM +
@@ -5542,7 +5506,7 @@ static void bnx2x_init_internal_func(struct bnx2x *bp)
                 rx_pause.cqe_thr_high = 350;
                 rx_pause.sge_thr_high = 0;
 
-                for_each_rx_queue(bp, i) {
+                for_each_queue(bp, i) {
                         struct bnx2x_fastpath *fp = &bp->fp[i];
 
                         if (!fp->disable_tpa) {
@@ -5637,9 +5601,6 @@ static void bnx2x_nic_init(struct bnx2x *bp, u32 load_code)
 #else
                 fp->sb_id = fp->cl_id;
 #endif
-                /* Suitable Rx and Tx SBs are served by the same client */
-                if (i >= bp->num_rx_queues)
-                        fp->cl_id -= bp->num_rx_queues;
                 DP(NETIF_MSG_IFUP,
                    "queue[%d]:  bnx2x_init_sb(%p,%p)  cl_id %d  sb %d\n",
                    i, bp, fp->status_blk, fp->cl_id, fp->sb_id);
@@ -6749,7 +6710,7 @@ static void bnx2x_free_mem(struct bnx2x *bp)
                                sizeof(struct host_status_block));
         }
         /* Rx */
-        for_each_rx_queue(bp, i) {
+        for_each_queue(bp, i) {
 
                 /* fastpath rx rings: rx_buf rx_desc rx_comp */
                 BNX2X_FREE(bnx2x_fp(bp, i, rx_buf_ring));
@@ -6769,7 +6730,7 @@ static void bnx2x_free_mem(struct bnx2x *bp)
                                BCM_PAGE_SIZE * NUM_RX_SGE_PAGES);
         }
         /* Tx */
-        for_each_tx_queue(bp, i) {
+        for_each_queue(bp, i) {
 
                 /* fastpath tx rings: tx_buf tx_desc */
                 BNX2X_FREE(bnx2x_fp(bp, i, tx_buf_ring));
@@ -6831,7 +6792,7 @@ static int bnx2x_alloc_mem(struct bnx2x *bp)
                                 sizeof(struct host_status_block));
         }
         /* Rx */
-        for_each_rx_queue(bp, i) {
+        for_each_queue(bp, i) {
 
                 /* fastpath rx rings: rx_buf rx_desc rx_comp */
                 BNX2X_ALLOC(bnx2x_fp(bp, i, rx_buf_ring),
@@ -6853,7 +6814,7 @@ static int bnx2x_alloc_mem(struct bnx2x *bp)
                                 BCM_PAGE_SIZE * NUM_RX_SGE_PAGES);
         }
         /* Tx */
-        for_each_tx_queue(bp, i) {
+        for_each_queue(bp, i) {
 
                 /* fastpath tx rings: tx_buf tx_desc */
                 BNX2X_ALLOC(bnx2x_fp(bp, i, tx_buf_ring),
@@ -6909,7 +6870,7 @@ static void bnx2x_free_tx_skbs(struct bnx2x *bp)
 {
         int i;
 
-        for_each_tx_queue(bp, i) {
+        for_each_queue(bp, i) {
                 struct bnx2x_fastpath *fp = &bp->fp[i];
 
                 u16 bd_cons = fp->tx_bd_cons;
@@ -6927,7 +6888,7 @@ static void bnx2x_free_rx_skbs(struct bnx2x *bp)
 {
         int i, j;
 
-        for_each_rx_queue(bp, j) {
+        for_each_queue(bp, j) {
                 struct bnx2x_fastpath *fp = &bp->fp[j];
 
                 for (i = 0; i < NUM_RX_BD; i++) {
@@ -7042,12 +7003,8 @@ static int bnx2x_req_msix_irqs(struct bnx2x *bp)
 #endif
         for_each_queue(bp, i) {
                 struct bnx2x_fastpath *fp = &bp->fp[i];
-
-                if (i < bp->num_rx_queues)
-                        sprintf(fp->name, "%s-rx-%d", bp->dev->name, i);
-                else
-                        sprintf(fp->name, "%s-tx-%d",
-                                bp->dev->name, i - bp->num_rx_queues);
+                snprintf(fp->name, sizeof(fp->name), "%s-fp-%d",
+                         bp->dev->name, i);
 
                 rc = request_irq(bp->msix_table[i + offset].vector,
                                  bnx2x_msix_fp_int, 0, fp->name, fp);
@@ -7106,7 +7063,7 @@ static void bnx2x_napi_enable(struct bnx2x *bp)
 {
         int i;
 
-        for_each_rx_queue(bp, i)
+        for_each_queue(bp, i)
                 napi_enable(&bnx2x_fp(bp, i, napi));
 }
 
@@ -7114,7 +7071,7 @@ static void bnx2x_napi_disable(struct bnx2x *bp)
 {
         int i;
 
-        for_each_rx_queue(bp, i)
+        for_each_queue(bp, i)
                 napi_disable(&bnx2x_fp(bp, i, napi));
 }
 
@@ -7140,7 +7097,6 @@ static void bnx2x_netif_stop(struct bnx2x *bp, int disable_hw)
         bnx2x_int_disable_sync(bp, disable_hw);
         bnx2x_napi_disable(bp);
         netif_tx_disable(bp->dev);
-        bp->dev->trans_start = jiffies; /* prevent tx timeout */
 }
 
 /*
@@ -7410,88 +7366,60 @@ static int bnx2x_setup_multi(struct bnx2x *bp, int index)
 
 static int bnx2x_poll(struct napi_struct *napi, int budget);
 
-static void bnx2x_set_int_mode_msix(struct bnx2x *bp, int *num_rx_queues_out,
-                                    int *num_tx_queues_out)
+static void bnx2x_set_num_queues_msix(struct bnx2x *bp)
 {
-        int _num_rx_queues = 0, _num_tx_queues = 0;
 
         switch (bp->multi_mode) {
         case ETH_RSS_MODE_DISABLED:
-                _num_rx_queues = 1;
-                _num_tx_queues = 1;
+                bp->num_queues = 1;
                 break;
 
         case ETH_RSS_MODE_REGULAR:
-                if (num_rx_queues)
-                        _num_rx_queues = min_t(u32, num_rx_queues,
-                                               BNX2X_MAX_QUEUES(bp));
-                else
-                        _num_rx_queues = min_t(u32, num_online_cpus(),
-                                               BNX2X_MAX_QUEUES(bp));
-
-                if (num_tx_queues)
-                        _num_tx_queues = min_t(u32, num_tx_queues,
-                                               BNX2X_MAX_QUEUES(bp));
+                if (num_queues)
+                        bp->num_queues = min_t(u32, num_queues,
+                                                  BNX2X_MAX_QUEUES(bp));
                 else
-                        _num_tx_queues = min_t(u32, num_online_cpus(),
-                                               BNX2X_MAX_QUEUES(bp));
-
-                /* There must be not more Tx queues than Rx queues */
-                if (_num_tx_queues > _num_rx_queues) {
-                        BNX2X_ERR("number of tx queues (%d) > "
-                                  "number of rx queues (%d)"
-                                  "  defaulting to %d\n",
-                                  _num_tx_queues, _num_rx_queues,
-                                  _num_rx_queues);
-                        _num_tx_queues = _num_rx_queues;
-                }
+                        bp->num_queues = min_t(u32, num_online_cpus(),
+                                                  BNX2X_MAX_QUEUES(bp));
                 break;
 
 
         default:
-                _num_rx_queues = 1;
-                _num_tx_queues = 1;
+                bp->num_queues = 1;
                 break;
         }
-
-        *num_rx_queues_out = _num_rx_queues;
-        *num_tx_queues_out = _num_tx_queues;
 }
 
-static int bnx2x_set_int_mode(struct bnx2x *bp)
+static int bnx2x_set_num_queues(struct bnx2x *bp)
 {
         int rc = 0;
 
         switch (int_mode) {
         case INT_MODE_INTx:
         case INT_MODE_MSI:
-                bp->num_rx_queues = 1;
-                bp->num_tx_queues = 1;
+                bp->num_queues = 1;
                 DP(NETIF_MSG_IFUP, "set number of queues to 1\n");
                 break;
 
         case INT_MODE_MSIX:
         default:
-                /* Set interrupt mode according to bp->multi_mode value */
-                bnx2x_set_int_mode_msix(bp, &bp->num_rx_queues,
-                                        &bp->num_tx_queues);
+                /* Set number of queues according to bp->multi_mode value */
+                bnx2x_set_num_queues_msix(bp);
 
-                DP(NETIF_MSG_IFUP, "set number of queues to: rx %d tx %d\n",
-                   bp->num_rx_queues, bp->num_tx_queues);
+                DP(NETIF_MSG_IFUP, "set number of queues to %d\n",
+                   bp->num_queues);
 
                 /* if we can't use MSI-X we only need one fp,
                  * so try to enable MSI-X with the requested number of fp's
                  * and fallback to MSI or legacy INTx with one fp
                  */
                 rc = bnx2x_enable_msix(bp);
-                if (rc) {
+                if (rc)
                         /* failed to enable MSI-X */
-                        bp->num_rx_queues = 1;
-                        bp->num_tx_queues = 1;
-                }
+                        bp->num_queues = 1;
                 break;
         }
-        bp->dev->real_num_tx_queues = bp->num_tx_queues;
+        bp->dev->real_num_tx_queues = bp->num_queues;
         return rc;
 }
 
@@ -7513,16 +7441,16 @@ static int bnx2x_nic_load(struct bnx2x *bp, int load_mode)
 
         bp->state = BNX2X_STATE_OPENING_WAIT4_LOAD;
 
-        rc = bnx2x_set_int_mode(bp);
+        rc = bnx2x_set_num_queues(bp);
 
         if (bnx2x_alloc_mem(bp))
                 return -ENOMEM;
 
-        for_each_rx_queue(bp, i)
+        for_each_queue(bp, i)
                 bnx2x_fp(bp, i, disable_tpa) =
                                         ((bp->flags & TPA_ENABLE_FLAG) == 0);
 
-        for_each_rx_queue(bp, i)
+        for_each_queue(bp, i)
                 netif_napi_add(bp->dev, &bnx2x_fp(bp, i, napi),
                                bnx2x_poll, 128);
 
@@ -7536,7 +7464,7 @@ static int bnx2x_nic_load(struct bnx2x *bp, int load_mode)
                 }
         } else {
                 /* Fall to INTx if failed to enable MSI-X due to lack of
-                   memory (in bnx2x_set_int_mode()) */
+                   memory (in bnx2x_set_num_queues()) */
                 if ((rc != -ENOMEM) && (int_mode != INT_MODE_INTx))
                         bnx2x_enable_msi(bp);
                 bnx2x_ack_int(bp);
@@ -7730,14 +7658,14 @@ load_error3:
         bp->port.pmf = 0;
         /* Free SKBs, SGEs, TPA pool and driver internals */
         bnx2x_free_skbs(bp);
-        for_each_rx_queue(bp, i)
+        for_each_queue(bp, i)
                 bnx2x_free_rx_sge_range(bp, bp->fp + i, NUM_RX_SGE);
 load_error2:
         /* Release IRQs */
         bnx2x_free_irq(bp);
 load_error1:
         bnx2x_napi_disable(bp);
-        for_each_rx_queue(bp, i)
+        for_each_queue(bp, i)
                 netif_napi_del(&bnx2x_fp(bp, i, napi));
         bnx2x_free_mem(bp);
 
@@ -7928,7 +7856,7 @@ static int bnx2x_nic_unload(struct bnx2x *bp, int unload_mode)
         bnx2x_free_irq(bp);
 
         /* Wait until tx fastpath tasks complete */
-        for_each_tx_queue(bp, i) {
+        for_each_queue(bp, i) {
                 struct bnx2x_fastpath *fp = &bp->fp[i];
 
                 cnt = 1000;
@@ -8071,9 +7999,9 @@ unload_error:
 
         /* Free SKBs, SGEs, TPA pool and driver internals */
         bnx2x_free_skbs(bp);
-        for_each_rx_queue(bp, i)
+        for_each_queue(bp, i)
                 bnx2x_free_rx_sge_range(bp, bp->fp + i, NUM_RX_SGE);
-        for_each_rx_queue(bp, i)
+        for_each_queue(bp, i)
                 netif_napi_del(&bnx2x_fp(bp, i, napi));
         bnx2x_free_mem(bp);
 
@@ -10269,7 +10197,7 @@ static int bnx2x_run_loopback(struct bnx2x *bp, int loopback_mode, u8 link_up)
         struct sk_buff *skb;
         unsigned char *packet;
         struct bnx2x_fastpath *fp_rx = &bp->fp[0];
-        struct bnx2x_fastpath *fp_tx = &bp->fp[bp->num_rx_queues];
+        struct bnx2x_fastpath *fp_tx = &bp->fp[0];
         u16 tx_start_idx, tx_idx;
         u16 rx_start_idx, rx_idx;
         u16 pkt_prod, bd_prod;
@@ -10346,13 +10274,12 @@ static int bnx2x_run_loopback(struct bnx2x *bp, int loopback_mode, u8 link_up)
 
         fp_tx->tx_db.data.prod += 2;
         barrier();
-        DOORBELL(bp, fp_tx->index - bp->num_rx_queues, fp_tx->tx_db.raw);
+        DOORBELL(bp, fp_tx->index, fp_tx->tx_db.raw);
 
         mmiowb();
 
         num_pkts++;
         fp_tx->tx_bd_prod += 2; /* start + pbd */
-        bp->dev->trans_start = jiffies;
 
         udelay(100);
 
@@ -10725,7 +10652,7 @@ static int bnx2x_get_sset_count(struct net_device *dev, int stringset)
         switch(stringset) {
         case ETH_SS_STATS:
                 if (is_multi(bp)) {
-                        num_stats = BNX2X_NUM_Q_STATS * bp->num_rx_queues;
+                        num_stats = BNX2X_NUM_Q_STATS * bp->num_queues;
                         if (!IS_E1HMF_MODE_STAT(bp))
                                 num_stats += BNX2X_NUM_STATS;
                 } else {
@@ -10756,7 +10683,7 @@ static void bnx2x_get_strings(struct net_device *dev, u32 stringset, u8 *buf)
         case ETH_SS_STATS:
                 if (is_multi(bp)) {
                         k = 0;
-                        for_each_rx_queue(bp, i) {
+                        for_each_queue(bp, i) {
                                 for (j = 0; j < BNX2X_NUM_Q_STATS; j++)
                                         sprintf(buf + (k + j)*ETH_GSTRING_LEN,
                                                 bnx2x_q_stats_arr[j].string, i);
@@ -10793,7 +10720,7 @@ static void bnx2x_get_ethtool_stats(struct net_device *dev,
 
         if (is_multi(bp)) {
                 k = 0;
-                for_each_rx_queue(bp, i) {
+                for_each_queue(bp, i) {
                         hw_stats = (u32 *)&bp->fp[i].eth_q_stats;
                         for (j = 0; j < BNX2X_NUM_Q_STATS; j++) {
                                 if (bnx2x_q_stats_arr[j].size == 0) {
@@ -10989,54 +10916,60 @@ static inline int bnx2x_has_rx_work(struct bnx2x_fastpath *fp)
 
 static int bnx2x_poll(struct napi_struct *napi, int budget)
 {
+        int work_done = 0;
         struct bnx2x_fastpath *fp = container_of(napi, struct bnx2x_fastpath,
                                                  napi);
         struct bnx2x *bp = fp->bp;
-        int work_done = 0;
 
+        while (1) {
 #ifdef BNX2X_STOP_ON_ERROR
-        if (unlikely(bp->panic))
-                goto poll_panic;
+                if (unlikely(bp->panic)) {
+                        napi_complete(napi);
+                        return 0;
+                }
 #endif
 
-        prefetch(fp->rx_buf_ring[RX_BD(fp->rx_bd_cons)].skb);
-        prefetch((char *)(fp->rx_buf_ring[RX_BD(fp->rx_bd_cons)].skb) + 256);
-
-        bnx2x_update_fpsb_idx(fp);
-
-        if (bnx2x_has_rx_work(fp)) {
-                work_done = bnx2x_rx_int(fp, budget);
+                if (bnx2x_has_tx_work(fp))
+                        bnx2x_tx_int(fp);
 
-                /* must not complete if we consumed full budget */
-                if (work_done >= budget)
-                        goto poll_again;
-        }
+                if (bnx2x_has_rx_work(fp)) {
+                        work_done += bnx2x_rx_int(fp, budget - work_done);
 
-        /* bnx2x_has_rx_work() reads the status block, thus we need to
-         * ensure that status block indices have been actually read
-         * (bnx2x_update_fpsb_idx) prior to this check (bnx2x_has_rx_work)
-         * so that we won't write the "newer" value of the status block to IGU
-         * (if there was a DMA right after bnx2x_has_rx_work and
-         * if there is no rmb, the memory reading (bnx2x_update_fpsb_idx)
-         * may be postponed to right before bnx2x_ack_sb). In this case
-         * there will never be another interrupt until there is another update
-         * of the status block, while there is still unhandled work.
-         */
-        rmb();
+                        /* must not complete if we consumed full budget */
+                        if (work_done >= budget)
+                                break;
+                }
 
-        if (!bnx2x_has_rx_work(fp)) {
-#ifdef BNX2X_STOP_ON_ERROR
-poll_panic:
-#endif
-                napi_complete(napi);
+                /* Fall out from the NAPI loop if needed */
+                if (!(bnx2x_has_rx_work(fp) || bnx2x_has_tx_work(fp))) {
+                        bnx2x_update_fpsb_idx(fp);
+                /* bnx2x_has_rx_work() reads the status block, thus we need
+                 * to ensure that status block indices have been actually read
+                 * (bnx2x_update_fpsb_idx) prior to this check
+                 * (bnx2x_has_rx_work) so that we won't write the "newer"
+                 * value of the status block to IGU (if there was a DMA right
+                 * after bnx2x_has_rx_work and if there is no rmb, the memory
+                 * reading (bnx2x_update_fpsb_idx) may be postponed to right
+                 * before bnx2x_ack_sb). In this case there will never be
+                 * another interrupt until there is another update of the
+                 * status block, while there is still unhandled work.
+                 */
+                        rmb();
 
-                bnx2x_ack_sb(bp, fp->sb_id, USTORM_ID,
-                             le16_to_cpu(fp->fp_u_idx), IGU_INT_NOP, 1);
-                bnx2x_ack_sb(bp, fp->sb_id, CSTORM_ID,
-                             le16_to_cpu(fp->fp_c_idx), IGU_INT_ENABLE, 1);
+                        if (!(bnx2x_has_rx_work(fp) || bnx2x_has_tx_work(fp))) {
+                                napi_complete(napi);
+                                /* Re-enable interrupts */
+                                bnx2x_ack_sb(bp, fp->sb_id, CSTORM_ID,
+                                             le16_to_cpu(fp->fp_c_idx),
+                                             IGU_INT_NOP, 1);
+                                bnx2x_ack_sb(bp, fp->sb_id, USTORM_ID,
+                                             le16_to_cpu(fp->fp_u_idx),
+                                             IGU_INT_ENABLE, 1);
+                                break;
+                        }
+                }
         }
 
-poll_again:
         return work_done;
 }
 
@@ -11221,7 +11154,7 @@ exit_lbl:
 static netdev_tx_t bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
         struct bnx2x *bp = netdev_priv(dev);
-        struct bnx2x_fastpath *fp, *fp_stat;
+        struct bnx2x_fastpath *fp;
         struct netdev_queue *txq;
         struct sw_tx_bd *tx_buf;
         struct eth_tx_start_bd *tx_start_bd;
@@ -11243,11 +11176,10 @@ static netdev_tx_t bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev)
         fp_index = skb_get_queue_mapping(skb);
         txq = netdev_get_tx_queue(dev, fp_index);
 
-        fp = &bp->fp[fp_index + bp->num_rx_queues];
-        fp_stat = &bp->fp[fp_index];
+        fp = &bp->fp[fp_index];
 
         if (unlikely(bnx2x_tx_avail(fp) < (skb_shinfo(skb)->nr_frags + 3))) {
-                fp_stat->eth_q_stats.driver_xoff++;
+                fp->eth_q_stats.driver_xoff++;
                 netif_tx_stop_queue(txq);
                 BNX2X_ERR("BUG! Tx ring full when queue awake!\n");
                 return NETDEV_TX_BUSY;
@@ -11473,7 +11405,7 @@ static netdev_tx_t bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
         fp->tx_db.data.prod += nbd;
         barrier();
-        DOORBELL(bp, fp->index - bp->num_rx_queues, fp->tx_db.raw);
+        DOORBELL(bp, fp->index, fp->tx_db.raw);
 
         mmiowb();
 
@@ -11484,11 +11416,11 @@ static netdev_tx_t bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev)
                 /* We want bnx2x_tx_int to "see" the updated tx_bd_prod
                    if we put Tx into XOFF state. */
                 smp_mb();
-                fp_stat->eth_q_stats.driver_xoff++;
+                fp->eth_q_stats.driver_xoff++;
                 if (bnx2x_tx_avail(fp) >= MAX_SKB_FRAGS + 3)
                         netif_tx_wake_queue(txq);
         }
-        fp_stat->tx_pkt++;
+        fp->tx_pkt++;
 
         return NETDEV_TX_OK;
 }
@@ -12376,9 +12308,9 @@ static int bnx2x_eeh_nic_unload(struct bnx2x *bp)
 
         /* Free SKBs, SGEs, TPA pool and driver internals */
         bnx2x_free_skbs(bp);
-        for_each_rx_queue(bp, i)
+        for_each_queue(bp, i)
                 bnx2x_free_rx_sge_range(bp, bp->fp + i, NUM_RX_SGE);
-        for_each_rx_queue(bp, i)
+        for_each_queue(bp, i)
                 netif_napi_del(&bnx2x_fp(bp, i, napi));
         bnx2x_free_mem(bp);
 
diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c
index 1d058192328..88c3fe80b35 100644
--- a/drivers/net/bonding/bond_3ad.c
+++ b/drivers/net/bonding/bond_3ad.c
@@ -446,6 +446,48 @@ static u16 __ad_timer_to_ticks(u16 timer_type, u16 par)
 /////////////////////////////////////////////////////////////////////////////////
 
 /**
+ * __choose_matched - update a port's matched variable from a received lacpdu
+ * @lacpdu: the lacpdu we've received
+ * @port: the port we're looking at
+ *
+ * Update the value of the matched variable, using parameter values from a
+ * newly received lacpdu. Parameter values for the partner carried in the
+ * received PDU are compared with the corresponding operational parameter
+ * values for the actor. Matched is set to TRUE if all of these parameters
+ * match and the PDU parameter partner_state.aggregation has the same value as
+ * actor_oper_port_state.aggregation and lacp will actively maintain the link
+ * in the aggregation. Matched is also set to TRUE if the value of
+ * actor_state.aggregation in the received PDU is set to FALSE, i.e., indicates
+ * an individual link and lacp will actively maintain the link. Otherwise,
+ * matched is set to FALSE. LACP is considered to be actively maintaining the
+ * link if either the PDU's actor_state.lacp_activity variable is TRUE or both
+ * the actor's actor_oper_port_state.lacp_activity and the PDU's
+ * partner_state.lacp_activity variables are TRUE.
+ *
+ * Note: the AD_PORT_MATCHED "variable" is not specified by 802.3ad; it is
+ * used here to implement the language from 802.3ad 43.4.9 that requires
+ * recordPDU to "match" the LACPDU parameters to the stored values.
+ */
+static void __choose_matched(struct lacpdu *lacpdu, struct port *port)
+{
+        // check if all parameters are alike
+        if (((ntohs(lacpdu->partner_port) == port->actor_port_number) &&
+             (ntohs(lacpdu->partner_port_priority) == port->actor_port_priority) &&
+             !MAC_ADDRESS_COMPARE(&(lacpdu->partner_system), &(port->actor_system)) &&
+             (ntohs(lacpdu->partner_system_priority) == port->actor_system_priority) &&
+             (ntohs(lacpdu->partner_key) == port->actor_oper_port_key) &&
+             ((lacpdu->partner_state & AD_STATE_AGGREGATION) == (port->actor_oper_port_state & AD_STATE_AGGREGATION))) ||
+            // or this is individual link(aggregation == FALSE)
+            ((lacpdu->actor_state & AD_STATE_AGGREGATION) == 0)
+                ) {
+                // update the state machine Matched variable
+                port->sm_vars |= AD_PORT_MATCHED;
+        } else {
+                port->sm_vars &= ~AD_PORT_MATCHED;
+        }
+}
+
+/**
  * __record_pdu - record parameters from a received lacpdu
  * @lacpdu: the lacpdu we've received
  * @port: the port we're looking at
@@ -459,6 +501,7 @@ static void __record_pdu(struct lacpdu *lacpdu, struct port *port)
         if (lacpdu && port) {
                 struct port_params *partner = &port->partner_oper;
 
+                __choose_matched(lacpdu, port);
                 // record the new parameter values for the partner operational
                 partner->port_number = ntohs(lacpdu->actor_port);
                 partner->port_priority = ntohs(lacpdu->actor_port_priority);
@@ -563,47 +606,6 @@ static void __update_default_selected(struct port *port)
 }
 
 /**
- * __choose_matched - update a port's matched variable from a received lacpdu
- * @lacpdu: the lacpdu we've received
- * @port: the port we're looking at
- *
- * Update the value of the matched variable, using parameter values from a
- * newly received lacpdu. Parameter values for the partner carried in the
- * received PDU are compared with the corresponding operational parameter
- * values for the actor. Matched is set to TRUE if all of these parameters
- * match and the PDU parameter partner_state.aggregation has the same value as
- * actor_oper_port_state.aggregation and lacp will actively maintain the link
- * in the aggregation. Matched is also set to TRUE if the value of
- * actor_state.aggregation in the received PDU is set to FALSE, i.e., indicates
- * an individual link and lacp will actively maintain the link. Otherwise,
- * matched is set to FALSE. LACP is considered to be actively maintaining the
- * link if either the PDU's actor_state.lacp_activity variable is TRUE or both
- * the actor's actor_oper_port_state.lacp_activity and the PDU's
- * partner_state.lacp_activity variables are TRUE.
- */
-static void __choose_matched(struct lacpdu *lacpdu, struct port *port)
-{
-        // validate lacpdu and port
-        if (lacpdu && port) {
-                // check if all parameters are alike
-                if (((ntohs(lacpdu->partner_port) == port->actor_port_number) &&
-                     (ntohs(lacpdu->partner_port_priority) == port->actor_port_priority) &&
-                     !MAC_ADDRESS_COMPARE(&(lacpdu->partner_system), &(port->actor_system)) &&
-                     (ntohs(lacpdu->partner_system_priority) == port->actor_system_priority) &&
-                     (ntohs(lacpdu->partner_key) == port->actor_oper_port_key) &&
-                     ((lacpdu->partner_state & AD_STATE_AGGREGATION) == (port->actor_oper_port_state & AD_STATE_AGGREGATION))) ||
-                    // or this is individual link(aggregation == FALSE)
-                    ((lacpdu->actor_state & AD_STATE_AGGREGATION) == 0)
-                   ) {
-                        // update the state machine Matched variable
-                        port->sm_vars |= AD_PORT_MATCHED;
-                } else {
-                        port->sm_vars &= ~AD_PORT_MATCHED;
-                }
-        }
-}
-
-/**
  * __update_ntt - update a port's ntt variable from a received lacpdu
  * @lacpdu: the lacpdu we've received
  * @port: the port we're looking at
@@ -1134,7 +1136,6 @@ static void ad_rx_machine(struct lacpdu *lacpdu, struct port *port)
                         __update_selected(lacpdu, port);
                         __update_ntt(lacpdu, port);
                         __record_pdu(lacpdu, port);
-                        __choose_matched(lacpdu, port);
                         port->sm_rx_timer_counter = __ad_timer_to_ticks(AD_CURRENT_WHILE_TIMER, (u16)(port->actor_oper_port_state & AD_STATE_LACP_TIMEOUT));
                         port->actor_oper_port_state &= ~AD_STATE_EXPIRED;
                         // verify that if the aggregator is enabled, the port is enabled too.
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index ecea6c29413..726bd755338 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -158,7 +158,7 @@ MODULE_PARM_DESC(fail_over_mac, "For active-backup, do not set all slaves to the
 static const char * const version =
         DRV_DESCRIPTION ": v" DRV_VERSION " (" DRV_RELDATE ")\n";
 
-int bond_net_id;
+int bond_net_id __read_mostly;
 
 static __be32 arp_target[BOND_MAX_ARP_TARGETS];
 static int arp_ip_count;
diff --git a/drivers/net/can/Kconfig b/drivers/net/can/Kconfig
index b819cc2a429..bb803fa1e6a 100644
--- a/drivers/net/can/Kconfig
+++ b/drivers/net/can/Kconfig
@@ -35,63 +35,9 @@ config CAN_CALC_BITTIMING
           arguments "tq", "prop_seg", "phase_seg1", "phase_seg2" and "sjw".
           If unsure, say Y.
 
-config CAN_SJA1000
-        depends on CAN_DEV && HAS_IOMEM
-        tristate "Philips SJA1000"
-        ---help---
-          Driver for the SJA1000 CAN controllers from Philips or NXP
-
-config CAN_SJA1000_ISA
-        depends on CAN_SJA1000 && ISA
-        tristate "ISA Bus based legacy SJA1000 driver"
-        ---help---
-          This driver adds legacy support for SJA1000 chips connected to
-          the ISA bus using I/O port, memory mapped or indirect access.
-
-config CAN_SJA1000_PLATFORM
-        depends on CAN_SJA1000
-        tristate "Generic Platform Bus based SJA1000 driver"
-        ---help---
-          This driver adds support for the SJA1000 chips connected to
-          the "platform bus" (Linux abstraction for directly to the
-          processor attached devices).  Which can be found on various
-          boards from Phytec (http://www.phytec.de) like the PCM027,
-          PCM038.
-
-config CAN_SJA1000_OF_PLATFORM
-        depends on CAN_SJA1000 && PPC_OF
-        tristate "Generic OF Platform Bus based SJA1000 driver"
-        ---help---
-          This driver adds support for the SJA1000 chips connected to
-          the OpenFirmware "platform bus" found on embedded systems with
-          OpenFirmware bindings, e.g. if you have a PowerPC based system
-          you may want to enable this option.
-
-config CAN_EMS_PCI
-        tristate "EMS CPC-PCI, CPC-PCIe and CPC-104P Card"
-        depends on PCI && CAN_SJA1000
-        ---help---
-          This driver is for the one, two or four channel CPC-PCI,
-          CPC-PCIe and CPC-104P cards from EMS Dr. Thomas Wuensche
-          (http://www.ems-wuensche.de).
-
-config CAN_EMS_USB
-        tristate "EMS CPC-USB/ARM7 CAN/USB interface"
-        depends on USB && CAN_DEV
-        ---help---
-          This driver is for the one channel CPC-USB/ARM7 CAN/USB interface
-          from from EMS Dr. Thomas Wuensche (http://www.ems-wuensche.de).
-
-config CAN_KVASER_PCI
-        tristate "Kvaser PCIcanx and Kvaser PCIcan PCI Cards"
-        depends on PCI && CAN_SJA1000
-        ---help---
-          This driver is for the the PCIcanx and PCIcan cards (1, 2 or
-          4 channel) from Kvaser (http://www.kvaser.com).
-
 config CAN_AT91
         tristate "Atmel AT91 onchip CAN controller"
-        depends on CAN && CAN_DEV && ARCH_AT91SAM9263
+        depends on CAN_DEV && ARCH_AT91SAM9263
         ---help---
           This is a driver for the SoC CAN controller in Atmel's AT91SAM9263.
 
@@ -108,6 +54,12 @@ config CAN_MCP251X
         ---help---
           Driver for the Microchip MCP251x SPI CAN controllers.
 
+source "drivers/net/can/mscan/Kconfig"
+
+source "drivers/net/can/sja1000/Kconfig"
+
+source "drivers/net/can/usb/Kconfig"
+
 config CAN_DEBUG_DEVICES
         bool "CAN devices debugging messages"
         depends on CAN
diff --git a/drivers/net/can/Makefile b/drivers/net/can/Makefile
index 14891817ea5..56899fef1c6 100644
--- a/drivers/net/can/Makefile
+++ b/drivers/net/can/Makefile
@@ -10,6 +10,7 @@ can-dev-y			:= dev.o
 obj-y                           += usb/
 
 obj-$(CONFIG_CAN_SJA1000)       += sja1000/
+obj-$(CONFIG_CAN_MSCAN)         += mscan/
 obj-$(CONFIG_CAN_AT91)          += at91_can.o
 obj-$(CONFIG_CAN_TI_HECC)       += ti_hecc.o
 obj-$(CONFIG_CAN_MCP251X)       += mcp251x.o
diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c
index 26c89aaeba6..c1bb29f0322 100644
--- a/drivers/net/can/dev.c
+++ b/drivers/net/can/dev.c
@@ -677,6 +677,11 @@ nla_put_failure:
         return -EMSGSIZE;
 }
 
+static size_t can_get_xstats_size(const struct net_device *dev)
+{
+        return sizeof(struct can_device_stats);
+}
+
 static int can_fill_xstats(struct sk_buff *skb, const struct net_device *dev)
 {
         struct can_priv *priv = netdev_priv(dev);
@@ -705,6 +710,7 @@ static struct rtnl_link_ops can_link_ops __read_mostly = {
         .changelink     = can_changelink,
         .get_size       = can_get_size,
         .fill_info      = can_fill_info,
+        .get_xstats_size = can_get_xstats_size,
         .fill_xstats    = can_fill_xstats,
 };
 
diff --git a/drivers/net/can/mcp251x.c b/drivers/net/can/mcp251x.c
index 8f48f4b50b7..78b1b69b292 100644
--- a/drivers/net/can/mcp251x.c
+++ b/drivers/net/can/mcp251x.c
@@ -594,13 +594,7 @@ static int mcp251x_do_set_bittiming(struct net_device *net)
 static int mcp251x_setup(struct net_device *net, struct mcp251x_priv *priv,
                          struct spi_device *spi)
 {
-        int ret;
-
-        ret = open_candev(net);
-        if (ret) {
-                dev_err(&spi->dev, "unable to set initial baudrate!\n");
-                return ret;
-        }
+        mcp251x_do_set_bittiming(net);
 
         /* Enable RX0->RX1 buffer roll over and disable filters */
         mcp251x_write_bits(spi, RXBCTRL(0),
@@ -671,6 +665,12 @@ static int mcp251x_open(struct net_device *net)
         struct mcp251x_platform_data *pdata = spi->dev.platform_data;
         int ret;
 
+        ret = open_candev(net);
+        if (ret) {
+                dev_err(&spi->dev, "unable to set initial baudrate!\n");
+                return ret;
+        }
+
         if (pdata->transceiver_enable)
                 pdata->transceiver_enable(1);
 
@@ -684,6 +684,7 @@ static int mcp251x_open(struct net_device *net)
                 dev_err(&spi->dev, "failed to acquire irq %d\n", spi->irq);
                 if (pdata->transceiver_enable)
                         pdata->transceiver_enable(0);
+                close_candev(net);
                 return ret;
         }
 
@@ -692,8 +693,10 @@ static int mcp251x_open(struct net_device *net)
         ret = mcp251x_setup(net, priv, spi);
         if (ret) {
                 free_irq(spi->irq, net);
+                mcp251x_hw_sleep(spi);
                 if (pdata->transceiver_enable)
                         pdata->transceiver_enable(0);
+                close_candev(net);
                 return ret;
         }
         mcp251x_set_normal_mode(spi);
@@ -956,7 +959,6 @@ static int __devinit mcp251x_can_probe(struct spi_device *spi)
         priv->can.bittiming_const = &mcp251x_bittiming_const;
         priv->can.do_set_mode = mcp251x_do_set_mode;
         priv->can.clock.freq = pdata->oscillator_frequency / 2;
-        priv->can.do_set_bittiming = mcp251x_do_set_bittiming;
         priv->net = net;
         dev_set_drvdata(&spi->dev, priv);
 
diff --git a/drivers/net/can/mscan/Kconfig b/drivers/net/can/mscan/Kconfig
new file mode 100644
index 00000000000..cd0f2d6f375
--- /dev/null
+++ b/drivers/net/can/mscan/Kconfig
@@ -0,0 +1,23 @@
+config CAN_MSCAN
+        depends on CAN_DEV && (PPC || M68K || M68KNOMMU)
+        tristate "Support for Freescale MSCAN based chips"
+        ---help---
+          The Motorola Scalable Controller Area Network (MSCAN) definition
+          is based on the MSCAN12 definition which is the specific
+          implementation of the Motorola Scalable CAN concept targeted for
+          the Motorola MC68HC12 Microcontroller Family.
+
+if CAN_MSCAN
+
+config CAN_MPC5XXX
+        tristate "Freescale MPC5xxx onboard CAN controller"
+        depends on PPC_MPC52xx
+        ---help---
+          If you say yes here you get support for Freescale's MPC5xxx
+          onboard CAN controller.
+
+          This driver can also be built as a module.  If so, the module
+          will be called mscan-mpc5xxx.ko.
+
+endif
+
diff --git a/drivers/net/can/mscan/Makefile b/drivers/net/can/mscan/Makefile
new file mode 100644
index 00000000000..c9fab17cd8b
--- /dev/null
+++ b/drivers/net/can/mscan/Makefile
@@ -0,0 +1,5 @@
+
+obj-$(CONFIG_CAN_MPC5XXX)       += mscan-mpc5xxx.o
+mscan-mpc5xxx-objs              := mscan.o mpc5xxx_can.o
+
+ccflags-$(CONFIG_CAN_DEBUG_DEVICES) := -DDEBUG
diff --git a/drivers/net/can/mscan/mpc5xxx_can.c b/drivers/net/can/mscan/mpc5xxx_can.c
new file mode 100644
index 00000000000..1de6f6349b1
--- /dev/null
+++ b/drivers/net/can/mscan/mpc5xxx_can.c
@@ -0,0 +1,259 @@
+/*
+ * CAN bus driver for the Freescale MPC5xxx embedded CPU.
+ *
+ * Copyright (C) 2004-2005 Andrey Volkov <avolkov@varma-el.com>,
+ *                         Varma Electronics Oy
+ * Copyright (C) 2008-2009 Wolfgang Grandegger <wg@grandegger.com>
+ * Copyright (C) 2009 Wolfram Sang, Pengutronix <w.sang@pengutronix.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the version 2 of the GNU General Public License
+ * as published by the Free Software Foundation
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/interrupt.h>
+#include <linux/platform_device.h>
+#include <linux/netdevice.h>
+#include <linux/can.h>
+#include <linux/can/dev.h>
+#include <linux/of_platform.h>
+#include <sysdev/fsl_soc.h>
+#include <linux/io.h>
+#include <asm/mpc52xx.h>
+
+#include "mscan.h"
+
+#define DRV_NAME "mpc5xxx_can"
+
+static struct of_device_id mpc52xx_cdm_ids[] __devinitdata = {
+        { .compatible = "fsl,mpc5200-cdm", },
+        {}
+};
+
+/*
+ * Get frequency of the MSCAN clock source
+ *
+ * Either the oscillator clock (SYS_XTAL_IN) or the IP bus clock (IP_CLK)
+ * can be selected. According to the MPC5200 user's manual, the oscillator
+ * clock is the better choice as it has less jitter but due to a hardware
+ * bug, it can not be selected for the old MPC5200 Rev. A chips.
+ */
+
+static unsigned int  __devinit mpc52xx_can_clock_freq(struct of_device *of,
+                                                      int clock_src)
+{
+        unsigned int pvr;
+        struct mpc52xx_cdm  __iomem *cdm;
+        struct device_node *np_cdm;
+        unsigned int freq;
+        u32 val;
+
+        pvr = mfspr(SPRN_PVR);
+
+        freq = mpc5xxx_get_bus_frequency(of->node);
+        if (!freq)
+                return 0;
+
+        if (clock_src == MSCAN_CLKSRC_BUS || pvr == 0x80822011)
+                return freq;
+
+        /* Determine SYS_XTAL_IN frequency from the clock domain settings */
+        np_cdm = of_find_matching_node(NULL, mpc52xx_cdm_ids);
+        if (!np_cdm) {
+                dev_err(&of->dev, "can't get clock node!\n");
+                return 0;
+        }
+        cdm = of_iomap(np_cdm, 0);
+        of_node_put(np_cdm);
+
+        if (in_8(&cdm->ipb_clk_sel) & 0x1)
+                freq *= 2;
+        val = in_be32(&cdm->rstcfg);
+
+        freq *= (val & (1 << 5)) ? 8 : 4;
+        freq /= (val & (1 << 6)) ? 12 : 16;
+
+        iounmap(cdm);
+
+        return freq;
+}
+
+static int __devinit mpc5xxx_can_probe(struct of_device *ofdev,
+                                       const struct of_device_id *id)
+{
+        struct device_node *np = ofdev->node;
+        struct net_device *dev;
+        struct mscan_priv *priv;
+        void __iomem *base;
+        const char *clk_src;
+        int err, irq, clock_src;
+
+        base = of_iomap(ofdev->node, 0);
+        if (!base) {
+                dev_err(&ofdev->dev, "couldn't ioremap\n");
+                err = -ENOMEM;
+                goto exit_release_mem;
+        }
+
+        irq = irq_of_parse_and_map(np, 0);
+        if (!irq) {
+                dev_err(&ofdev->dev, "no irq found\n");
+                err = -ENODEV;
+                goto exit_unmap_mem;
+        }
+
+        dev = alloc_mscandev();
+        if (!dev) {
+                err = -ENOMEM;
+                goto exit_dispose_irq;
+        }
+
+        priv = netdev_priv(dev);
+        priv->reg_base = base;
+        dev->irq = irq;
+
+        /*
+         * Either the oscillator clock (SYS_XTAL_IN) or the IP bus clock
+         * (IP_CLK) can be selected as MSCAN clock source. According to
+         * the MPC5200 user's manual, the oscillator clock is the better
+         * choice as it has less jitter. For this reason, it is selected
+         * by default.
+         */
+        clk_src = of_get_property(np, "fsl,mscan-clock-source", NULL);
+        if (clk_src && strcmp(clk_src, "ip") == 0)
+                clock_src = MSCAN_CLKSRC_BUS;
+        else
+                clock_src = MSCAN_CLKSRC_XTAL;
+        priv->can.clock.freq = mpc52xx_can_clock_freq(ofdev, clock_src);
+        if (!priv->can.clock.freq) {
+                dev_err(&ofdev->dev, "couldn't get MSCAN clock frequency\n");
+                err = -ENODEV;
+                goto exit_free_mscan;
+        }
+
+        SET_NETDEV_DEV(dev, &ofdev->dev);
+
+        err = register_mscandev(dev, clock_src);
+        if (err) {
+                dev_err(&ofdev->dev, "registering %s failed (err=%d)\n",
+                        DRV_NAME, err);
+                goto exit_free_mscan;
+        }
+
+        dev_set_drvdata(&ofdev->dev, dev);
+
+        dev_info(&ofdev->dev, "MSCAN at 0x%p, irq %d, clock %d Hz\n",
+                 priv->reg_base, dev->irq, priv->can.clock.freq);
+
+        return 0;
+
+exit_free_mscan:
+        free_candev(dev);
+exit_dispose_irq:
+        irq_dispose_mapping(irq);
+exit_unmap_mem:
+        iounmap(base);
+exit_release_mem:
+        return err;
+}
+
+static int __devexit mpc5xxx_can_remove(struct of_device *ofdev)
+{
+        struct net_device *dev = dev_get_drvdata(&ofdev->dev);
+        struct mscan_priv *priv = netdev_priv(dev);
+
+        dev_set_drvdata(&ofdev->dev, NULL);
+
+        unregister_mscandev(dev);
+        iounmap(priv->reg_base);
+        irq_dispose_mapping(dev->irq);
+        free_candev(dev);
+
+        return 0;
+}
+
+#ifdef CONFIG_PM
+static struct mscan_regs saved_regs;
+static int mpc5xxx_can_suspend(struct of_device *ofdev, pm_message_t state)
+{
+        struct net_device *dev = dev_get_drvdata(&ofdev->dev);
+        struct mscan_priv *priv = netdev_priv(dev);
+        struct mscan_regs *regs = (struct mscan_regs *)priv->reg_base;
+
+        _memcpy_fromio(&saved_regs, regs, sizeof(*regs));
+
+        return 0;
+}
+
+static int mpc5xxx_can_resume(struct of_device *ofdev)
+{
+        struct net_device *dev = dev_get_drvdata(&ofdev->dev);
+        struct mscan_priv *priv = netdev_priv(dev);
+        struct mscan_regs *regs = (struct mscan_regs *)priv->reg_base;
+
+        regs->canctl0 |= MSCAN_INITRQ;
+        while (!(regs->canctl1 & MSCAN_INITAK))
+                udelay(10);
+
+        regs->canctl1 = saved_regs.canctl1;
+        regs->canbtr0 = saved_regs.canbtr0;
+        regs->canbtr1 = saved_regs.canbtr1;
+        regs->canidac = saved_regs.canidac;
+
+        /* restore masks, buffers etc. */
+        _memcpy_toio(&regs->canidar1_0, (void *)&saved_regs.canidar1_0,
+                     sizeof(*regs) - offsetof(struct mscan_regs, canidar1_0));
+
+        regs->canctl0 &= ~MSCAN_INITRQ;
+        regs->cantbsel = saved_regs.cantbsel;
+        regs->canrier = saved_regs.canrier;
+        regs->cantier = saved_regs.cantier;
+        regs->canctl0 = saved_regs.canctl0;
+
+        return 0;
+}
+#endif
+
+static struct of_device_id __devinitdata mpc5xxx_can_table[] = {
+        {.compatible = "fsl,mpc5200-mscan"},
+        {},
+};
+
+static struct of_platform_driver mpc5xxx_can_driver = {
+        .owner = THIS_MODULE,
+        .name = "mpc5xxx_can",
+        .probe = mpc5xxx_can_probe,
+        .remove = __devexit_p(mpc5xxx_can_remove),
+#ifdef CONFIG_PM
+        .suspend = mpc5xxx_can_suspend,
+        .resume = mpc5xxx_can_resume,
+#endif
+        .match_table = mpc5xxx_can_table,
+};
+
+static int __init mpc5xxx_can_init(void)
+{
+        return of_register_platform_driver(&mpc5xxx_can_driver);
+}
+module_init(mpc5xxx_can_init);
+
+static void __exit mpc5xxx_can_exit(void)
+{
+        return of_unregister_platform_driver(&mpc5xxx_can_driver);
+};
+module_exit(mpc5xxx_can_exit);
+
+MODULE_AUTHOR("Wolfgang Grandegger <wg@grandegger.com>");
+MODULE_DESCRIPTION("Freescale MPC5200 CAN driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/net/can/mscan/mscan.c b/drivers/net/can/mscan/mscan.c
new file mode 100644
index 00000000000..bb06dfb58f2
--- /dev/null
+++ b/drivers/net/can/mscan/mscan.c
@@ -0,0 +1,668 @@
+/*
+ * CAN bus driver for the alone generic (as possible as) MSCAN controller.
+ *
+ * Copyright (C) 2005-2006 Andrey Volkov <avolkov@varma-el.com>,
+ *                         Varma Electronics Oy
+ * Copyright (C) 2008-2009 Wolfgang Grandegger <wg@grandegger.com>
+ * Copytight (C) 2008-2009 Pengutronix <kernel@pengutronix.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the version 2 of the GNU General Public License
+ * as published by the Free Software Foundation
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/interrupt.h>
+#include <linux/delay.h>
+#include <linux/netdevice.h>
+#include <linux/if_arp.h>
+#include <linux/if_ether.h>
+#include <linux/list.h>
+#include <linux/can.h>
+#include <linux/can/dev.h>
+#include <linux/can/error.h>
+#include <linux/io.h>
+
+#include "mscan.h"
+
+static struct can_bittiming_const mscan_bittiming_const = {
+        .name = "mscan",
+        .tseg1_min = 4,
+        .tseg1_max = 16,
+        .tseg2_min = 2,
+        .tseg2_max = 8,
+        .sjw_max = 4,
+        .brp_min = 1,
+        .brp_max = 64,
+        .brp_inc = 1,
+};
+
+struct mscan_state {
+        u8 mode;
+        u8 canrier;
+        u8 cantier;
+};
+
+static enum can_state state_map[] = {
+        CAN_STATE_ERROR_ACTIVE,
+        CAN_STATE_ERROR_WARNING,
+        CAN_STATE_ERROR_PASSIVE,
+        CAN_STATE_BUS_OFF
+};
+
+static int mscan_set_mode(struct net_device *dev, u8 mode)
+{
+        struct mscan_priv *priv = netdev_priv(dev);
+        struct mscan_regs *regs = (struct mscan_regs *)priv->reg_base;
+        int ret = 0;
+        int i;
+        u8 canctl1;
+
+        if (mode != MSCAN_NORMAL_MODE) {
+                if (priv->tx_active) {
+                        /* Abort transfers before going to sleep */#
+                        out_8(&regs->cantarq, priv->tx_active);
+                        /* Suppress TX done interrupts */
+                        out_8(&regs->cantier, 0);
+                }
+
+                canctl1 = in_8(&regs->canctl1);
+                if ((mode & MSCAN_SLPRQ) && !(canctl1 & MSCAN_SLPAK)) {
+                        setbits8(&regs->canctl0, MSCAN_SLPRQ);
+                        for (i = 0; i < MSCAN_SET_MODE_RETRIES; i++) {
+                                if (in_8(&regs->canctl1) & MSCAN_SLPAK)
+                                        break;
+                                udelay(100);
+                        }
+                        /*
+                         * The mscan controller will fail to enter sleep mode,
+                         * while there are irregular activities on bus, like
+                         * somebody keeps retransmitting. This behavior is
+                         * undocumented and seems to differ between mscan built
+                         * in mpc5200b and mpc5200. We proceed in that case,
+                         * since otherwise the slprq will be kept set and the
+                         * controller will get stuck. NOTE: INITRQ or CSWAI
+                         * will abort all active transmit actions, if still
+                         * any, at once.
+                         */
+                        if (i >= MSCAN_SET_MODE_RETRIES)
+                                dev_dbg(dev->dev.parent,
+                                        "device failed to enter sleep mode. "
+                                        "We proceed anyhow.\n");
+                        else
+                                priv->can.state = CAN_STATE_SLEEPING;
+                }
+
+                if ((mode & MSCAN_INITRQ) && !(canctl1 & MSCAN_INITAK)) {
+                        setbits8(&regs->canctl0, MSCAN_INITRQ);
+                        for (i = 0; i < MSCAN_SET_MODE_RETRIES; i++) {
+                                if (in_8(&regs->canctl1) & MSCAN_INITAK)
+                                        break;
+                        }
+                        if (i >= MSCAN_SET_MODE_RETRIES)
+                                ret = -ENODEV;
+                }
+                if (!ret)
+                        priv->can.state = CAN_STATE_STOPPED;
+
+                if (mode & MSCAN_CSWAI)
+                        setbits8(&regs->canctl0, MSCAN_CSWAI);
+
+        } else {
+                canctl1 = in_8(&regs->canctl1);
+                if (canctl1 & (MSCAN_SLPAK | MSCAN_INITAK)) {
+                        clrbits8(&regs->canctl0, MSCAN_SLPRQ | MSCAN_INITRQ);
+                        for (i = 0; i < MSCAN_SET_MODE_RETRIES; i++) {
+                                canctl1 = in_8(&regs->canctl1);
+                                if (!(canctl1 & (MSCAN_INITAK | MSCAN_SLPAK)))
+                                        break;
+                        }
+                        if (i >= MSCAN_SET_MODE_RETRIES)
+                                ret = -ENODEV;
+                        else
+                                priv->can.state = CAN_STATE_ERROR_ACTIVE;
+                }
+        }
+        return ret;
+}
+
+static int mscan_start(struct net_device *dev)
+{
+        struct mscan_priv *priv = netdev_priv(dev);
+        struct mscan_regs *regs = (struct mscan_regs *)priv->reg_base;
+        u8 canrflg;
+        int err;
+
+        out_8(&regs->canrier, 0);
+
+        INIT_LIST_HEAD(&priv->tx_head);
+        priv->prev_buf_id = 0;
+        priv->cur_pri = 0;
+        priv->tx_active = 0;
+        priv->shadow_canrier = 0;
+        priv->flags = 0;
+
+        err = mscan_set_mode(dev, MSCAN_NORMAL_MODE);
+        if (err)
+                return err;
+
+        canrflg = in_8(&regs->canrflg);
+        priv->shadow_statflg = canrflg & MSCAN_STAT_MSK;
+        priv->can.state = state_map[max(MSCAN_STATE_RX(canrflg),
+                                    MSCAN_STATE_TX(canrflg))];
+        out_8(&regs->cantier, 0);
+
+        /* Enable receive interrupts. */
+        out_8(&regs->canrier, MSCAN_OVRIE | MSCAN_RXFIE | MSCAN_CSCIE |
+              MSCAN_RSTATE1 | MSCAN_RSTATE0 | MSCAN_TSTATE1 | MSCAN_TSTATE0);
+
+        return 0;
+}
+
+static netdev_tx_t mscan_start_xmit(struct sk_buff *skb, struct net_device *dev)
+{
+        struct can_frame *frame = (struct can_frame *)skb->data;
+        struct mscan_priv *priv = netdev_priv(dev);
+        struct mscan_regs *regs = (struct mscan_regs *)priv->reg_base;
+        int i, rtr, buf_id;
+        u32 can_id;
+
+        if (frame->can_dlc > 8)
+                return -EINVAL;
+
+        out_8(&regs->cantier, 0);
+
+        i = ~priv->tx_active & MSCAN_TXE;
+        buf_id = ffs(i) - 1;
+        switch (hweight8(i)) {
+        case 0:
+                netif_stop_queue(dev);
+                dev_err(dev->dev.parent, "Tx Ring full when queue awake!\n");
+                return NETDEV_TX_BUSY;
+        case 1:
+                /*
+                 * if buf_id < 3, then current frame will be send out of order,
+                 * since buffer with lower id have higher priority (hell..)
+                 */
+                netif_stop_queue(dev);
+        case 2:
+                if (buf_id < priv->prev_buf_id) {
+                        priv->cur_pri++;
+                        if (priv->cur_pri == 0xff) {
+                                set_bit(F_TX_WAIT_ALL, &priv->flags);
+                                netif_stop_queue(dev);
+                        }
+                }
+                set_bit(F_TX_PROGRESS, &priv->flags);
+                break;
+        }
+        priv->prev_buf_id = buf_id;
+        out_8(&regs->cantbsel, i);
+
+        rtr = frame->can_id & CAN_RTR_FLAG;
+
+        /* RTR is always the lowest bit of interest, then IDs follow */
+        if (frame->can_id & CAN_EFF_FLAG) {
+                can_id = (frame->can_id & CAN_EFF_MASK)
+                         << (MSCAN_EFF_RTR_SHIFT + 1);
+                if (rtr)
+                        can_id |= 1 << MSCAN_EFF_RTR_SHIFT;
+                out_be16(&regs->tx.idr3_2, can_id);
+
+                can_id >>= 16;
+                /* EFF_FLAGS are inbetween the IDs :( */
+                can_id = (can_id & 0x7) | ((can_id << 2) & 0xffe0)
+                         | MSCAN_EFF_FLAGS;
+        } else {
+                can_id = (frame->can_id & CAN_SFF_MASK)
+                         << (MSCAN_SFF_RTR_SHIFT + 1);
+                if (rtr)
+                        can_id |= 1 << MSCAN_SFF_RTR_SHIFT;
+        }
+        out_be16(&regs->tx.idr1_0, can_id);
+
+        if (!rtr) {
+                void __iomem *data = &regs->tx.dsr1_0;
+                u16 *payload = (u16 *)frame->data;
+
+                /* It is safe to write into dsr[dlc+1] */
+                for (i = 0; i < (frame->can_dlc + 1) / 2; i++) {
+                        out_be16(data, *payload++);
+                        data += 2 + _MSCAN_RESERVED_DSR_SIZE;
+                }
+        }
+
+        out_8(&regs->tx.dlr, frame->can_dlc);
+        out_8(&regs->tx.tbpr, priv->cur_pri);
+
+        /* Start transmission. */
+        out_8(&regs->cantflg, 1 << buf_id);
+
+        if (!test_bit(F_TX_PROGRESS, &priv->flags))
+                dev->trans_start = jiffies;
+
+        list_add_tail(&priv->tx_queue[buf_id].list, &priv->tx_head);
+
+        can_put_echo_skb(skb, dev, buf_id);
+
+        /* Enable interrupt. */
+        priv->tx_active |= 1 << buf_id;
+        out_8(&regs->cantier, priv->tx_active);
+
+        return NETDEV_TX_OK;
+}
+
+/* This function returns the old state to see where we came from */
+static enum can_state check_set_state(struct net_device *dev, u8 canrflg)
+{
+        struct mscan_priv *priv = netdev_priv(dev);
+        enum can_state state, old_state = priv->can.state;
+
+        if (canrflg & MSCAN_CSCIF && old_state <= CAN_STATE_BUS_OFF) {
+                state = state_map[max(MSCAN_STATE_RX(canrflg),
+                                      MSCAN_STATE_TX(canrflg))];
+                priv->can.state = state;
+        }
+        return old_state;
+}
+
+static void mscan_get_rx_frame(struct net_device *dev, struct can_frame *frame)
+{
+        struct mscan_priv *priv = netdev_priv(dev);
+        struct mscan_regs *regs = (struct mscan_regs *)priv->reg_base;
+        u32 can_id;
+        int i;
+
+        can_id = in_be16(&regs->rx.idr1_0);
+        if (can_id & (1 << 3)) {
+                frame->can_id = CAN_EFF_FLAG;
+                can_id = ((can_id << 16) | in_be16(&regs->rx.idr3_2));
+                can_id = ((can_id & 0xffe00000) |
+                          ((can_id & 0x7ffff) << 2)) >> 2;
+        } else {
+                can_id >>= 4;
+                frame->can_id = 0;
+        }
+
+        frame->can_id |= can_id >> 1;
+        if (can_id & 1)
+                frame->can_id |= CAN_RTR_FLAG;
+        frame->can_dlc = in_8(&regs->rx.dlr) & 0xf;
+
+        if (!(frame->can_id & CAN_RTR_FLAG)) {
+                void __iomem *data = &regs->rx.dsr1_0;
+                u16 *payload = (u16 *)frame->data;
+
+                for (i = 0; i < (frame->can_dlc + 1) / 2; i++) {
+                        *payload++ = in_be16(data);
+                        data += 2 + _MSCAN_RESERVED_DSR_SIZE;
+                }
+        }
+
+        out_8(&regs->canrflg, MSCAN_RXF);
+}
+
+static void mscan_get_err_frame(struct net_device *dev, struct can_frame *frame,
+                                u8 canrflg)
+{
+        struct mscan_priv *priv = netdev_priv(dev);
+        struct mscan_regs *regs = (struct mscan_regs *)priv->reg_base;
+        struct net_device_stats *stats = &dev->stats;
+        enum can_state old_state;
+
+        dev_dbg(dev->dev.parent, "error interrupt (canrflg=%#x)\n", canrflg);
+        frame->can_id = CAN_ERR_FLAG;
+
+        if (canrflg & MSCAN_OVRIF) {
+                frame->can_id |= CAN_ERR_CRTL;
+                frame->data[1] = CAN_ERR_CRTL_RX_OVERFLOW;
+                stats->rx_over_errors++;
+                stats->rx_errors++;
+        } else {
+                frame->data[1] = 0;
+        }
+
+        old_state = check_set_state(dev, canrflg);
+        /* State changed */
+        if (old_state != priv->can.state) {
+                switch (priv->can.state) {
+                case CAN_STATE_ERROR_WARNING:
+                        frame->can_id |= CAN_ERR_CRTL;
+                        priv->can.can_stats.error_warning++;
+                        if ((priv->shadow_statflg & MSCAN_RSTAT_MSK) <
+                            (canrflg & MSCAN_RSTAT_MSK))
+                                frame->data[1] |= CAN_ERR_CRTL_RX_WARNING;
+                        if ((priv->shadow_statflg & MSCAN_TSTAT_MSK) <
+                            (canrflg & MSCAN_TSTAT_MSK))
+                                frame->data[1] |= CAN_ERR_CRTL_TX_WARNING;
+                        break;
+                case CAN_STATE_ERROR_PASSIVE:
+                        frame->can_id |= CAN_ERR_CRTL;
+                        priv->can.can_stats.error_passive++;
+                        frame->data[1] |= CAN_ERR_CRTL_RX_PASSIVE;
+                        break;
+                case CAN_STATE_BUS_OFF:
+                        frame->can_id |= CAN_ERR_BUSOFF;
+                        /*
+                         * The MSCAN on the MPC5200 does recover from bus-off
+                         * automatically. To avoid that we stop the chip doing
+                         * a light-weight stop (we are in irq-context).
+                         */
+                        out_8(&regs->cantier, 0);
+                        out_8(&regs->canrier, 0);
+                        setbits8(&regs->canctl0, MSCAN_SLPRQ | MSCAN_INITRQ);
+                        can_bus_off(dev);
+                        break;
+                default:
+                        break;
+                }
+        }
+        priv->shadow_statflg = canrflg & MSCAN_STAT_MSK;
+        frame->can_dlc = CAN_ERR_DLC;
+        out_8(&regs->canrflg, MSCAN_ERR_IF);
+}
+
+static int mscan_rx_poll(struct napi_struct *napi, int quota)
+{
+        struct mscan_priv *priv = container_of(napi, struct mscan_priv, napi);
+        struct net_device *dev = napi->dev;
+        struct mscan_regs *regs = (struct mscan_regs *)priv->reg_base;
+        struct net_device_stats *stats = &dev->stats;
+        int npackets = 0;
+        int ret = 1;
+        struct sk_buff *skb;
+        struct can_frame *frame;
+        u8 canrflg;
+
+        while (npackets < quota) {
+                canrflg = in_8(&regs->canrflg);
+                if (!(canrflg & (MSCAN_RXF | MSCAN_ERR_IF)))
+                        break;
+
+                skb = alloc_can_skb(dev, &frame);
+                if (!skb) {
+                        if (printk_ratelimit())
+                                dev_notice(dev->dev.parent, "packet dropped\n");
+                        stats->rx_dropped++;
+                        out_8(&regs->canrflg, canrflg);
+                        continue;
+                }
+
+                if (canrflg & MSCAN_RXF)
+                        mscan_get_rx_frame(dev, frame);
+                else if (canrflg & MSCAN_ERR_IF)
+                        mscan_get_err_frame(dev, frame, canrflg);
+
+                stats->rx_packets++;
+                stats->rx_bytes += frame->can_dlc;
+                npackets++;
+                netif_receive_skb(skb);
+        }
+
+        if (!(in_8(&regs->canrflg) & (MSCAN_RXF | MSCAN_ERR_IF))) {
+                napi_complete(&priv->napi);
+                clear_bit(F_RX_PROGRESS, &priv->flags);
+                if (priv->can.state < CAN_STATE_BUS_OFF)
+                        out_8(&regs->canrier, priv->shadow_canrier);
+                ret = 0;
+        }
+        return ret;
+}
+
+static irqreturn_t mscan_isr(int irq, void *dev_id)
+{
+        struct net_device *dev = (struct net_device *)dev_id;
+        struct mscan_priv *priv = netdev_priv(dev);
+        struct mscan_regs *regs = (struct mscan_regs *)priv->reg_base;
+        struct net_device_stats *stats = &dev->stats;
+        u8 cantier, cantflg, canrflg;
+        irqreturn_t ret = IRQ_NONE;
+
+        cantier = in_8(&regs->cantier) & MSCAN_TXE;
+        cantflg = in_8(&regs->cantflg) & cantier;
+
+        if (cantier && cantflg) {
+                struct list_head *tmp, *pos;
+
+                list_for_each_safe(pos, tmp, &priv->tx_head) {
+                        struct tx_queue_entry *entry =
+                            list_entry(pos, struct tx_queue_entry, list);
+                        u8 mask = entry->mask;
+
+                        if (!(cantflg & mask))
+                                continue;
+
+                        out_8(&regs->cantbsel, mask);
+                        stats->tx_bytes += in_8(&regs->tx.dlr);
+                        stats->tx_packets++;
+                        can_get_echo_skb(dev, entry->id);
+                        priv->tx_active &= ~mask;
+                        list_del(pos);
+                }
+
+                if (list_empty(&priv->tx_head)) {
+                        clear_bit(F_TX_WAIT_ALL, &priv->flags);
+                        clear_bit(F_TX_PROGRESS, &priv->flags);
+                        priv->cur_pri = 0;
+                } else {
+                        dev->trans_start = jiffies;
+                }
+
+                if (!test_bit(F_TX_WAIT_ALL, &priv->flags))
+                        netif_wake_queue(dev);
+
+                out_8(&regs->cantier, priv->tx_active);
+                ret = IRQ_HANDLED;
+        }
+
+        canrflg = in_8(&regs->canrflg);
+        if ((canrflg & ~MSCAN_STAT_MSK) &&
+            !test_and_set_bit(F_RX_PROGRESS, &priv->flags)) {
+                if (canrflg & ~MSCAN_STAT_MSK) {
+                        priv->shadow_canrier = in_8(&regs->canrier);
+                        out_8(&regs->canrier, 0);
+                        napi_schedule(&priv->napi);
+                        ret = IRQ_HANDLED;
+                } else {
+                        clear_bit(F_RX_PROGRESS, &priv->flags);
+                }
+        }
+        return ret;
+}
+
+static int mscan_do_set_mode(struct net_device *dev, enum can_mode mode)
+{
+        struct mscan_priv *priv = netdev_priv(dev);
+        int ret = 0;
+
+        if (!priv->open_time)
+                return -EINVAL;
+
+        switch (mode) {
+        case CAN_MODE_START:
+                if (priv->can.state <= CAN_STATE_BUS_OFF)
+                        mscan_set_mode(dev, MSCAN_INIT_MODE);
+                ret = mscan_start(dev);
+                if (ret)
+                        break;
+                if (netif_queue_stopped(dev))
+                        netif_wake_queue(dev);
+                break;
+
+        default:
+                ret = -EOPNOTSUPP;
+                break;
+        }
+        return ret;
+}
+
+static int mscan_do_set_bittiming(struct net_device *dev)
+{
+        struct mscan_priv *priv = netdev_priv(dev);
+        struct mscan_regs *regs = (struct mscan_regs *)priv->reg_base;
+        struct can_bittiming *bt = &priv->can.bittiming;
+        u8 btr0, btr1;
+
+        btr0 = BTR0_SET_BRP(bt->brp) | BTR0_SET_SJW(bt->sjw);
+        btr1 = (BTR1_SET_TSEG1(bt->prop_seg + bt->phase_seg1) |
+                BTR1_SET_TSEG2(bt->phase_seg2) |
+                BTR1_SET_SAM(priv->can.ctrlmode & CAN_CTRLMODE_3_SAMPLES));
+
+        dev_info(dev->dev.parent, "setting BTR0=0x%02x BTR1=0x%02x\n",
+                btr0, btr1);
+
+        out_8(&regs->canbtr0, btr0);
+        out_8(&regs->canbtr1, btr1);
+
+        return 0;
+}
+
+static int mscan_open(struct net_device *dev)
+{
+        int ret;
+        struct mscan_priv *priv = netdev_priv(dev);
+        struct mscan_regs *regs = (struct mscan_regs *)priv->reg_base;
+
+        /* common open */
+        ret = open_candev(dev);
+        if (ret)
+                return ret;
+
+        napi_enable(&priv->napi);
+
+        ret = request_irq(dev->irq, mscan_isr, 0, dev->name, dev);
+        if (ret < 0) {
+                dev_err(dev->dev.parent, "failed to attach interrupt\n");
+                goto exit_napi_disable;
+        }
+
+        priv->open_time = jiffies;
+
+        clrbits8(&regs->canctl1, MSCAN_LISTEN);
+
+        ret = mscan_start(dev);
+        if (ret)
+                goto exit_free_irq;
+
+        netif_start_queue(dev);
+
+        return 0;
+
+exit_free_irq:
+        priv->open_time = 0;
+        free_irq(dev->irq, dev);
+exit_napi_disable:
+        napi_disable(&priv->napi);
+        close_candev(dev);
+        return ret;
+}
+
+static int mscan_close(struct net_device *dev)
+{
+        struct mscan_priv *priv = netdev_priv(dev);
+        struct mscan_regs *regs = (struct mscan_regs *)priv->reg_base;
+
+        netif_stop_queue(dev);
+        napi_disable(&priv->napi);
+
+        out_8(&regs->cantier, 0);
+        out_8(&regs->canrier, 0);
+        mscan_set_mode(dev, MSCAN_INIT_MODE);
+        close_candev(dev);
+        free_irq(dev->irq, dev);
+        priv->open_time = 0;
+
+        return 0;
+}
+
+static const struct net_device_ops mscan_netdev_ops = {
+       .ndo_open               = mscan_open,
+       .ndo_stop               = mscan_close,
+       .ndo_start_xmit         = mscan_start_xmit,
+};
+
+int register_mscandev(struct net_device *dev, int clock_src)
+{
+        struct mscan_priv *priv = netdev_priv(dev);
+        struct mscan_regs *regs = (struct mscan_regs *)priv->reg_base;
+        u8 ctl1;
+
+        ctl1 = in_8(&regs->canctl1);
+        if (clock_src)
+                ctl1 |= MSCAN_CLKSRC;
+        else
+                ctl1 &= ~MSCAN_CLKSRC;
+
+        ctl1 |= MSCAN_CANE;
+        out_8(&regs->canctl1, ctl1);
+        udelay(100);
+
+        /* acceptance mask/acceptance code (accept everything) */
+        out_be16(&regs->canidar1_0, 0);
+        out_be16(&regs->canidar3_2, 0);
+        out_be16(&regs->canidar5_4, 0);
+        out_be16(&regs->canidar7_6, 0);
+
+        out_be16(&regs->canidmr1_0, 0xffff);
+        out_be16(&regs->canidmr3_2, 0xffff);
+        out_be16(&regs->canidmr5_4, 0xffff);
+        out_be16(&regs->canidmr7_6, 0xffff);
+        /* Two 32 bit Acceptance Filters */
+        out_8(&regs->canidac, MSCAN_AF_32BIT);
+
+        mscan_set_mode(dev, MSCAN_INIT_MODE);
+
+        return register_candev(dev);
+}
+
+void unregister_mscandev(struct net_device *dev)
+{
+        struct mscan_priv *priv = netdev_priv(dev);
+        struct mscan_regs *regs = (struct mscan_regs *)priv->reg_base;
+        mscan_set_mode(dev, MSCAN_INIT_MODE);
+        clrbits8(&regs->canctl1, MSCAN_CANE);
+        unregister_candev(dev);
+}
+
+struct net_device *alloc_mscandev(void)
+{
+        struct net_device *dev;
+        struct mscan_priv *priv;
+        int i;
+
+        dev = alloc_candev(sizeof(struct mscan_priv), MSCAN_ECHO_SKB_MAX);
+        if (!dev)
+                return NULL;
+        priv = netdev_priv(dev);
+
+        dev->netdev_ops = &mscan_netdev_ops;
+
+        dev->flags |= IFF_ECHO; /* we support local echo */
+
+        netif_napi_add(dev, &priv->napi, mscan_rx_poll, 8);
+
+        priv->can.bittiming_const = &mscan_bittiming_const;
+        priv->can.do_set_bittiming = mscan_do_set_bittiming;
+        priv->can.do_set_mode = mscan_do_set_mode;
+
+        for (i = 0; i < TX_QUEUE_SIZE; i++) {
+                priv->tx_queue[i].id = i;
+                priv->tx_queue[i].mask = 1 << i;
+        }
+
+        return dev;
+}
+
+MODULE_AUTHOR("Andrey Volkov <avolkov@varma-el.com>");
+MODULE_LICENSE("GPL v2");
+MODULE_DESCRIPTION("CAN port driver for a MSCAN based chips");
diff --git a/drivers/net/can/mscan/mscan.h b/drivers/net/can/mscan/mscan.h
new file mode 100644
index 00000000000..00fc4aaf1ed
--- /dev/null
+++ b/drivers/net/can/mscan/mscan.h
@@ -0,0 +1,296 @@
+/*
+ * Definitions of consts/structs to drive the Freescale MSCAN.
+ *
+ * Copyright (C) 2005-2006 Andrey Volkov <avolkov@varma-el.com>,
+ *                         Varma Electronics Oy
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the version 2 of the GNU General Public License
+ * as published by the Free Software Foundation
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __MSCAN_H__
+#define __MSCAN_H__
+
+#include <linux/types.h>
+
+/* MSCAN control register 0 (CANCTL0) bits */
+#define MSCAN_RXFRM             0x80
+#define MSCAN_RXACT             0x40
+#define MSCAN_CSWAI             0x20
+#define MSCAN_SYNCH             0x10
+#define MSCAN_TIME              0x08
+#define MSCAN_WUPE              0x04
+#define MSCAN_SLPRQ             0x02
+#define MSCAN_INITRQ            0x01
+
+/* MSCAN control register 1 (CANCTL1) bits */
+#define MSCAN_CANE              0x80
+#define MSCAN_CLKSRC            0x40
+#define MSCAN_LOOPB             0x20
+#define MSCAN_LISTEN            0x10
+#define MSCAN_WUPM              0x04
+#define MSCAN_SLPAK             0x02
+#define MSCAN_INITAK            0x01
+
+/* Use the MPC5200 MSCAN variant? */
+#ifdef CONFIG_PPC
+#define MSCAN_FOR_MPC5200
+#endif
+
+#ifdef MSCAN_FOR_MPC5200
+#define MSCAN_CLKSRC_BUS        0
+#define MSCAN_CLKSRC_XTAL       MSCAN_CLKSRC
+#else
+#define MSCAN_CLKSRC_BUS        MSCAN_CLKSRC
+#define MSCAN_CLKSRC_XTAL       0
+#endif
+
+/* MSCAN receiver flag register (CANRFLG) bits */
+#define MSCAN_WUPIF             0x80
+#define MSCAN_CSCIF             0x40
+#define MSCAN_RSTAT1            0x20
+#define MSCAN_RSTAT0            0x10
+#define MSCAN_TSTAT1            0x08
+#define MSCAN_TSTAT0            0x04
+#define MSCAN_OVRIF             0x02
+#define MSCAN_RXF               0x01
+#define MSCAN_ERR_IF            (MSCAN_OVRIF | MSCAN_CSCIF)
+#define MSCAN_RSTAT_MSK         (MSCAN_RSTAT1 | MSCAN_RSTAT0)
+#define MSCAN_TSTAT_MSK         (MSCAN_TSTAT1 | MSCAN_TSTAT0)
+#define MSCAN_STAT_MSK          (MSCAN_RSTAT_MSK | MSCAN_TSTAT_MSK)
+
+#define MSCAN_STATE_BUS_OFF     (MSCAN_RSTAT1 | MSCAN_RSTAT0 | \
+                                 MSCAN_TSTAT1 | MSCAN_TSTAT0)
+#define MSCAN_STATE_TX(canrflg) (((canrflg)&MSCAN_TSTAT_MSK)>>2)
+#define MSCAN_STATE_RX(canrflg) (((canrflg)&MSCAN_RSTAT_MSK)>>4)
+#define MSCAN_STATE_ACTIVE      0
+#define MSCAN_STATE_WARNING     1
+#define MSCAN_STATE_PASSIVE     2
+#define MSCAN_STATE_BUSOFF      3
+
+/* MSCAN receiver interrupt enable register (CANRIER) bits */
+#define MSCAN_WUPIE             0x80
+#define MSCAN_CSCIE             0x40
+#define MSCAN_RSTATE1           0x20
+#define MSCAN_RSTATE0           0x10
+#define MSCAN_TSTATE1           0x08
+#define MSCAN_TSTATE0           0x04
+#define MSCAN_OVRIE             0x02
+#define MSCAN_RXFIE             0x01
+
+/* MSCAN transmitter flag register (CANTFLG) bits */
+#define MSCAN_TXE2              0x04
+#define MSCAN_TXE1              0x02
+#define MSCAN_TXE0              0x01
+#define MSCAN_TXE               (MSCAN_TXE2 | MSCAN_TXE1 | MSCAN_TXE0)
+
+/* MSCAN transmitter interrupt enable register (CANTIER) bits */
+#define MSCAN_TXIE2             0x04
+#define MSCAN_TXIE1             0x02
+#define MSCAN_TXIE0             0x01
+#define MSCAN_TXIE              (MSCAN_TXIE2 | MSCAN_TXIE1 | MSCAN_TXIE0)
+
+/* MSCAN transmitter message abort request (CANTARQ) bits */
+#define MSCAN_ABTRQ2            0x04
+#define MSCAN_ABTRQ1            0x02
+#define MSCAN_ABTRQ0            0x01
+
+/* MSCAN transmitter message abort ack (CANTAAK) bits */
+#define MSCAN_ABTAK2            0x04
+#define MSCAN_ABTAK1            0x02
+#define MSCAN_ABTAK0            0x01
+
+/* MSCAN transmit buffer selection (CANTBSEL) bits */
+#define MSCAN_TX2               0x04
+#define MSCAN_TX1               0x02
+#define MSCAN_TX0               0x01
+
+/* MSCAN ID acceptance control register (CANIDAC) bits */
+#define MSCAN_IDAM1             0x20
+#define MSCAN_IDAM0             0x10
+#define MSCAN_IDHIT2            0x04
+#define MSCAN_IDHIT1            0x02
+#define MSCAN_IDHIT0            0x01
+
+#define MSCAN_AF_32BIT          0x00
+#define MSCAN_AF_16BIT          MSCAN_IDAM0
+#define MSCAN_AF_8BIT           MSCAN_IDAM1
+#define MSCAN_AF_CLOSED         (MSCAN_IDAM0|MSCAN_IDAM1)
+#define MSCAN_AF_MASK           (~(MSCAN_IDAM0|MSCAN_IDAM1))
+
+/* MSCAN Miscellaneous Register (CANMISC) bits */
+#define MSCAN_BOHOLD            0x01
+
+/* MSCAN Identifier Register (IDR) bits */
+#define MSCAN_SFF_RTR_SHIFT     4
+#define MSCAN_EFF_RTR_SHIFT     0
+#define MSCAN_EFF_FLAGS         0x18    /* IDE + SRR */
+
+#ifdef MSCAN_FOR_MPC5200
+#define _MSCAN_RESERVED_(n, num) u8 _res##n[num]
+#define _MSCAN_RESERVED_DSR_SIZE        2
+#else
+#define _MSCAN_RESERVED_(n, num)
+#define _MSCAN_RESERVED_DSR_SIZE        0
+#endif
+
+/* Structure of the hardware registers */
+struct mscan_regs {
+        /* (see doc S12MSCANV3/D)                 MPC5200    MSCAN */
+        u8 canctl0;                             /* + 0x00     0x00 */
+        u8 canctl1;                             /* + 0x01     0x01 */
+        _MSCAN_RESERVED_(1, 2);                 /* + 0x02          */
+        u8 canbtr0;                             /* + 0x04     0x02 */
+        u8 canbtr1;                             /* + 0x05     0x03 */
+        _MSCAN_RESERVED_(2, 2);                 /* + 0x06          */
+        u8 canrflg;                             /* + 0x08     0x04 */
+        u8 canrier;                             /* + 0x09     0x05 */
+        _MSCAN_RESERVED_(3, 2);                 /* + 0x0a          */
+        u8 cantflg;                             /* + 0x0c     0x06 */
+        u8 cantier;                             /* + 0x0d     0x07 */
+        _MSCAN_RESERVED_(4, 2);                 /* + 0x0e          */
+        u8 cantarq;                             /* + 0x10     0x08 */
+        u8 cantaak;                             /* + 0x11     0x09 */
+        _MSCAN_RESERVED_(5, 2);                 /* + 0x12          */
+        u8 cantbsel;                            /* + 0x14     0x0a */
+        u8 canidac;                             /* + 0x15     0x0b */
+        u8 reserved;                            /* + 0x16     0x0c */
+        _MSCAN_RESERVED_(6, 5);                 /* + 0x17          */
+#ifndef MSCAN_FOR_MPC5200
+        u8 canmisc;                             /*            0x0d */
+#endif
+        u8 canrxerr;                            /* + 0x1c     0x0e */
+        u8 cantxerr;                            /* + 0x1d     0x0f */
+        _MSCAN_RESERVED_(7, 2);                 /* + 0x1e          */
+        u16 canidar1_0;                         /* + 0x20     0x10 */
+        _MSCAN_RESERVED_(8, 2);                 /* + 0x22          */
+        u16 canidar3_2;                         /* + 0x24     0x12 */
+        _MSCAN_RESERVED_(9, 2);                 /* + 0x26          */
+        u16 canidmr1_0;                         /* + 0x28     0x14 */
+        _MSCAN_RESERVED_(10, 2);                /* + 0x2a          */
+        u16 canidmr3_2;                         /* + 0x2c     0x16 */
+        _MSCAN_RESERVED_(11, 2);                /* + 0x2e          */
+        u16 canidar5_4;                         /* + 0x30     0x18 */
+        _MSCAN_RESERVED_(12, 2);                /* + 0x32          */
+        u16 canidar7_6;                         /* + 0x34     0x1a */
+        _MSCAN_RESERVED_(13, 2);                /* + 0x36          */
+        u16 canidmr5_4;                         /* + 0x38     0x1c */
+        _MSCAN_RESERVED_(14, 2);                /* + 0x3a          */
+        u16 canidmr7_6;                         /* + 0x3c     0x1e */
+        _MSCAN_RESERVED_(15, 2);                /* + 0x3e          */
+        struct {
+                u16 idr1_0;                     /* + 0x40     0x20 */
+                 _MSCAN_RESERVED_(16, 2);       /* + 0x42          */
+                u16 idr3_2;                     /* + 0x44     0x22 */
+                 _MSCAN_RESERVED_(17, 2);       /* + 0x46          */
+                u16 dsr1_0;                     /* + 0x48     0x24 */
+                 _MSCAN_RESERVED_(18, 2);       /* + 0x4a          */
+                u16 dsr3_2;                     /* + 0x4c     0x26 */
+                 _MSCAN_RESERVED_(19, 2);       /* + 0x4e          */
+                u16 dsr5_4;                     /* + 0x50     0x28 */
+                 _MSCAN_RESERVED_(20, 2);       /* + 0x52          */
+                u16 dsr7_6;                     /* + 0x54     0x2a */
+                 _MSCAN_RESERVED_(21, 2);       /* + 0x56          */
+                u8 dlr;                         /* + 0x58     0x2c */
+                 u8:8;                          /* + 0x59     0x2d */
+                 _MSCAN_RESERVED_(22, 2);       /* + 0x5a          */
+                u16 time;                       /* + 0x5c     0x2e */
+        } rx;
+         _MSCAN_RESERVED_(23, 2);               /* + 0x5e          */
+        struct {
+                u16 idr1_0;                     /* + 0x60     0x30 */
+                 _MSCAN_RESERVED_(24, 2);       /* + 0x62          */
+                u16 idr3_2;                     /* + 0x64     0x32 */
+                 _MSCAN_RESERVED_(25, 2);       /* + 0x66          */
+                u16 dsr1_0;                     /* + 0x68     0x34 */
+                 _MSCAN_RESERVED_(26, 2);       /* + 0x6a          */
+                u16 dsr3_2;                     /* + 0x6c     0x36 */
+                 _MSCAN_RESERVED_(27, 2);       /* + 0x6e          */
+                u16 dsr5_4;                     /* + 0x70     0x38 */
+                 _MSCAN_RESERVED_(28, 2);       /* + 0x72          */
+                u16 dsr7_6;                     /* + 0x74     0x3a */
+                 _MSCAN_RESERVED_(29, 2);       /* + 0x76          */
+                u8 dlr;                         /* + 0x78     0x3c */
+                u8 tbpr;                        /* + 0x79     0x3d */
+                 _MSCAN_RESERVED_(30, 2);       /* + 0x7a          */
+                u16 time;                       /* + 0x7c     0x3e */
+        } tx;
+         _MSCAN_RESERVED_(31, 2);               /* + 0x7e          */
+} __attribute__ ((packed));
+
+#undef _MSCAN_RESERVED_
+#define MSCAN_REGION    sizeof(struct mscan)
+
+#define MSCAN_NORMAL_MODE       0
+#define MSCAN_SLEEP_MODE        MSCAN_SLPRQ
+#define MSCAN_INIT_MODE         (MSCAN_INITRQ | MSCAN_SLPRQ)
+#define MSCAN_POWEROFF_MODE     (MSCAN_CSWAI | MSCAN_SLPRQ)
+#define MSCAN_SET_MODE_RETRIES  255
+#define MSCAN_ECHO_SKB_MAX      3
+
+#define BTR0_BRP_MASK           0x3f
+#define BTR0_SJW_SHIFT          6
+#define BTR0_SJW_MASK           (0x3 << BTR0_SJW_SHIFT)
+
+#define BTR1_TSEG1_MASK         0xf
+#define BTR1_TSEG2_SHIFT        4
+#define BTR1_TSEG2_MASK         (0x7 << BTR1_TSEG2_SHIFT)
+#define BTR1_SAM_SHIFT          7
+
+#define BTR0_SET_BRP(brp)       (((brp) - 1) & BTR0_BRP_MASK)
+#define BTR0_SET_SJW(sjw)       ((((sjw) - 1) << BTR0_SJW_SHIFT) & \
+                                 BTR0_SJW_MASK)
+
+#define BTR1_SET_TSEG1(tseg1)   (((tseg1) - 1) &  BTR1_TSEG1_MASK)
+#define BTR1_SET_TSEG2(tseg2)   ((((tseg2) - 1) << BTR1_TSEG2_SHIFT) & \
+                                 BTR1_TSEG2_MASK)
+#define BTR1_SET_SAM(sam)       ((sam) ? 1 << BTR1_SAM_SHIFT : 0)
+
+#define F_RX_PROGRESS   0
+#define F_TX_PROGRESS   1
+#define F_TX_WAIT_ALL   2
+
+#define TX_QUEUE_SIZE   3
+
+struct tx_queue_entry {
+        struct list_head list;
+        u8 mask;
+        u8 id;
+};
+
+struct mscan_priv {
+        struct can_priv can;    /* must be the first member */
+        long open_time;
+        unsigned long flags;
+        void __iomem *reg_base; /* ioremap'ed address to registers */
+        u8 shadow_statflg;
+        u8 shadow_canrier;
+        u8 cur_pri;
+        u8 prev_buf_id;
+        u8 tx_active;
+
+        struct list_head tx_head;
+        struct tx_queue_entry tx_queue[TX_QUEUE_SIZE];
+        struct napi_struct napi;
+};
+
+extern struct net_device *alloc_mscandev(void);
+/*
+ * clock_src:
+ *      1 = The MSCAN clock source is the onchip Bus Clock.
+ *      0 = The MSCAN clock source is the chip Oscillator Clock.
+ */
+extern int register_mscandev(struct net_device *dev, int clock_src);
+extern void unregister_mscandev(struct net_device *dev);
+
+#endif /* __MSCAN_H__ */
diff --git a/drivers/net/can/sja1000/Kconfig b/drivers/net/can/sja1000/Kconfig
new file mode 100644
index 00000000000..4c674927f24
--- /dev/null
+++ b/drivers/net/can/sja1000/Kconfig
@@ -0,0 +1,47 @@
+menuconfig CAN_SJA1000
+        tristate "Philips/NXP SJA1000 devices"
+        depends on CAN_DEV && HAS_IOMEM
+
+if CAN_SJA1000
+
+config CAN_SJA1000_ISA
+        tristate "ISA Bus based legacy SJA1000 driver"
+        depends on ISA
+        ---help---
+          This driver adds legacy support for SJA1000 chips connected to
+          the ISA bus using I/O port, memory mapped or indirect access.
+
+config CAN_SJA1000_PLATFORM
+        tristate "Generic Platform Bus based SJA1000 driver"
+        ---help---
+          This driver adds support for the SJA1000 chips connected to
+          the "platform bus" (Linux abstraction for directly to the
+          processor attached devices).  Which can be found on various
+          boards from Phytec (http://www.phytec.de) like the PCM027,
+          PCM038.
+
+config CAN_SJA1000_OF_PLATFORM
+        tristate "Generic OF Platform Bus based SJA1000 driver"
+        depends on PPC_OF
+        ---help---
+          This driver adds support for the SJA1000 chips connected to
+          the OpenFirmware "platform bus" found on embedded systems with
+          OpenFirmware bindings, e.g. if you have a PowerPC based system
+          you may want to enable this option.
+
+config CAN_EMS_PCI
+        tristate "EMS CPC-PCI, CPC-PCIe and CPC-104P Card"
+        depends on PCI
+        ---help---
+          This driver is for the one, two or four channel CPC-PCI,
+          CPC-PCIe and CPC-104P cards from EMS Dr. Thomas Wuensche
+          (http://www.ems-wuensche.de).
+
+config CAN_KVASER_PCI
+        tristate "Kvaser PCIcanx and Kvaser PCIcan PCI Cards"
+        depends on PCI
+        ---help---
+          This driver is for the the PCIcanx and PCIcan cards (1, 2 or
+          4 channel) from Kvaser (http://www.kvaser.com).
+
+endif
diff --git a/drivers/net/can/sja1000/sja1000.c b/drivers/net/can/sja1000/sja1000.c
index 782a47fabf2..b4ba88a3107 100644
--- a/drivers/net/can/sja1000/sja1000.c
+++ b/drivers/net/can/sja1000/sja1000.c
@@ -516,7 +516,7 @@ static int sja1000_open(struct net_device *dev)
 
         /* register interrupt handler, if not done by the device driver */
         if (!(priv->flags & SJA1000_CUSTOM_IRQ_HANDLER)) {
-                err = request_irq(dev->irq, &sja1000_interrupt, priv->irq_flags,
+                err = request_irq(dev->irq, sja1000_interrupt, priv->irq_flags,
                                   dev->name, (void *)dev);
                 if (err) {
                         close_candev(dev);
diff --git a/drivers/net/can/usb/Kconfig b/drivers/net/can/usb/Kconfig
new file mode 100644
index 00000000000..bbc78e0b8a1
--- /dev/null
+++ b/drivers/net/can/usb/Kconfig
@@ -0,0 +1,10 @@
+menu "CAN USB interfaces"
+        depends on USB && CAN_DEV
+
+config CAN_EMS_USB
+        tristate "EMS CPC-USB/ARM7 CAN/USB interface"
+        ---help---
+          This driver is for the one channel CPC-USB/ARM7 CAN/USB interface
+          from from EMS Dr. Thomas Wuensche (http://www.ems-wuensche.de).
+
+endmenu
diff --git a/drivers/net/can/usb/Makefile b/drivers/net/can/usb/Makefile
index c3f75ba701b..0afd51d4c7a 100644
--- a/drivers/net/can/usb/Makefile
+++ b/drivers/net/can/usb/Makefile
@@ -3,3 +3,5 @@
 #
 
 obj-$(CONFIG_CAN_EMS_USB) += ems_usb.o
+
+ccflags-$(CONFIG_CAN_DEBUG_DEVICES) := -DDEBUG
diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c
index 79ce8e857ea..8edac8915ea 100644
--- a/drivers/net/davinci_emac.c
+++ b/drivers/net/davinci_emac.c
@@ -2136,9 +2136,6 @@ static int emac_poll(struct napi_struct *napi, int budget)
         u32 status = 0;
         u32 num_pkts = 0;
 
-        if (!netif_running(ndev))
-                return 0;
-
         /* Check interrupt vectors and call packet processing */
         status = emac_read(EMAC_MACINVECTOR);
 
diff --git a/drivers/net/dm9000.c b/drivers/net/dm9000.c
index 31b8bef49d2..3aab2e46600 100644
--- a/drivers/net/dm9000.c
+++ b/drivers/net/dm9000.c
@@ -100,6 +100,7 @@ typedef struct board_info {
 
         unsigned int    flags;
         unsigned int    in_suspend :1;
+        unsigned int    wake_supported :1;
         int             debug_level;
 
         enum dm9000_type type;
@@ -116,6 +117,8 @@ typedef struct board_info {
         struct resource *data_req;
         struct resource *irq_res;
 
+        int              irq_wake;
+
         struct mutex     addr_lock;     /* phy and eeprom access lock */
 
         struct delayed_work phy_poll;
@@ -125,6 +128,7 @@ typedef struct board_info {
 
         struct mii_if_info mii;
         u32             msg_enable;
+        u32             wake_state;
 
         int             rx_csum;
         int             can_csum;
@@ -568,6 +572,54 @@ static int dm9000_set_eeprom(struct net_device *dev,
         return 0;
 }
 
+static void dm9000_get_wol(struct net_device *dev, struct ethtool_wolinfo *w)
+{
+        board_info_t *dm = to_dm9000_board(dev);
+
+        memset(w, 0, sizeof(struct ethtool_wolinfo));
+
+        /* note, we could probably support wake-phy too */
+        w->supported = dm->wake_supported ? WAKE_MAGIC : 0;
+        w->wolopts = dm->wake_state;
+}
+
+static int dm9000_set_wol(struct net_device *dev, struct ethtool_wolinfo *w)
+{
+        board_info_t *dm = to_dm9000_board(dev);
+        unsigned long flags;
+        u32 opts = w->wolopts;
+        u32 wcr = 0;
+
+        if (!dm->wake_supported)
+                return -EOPNOTSUPP;
+
+        if (opts & ~WAKE_MAGIC)
+                return -EINVAL;
+
+        if (opts & WAKE_MAGIC)
+                wcr |= WCR_MAGICEN;
+
+        mutex_lock(&dm->addr_lock);
+
+        spin_lock_irqsave(&dm->lock, flags);
+        iow(dm, DM9000_WCR, wcr);
+        spin_unlock_irqrestore(&dm->lock, flags);
+
+        mutex_unlock(&dm->addr_lock);
+
+        if (dm->wake_state != opts) {
+                /* change in wol state, update IRQ state */
+
+                if (!dm->wake_state)
+                        set_irq_wake(dm->irq_wake, 1);
+                else if (dm->wake_state & !opts)
+                        set_irq_wake(dm->irq_wake, 0);
+        }
+
+        dm->wake_state = opts;
+        return 0;
+}
+
 static const struct ethtool_ops dm9000_ethtool_ops = {
         .get_drvinfo            = dm9000_get_drvinfo,
         .get_settings           = dm9000_get_settings,
@@ -576,6 +628,8 @@ static const struct ethtool_ops dm9000_ethtool_ops = {
         .set_msglevel           = dm9000_set_msglevel,
         .nway_reset             = dm9000_nway_reset,
         .get_link               = dm9000_get_link,
+        .get_wol                = dm9000_get_wol,
+        .set_wol                = dm9000_set_wol,
         .get_eeprom_len         = dm9000_get_eeprom_len,
         .get_eeprom             = dm9000_get_eeprom,
         .set_eeprom             = dm9000_set_eeprom,
@@ -722,6 +776,7 @@ dm9000_init_dm9000(struct net_device *dev)
 {
         board_info_t *db = netdev_priv(dev);
         unsigned int imr;
+        unsigned int ncr;
 
         dm9000_dbg(db, 1, "entering %s\n", __func__);
 
@@ -736,8 +791,15 @@ dm9000_init_dm9000(struct net_device *dev)
         iow(db, DM9000_GPCR, GPCR_GEP_CNTL);    /* Let GPIO0 output */
         iow(db, DM9000_GPR, 0); /* Enable PHY */
 
-        if (db->flags & DM9000_PLATF_EXT_PHY)
-                iow(db, DM9000_NCR, NCR_EXT_PHY);
+        ncr = (db->flags & DM9000_PLATF_EXT_PHY) ? NCR_EXT_PHY : 0;
+
+        /* if wol is needed, then always set NCR_WAKEEN otherwise we end
+         * up dumping the wake events if we disable this. There is already
+         * a wake-mask in DM9000_WCR */
+        if (db->wake_supported)
+                ncr |= NCR_WAKEEN;
+
+        iow(db, DM9000_NCR, ncr);
 
         /* Program operating register */
         iow(db, DM9000_TCR, 0);         /* TX Polling clear */
@@ -1045,6 +1107,41 @@ static irqreturn_t dm9000_interrupt(int irq, void *dev_id)
         return IRQ_HANDLED;
 }
 
+static irqreturn_t dm9000_wol_interrupt(int irq, void *dev_id)
+{
+        struct net_device *dev = dev_id;
+        board_info_t *db = netdev_priv(dev);
+        unsigned long flags;
+        unsigned nsr, wcr;
+
+        spin_lock_irqsave(&db->lock, flags);
+
+        nsr = ior(db, DM9000_NSR);
+        wcr = ior(db, DM9000_WCR);
+
+        dev_dbg(db->dev, "%s: NSR=0x%02x, WCR=0x%02x\n", __func__, nsr, wcr);
+
+        if (nsr & NSR_WAKEST) {
+                /* clear, so we can avoid */
+                iow(db, DM9000_NSR, NSR_WAKEST);
+
+                if (wcr & WCR_LINKST)
+                        dev_info(db->dev, "wake by link status change\n");
+                if (wcr & WCR_SAMPLEST)
+                        dev_info(db->dev, "wake by sample packet\n");
+                if (wcr & WCR_MAGICST )
+                        dev_info(db->dev, "wake by magic packet\n");
+                if (!(wcr & (WCR_LINKST | WCR_SAMPLEST | WCR_MAGICST)))
+                        dev_err(db->dev, "wake signalled with no reason? "
+                                "NSR=0x%02x, WSR=0x%02x\n", nsr, wcr);
+
+        }
+
+        spin_unlock_irqrestore(&db->lock, flags);
+
+        return (nsr & NSR_WAKEST) ? IRQ_HANDLED : IRQ_NONE;
+}
+
 #ifdef CONFIG_NET_POLL_CONTROLLER
 /*
  *Used by netconsole
@@ -1299,6 +1396,29 @@ dm9000_probe(struct platform_device *pdev)
                 goto out;
         }
 
+        db->irq_wake = platform_get_irq(pdev, 1);
+        if (db->irq_wake >= 0) {
+                dev_dbg(db->dev, "wakeup irq %d\n", db->irq_wake);
+
+                ret = request_irq(db->irq_wake, dm9000_wol_interrupt,
+                                  IRQF_SHARED, dev_name(db->dev), ndev);
+                if (ret) {
+                        dev_err(db->dev, "cannot get wakeup irq (%d)\n", ret);
+                } else {
+
+                        /* test to see if irq is really wakeup capable */
+                        ret = set_irq_wake(db->irq_wake, 1);
+                        if (ret) {
+                                dev_err(db->dev, "irq %d cannot set wakeup (%d)\n",
+                                        db->irq_wake, ret);
+                                ret = 0;
+                        } else {
+                                set_irq_wake(db->irq_wake, 0);
+                                db->wake_supported = 1;
+                        }
+                }
+        }
+
         iosize = resource_size(db->addr_res);
         db->addr_req = request_mem_region(db->addr_res->start, iosize,
                                           pdev->name);
@@ -1490,10 +1610,14 @@ dm9000_drv_suspend(struct device *dev)
                 db = netdev_priv(ndev);
                 db->in_suspend = 1;
 
-                if (netif_running(ndev)) {
-                        netif_device_detach(ndev);
+                if (!netif_running(ndev))
+                        return 0;
+
+                netif_device_detach(ndev);
+
+                /* only shutdown if not using WoL */
+                if (!db->wake_state)
                         dm9000_shutdown(ndev);
-                }
         }
         return 0;
 }
@@ -1506,10 +1630,13 @@ dm9000_drv_resume(struct device *dev)
         board_info_t *db = netdev_priv(ndev);
 
         if (ndev) {
-
                 if (netif_running(ndev)) {
-                        dm9000_reset(db);
-                        dm9000_init_dm9000(ndev);
+                        /* reset if we were not in wake mode to ensure if
+                         * the device was powered off it is in a known state */
+                        if (!db->wake_state) {
+                                dm9000_reset(db);
+                                dm9000_init_dm9000(ndev);
+                        }
 
                         netif_device_attach(ndev);
                 }
diff --git a/drivers/net/dm9000.h b/drivers/net/dm9000.h
index fb1c924d79b..55688bd1a3e 100644
--- a/drivers/net/dm9000.h
+++ b/drivers/net/dm9000.h
@@ -111,6 +111,13 @@
 #define RSR_CE              (1<<1)
 #define RSR_FOE             (1<<0)
 
+#define WCR_LINKEN              (1 << 5)
+#define WCR_SAMPLEEN            (1 << 4)
+#define WCR_MAGICEN             (1 << 3)
+#define WCR_LINKST              (1 << 2)
+#define WCR_SAMPLEST            (1 << 1)
+#define WCR_MAGICST             (1 << 0)
+
 #define FCTR_HWOT(ot)   (( ot & 0xf ) << 4 )
 #define FCTR_LWOT(ot)   ( ot & 0xf )
 
diff --git a/drivers/net/ethoc.c b/drivers/net/ethoc.c
index f1c565282d5..96b6dc42fc7 100644
--- a/drivers/net/ethoc.c
+++ b/drivers/net/ethoc.c
@@ -640,7 +640,7 @@ static int ethoc_mdio_probe(struct net_device *dev)
                 return -ENXIO;
         }
 
-        phy = phy_connect(dev, dev_name(&phy->dev), &ethoc_mdio_poll, 0,
+        phy = phy_connect(dev, dev_name(&phy->dev), ethoc_mdio_poll, 0,
                         PHY_INTERFACE_MODE_GMII);
         if (IS_ERR(phy)) {
                 dev_err(&dev->dev, "could not attach to PHY\n");
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index 0a1c2bb27d4..73fe9777720 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -5820,10 +5820,7 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i
                         dev->dev_addr);
                 dev_printk(KERN_ERR, &pci_dev->dev,
                         "Please complain to your hardware vendor. Switching to a random MAC.\n");
-                dev->dev_addr[0] = 0x00;
-                dev->dev_addr[1] = 0x00;
-                dev->dev_addr[2] = 0x6c;
-                get_random_bytes(&dev->dev_addr[3], 3);
+                random_ether_addr(dev->dev_addr);
         }
 
         dprintk(KERN_DEBUG "%s: MAC Address %pM\n",
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index 197b358e636..16def131c39 100644
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@ -1246,7 +1246,7 @@ static int gfar_restore(struct device *dev)
                 phy_start(priv->phydev);
 
         netif_device_attach(ndev);
-        napi_enable(&priv->gfargrp.napi);
+        enable_napi(priv);
 
         return 0;
 }
@@ -1928,14 +1928,11 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev)
         /* total number of fragments in the SKB */
         nr_frags = skb_shinfo(skb)->nr_frags;
 
-        spin_lock_irqsave(&tx_queue->txlock, flags);
-
         /* check if there is space to queue this packet */
         if ((nr_frags+1) > tx_queue->num_txbdfree) {
                 /* no space, stop the queue */
                 netif_tx_stop_queue(txq);
                 dev->stats.tx_fifo_errors++;
-                spin_unlock_irqrestore(&tx_queue->txlock, flags);
                 return NETDEV_TX_BUSY;
         }
 
@@ -1999,6 +1996,20 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev)
         lstatus |= BD_LFLAG(TXBD_CRC | TXBD_READY) | skb_headlen(skb);
 
         /*
+         * We can work in parallel with gfar_clean_tx_ring(), except
+         * when modifying num_txbdfree. Note that we didn't grab the lock
+         * when we were reading the num_txbdfree and checking for available
+         * space, that's because outside of this function it can only grow,
+         * and once we've got needed space, it cannot suddenly disappear.
+         *
+         * The lock also protects us from gfar_error(), which can modify
+         * regs->tstat and thus retrigger the transfers, which is why we
+         * also must grab the lock before setting ready bit for the first
+         * to be transmitted BD.
+         */
+        spin_lock_irqsave(&tx_queue->txlock, flags);
+
+        /*
          * The powerpc-specific eieio() is used, as wmb() has too strong
          * semantics (it requires synchronization between cacheable and
          * uncacheable mappings, which eieio doesn't provide and which we
@@ -2225,6 +2236,8 @@ static int gfar_clean_tx_ring(struct gfar_priv_tx_q *tx_queue)
         skb_dirtytx = tx_queue->skb_dirtytx;
 
         while ((skb = tx_queue->tx_skbuff[skb_dirtytx])) {
+                unsigned long flags;
+
                 frags = skb_shinfo(skb)->nr_frags;
                 lbdp = skip_txbd(bdp, frags, base, tx_ring_size);
 
@@ -2269,7 +2282,9 @@ static int gfar_clean_tx_ring(struct gfar_priv_tx_q *tx_queue)
                         TX_RING_MOD_MASK(tx_ring_size);
 
                 howmany++;
+                spin_lock_irqsave(&tx_queue->txlock, flags);
                 tx_queue->num_txbdfree += frags + 1;
+                spin_unlock_irqrestore(&tx_queue->txlock, flags);
         }
 
         /* If we freed a buffer, we can restart transmission, if necessary */
@@ -2504,8 +2519,6 @@ int gfar_clean_rx_ring(struct gfar_priv_rx_q *rx_queue, int rx_work_limit)
                                 skb_put(skb, pkt_len);
                                 dev->stats.rx_bytes += pkt_len;
 
-                                if (in_irq() || irqs_disabled())
-                                        printk("Interrupt problem!\n");
                                 gfar_process_frame(dev, skb, amount_pull);
 
                         } else {
@@ -2550,7 +2563,6 @@ static int gfar_poll(struct napi_struct *napi, int budget)
         int tx_cleaned = 0, i, left_over_budget = budget;
         unsigned long serviced_queues = 0;
         int num_queues = 0;
-        unsigned long flags;
 
         num_queues = gfargrp->num_rx_queues;
         budget_per_queue = budget/num_queues;
@@ -2570,14 +2582,7 @@ static int gfar_poll(struct napi_struct *napi, int budget)
                         rx_queue = priv->rx_queue[i];
                         tx_queue = priv->tx_queue[rx_queue->qindex];
 
-                        /* If we fail to get the lock,
-                         * don't bother with the TX BDs */
-                        if (spin_trylock_irqsave(&tx_queue->txlock, flags)) {
-                                tx_cleaned += gfar_clean_tx_ring(tx_queue);
-                                spin_unlock_irqrestore(&tx_queue->txlock,
-                                                        flags);
-                        }
-
+                        tx_cleaned += gfar_clean_tx_ring(tx_queue);
                         rx_cleaned_per_queue = gfar_clean_rx_ring(rx_queue,
                                                         budget_per_queue);
                         rx_cleaned += rx_cleaned_per_queue;
@@ -2945,14 +2950,22 @@ static irqreturn_t gfar_error(int irq, void *grp_id)
                 if (events & IEVENT_CRL)
                         dev->stats.tx_aborted_errors++;
                 if (events & IEVENT_XFUN) {
+                        unsigned long flags;
+
                         if (netif_msg_tx_err(priv))
                                 printk(KERN_DEBUG "%s: TX FIFO underrun, "
                                        "packet dropped.\n", dev->name);
                         dev->stats.tx_dropped++;
                         priv->extra_stats.tx_underrun++;
 
+                        local_irq_save(flags);
+                        lock_tx_qs(priv);
+
                         /* Reactivate the Tx Queues */
                         gfar_write(&regs->tstat, gfargrp->tstat);
+
+                        unlock_tx_qs(priv);
+                        local_irq_restore(flags);
                 }
                 if (netif_msg_tx_err(priv))
                         printk(KERN_DEBUG "%s: Transmit Error\n", dev->name);
diff --git a/drivers/net/gianfar_sysfs.c b/drivers/net/gianfar_sysfs.c
index 3724835d285..b31c9c8876e 100644
--- a/drivers/net/gianfar_sysfs.c
+++ b/drivers/net/gianfar_sysfs.c
@@ -186,7 +186,7 @@ static ssize_t gfar_set_rx_stash_index(struct device *dev,
         temp = gfar_read(&regs->attreli);
         temp &= ~ATTRELI_EI_MASK;
         temp |= ATTRELI_EI(index);
-        gfar_write(&regs->attreli, flags);
+        gfar_write(&regs->attreli, temp);
 
 out:
         unlock_rx_qs(priv);
diff --git a/drivers/net/hamradio/mkiss.c b/drivers/net/hamradio/mkiss.c
index fc9c57893f8..7db0a1c3216 100644
--- a/drivers/net/hamradio/mkiss.c
+++ b/drivers/net/hamradio/mkiss.c
@@ -903,7 +903,7 @@ static int mkiss_ioctl(struct tty_struct *tty, struct file *file,
 static long mkiss_compat_ioctl(struct tty_struct *tty, struct file *file,
         unsigned int cmd, unsigned long arg)
 {
-        switch (arg) {
+        switch (cmd) {
         case SIOCGIFNAME:
         case SIOCGIFENCAP:
         case SIOCSIFENCAP:
diff --git a/drivers/net/igb/igb.h b/drivers/net/igb/igb.h
index 3298f5a11da..63abd1c0d75 100644
--- a/drivers/net/igb/igb.h
+++ b/drivers/net/igb/igb.h
@@ -59,10 +59,10 @@ struct igb_adapter;
 #define MAX_Q_VECTORS                      8
 
 /* Transmit and receive queues */
-#define IGB_MAX_RX_QUEUES     (adapter->vfs_allocated_count ? \
-                               (adapter->vfs_allocated_count > 6 ? 1 : 2) : 4)
-#define IGB_MAX_TX_QUEUES     IGB_MAX_RX_QUEUES
-#define IGB_ABS_MAX_TX_QUEUES     4
+#define IGB_MAX_RX_QUEUES                  (adapter->vfs_allocated_count ? 2 : \
+                                           (hw->mac.type > e1000_82575 ? 8 : 4))
+#define IGB_ABS_MAX_TX_QUEUES              8
+#define IGB_MAX_TX_QUEUES                  IGB_MAX_RX_QUEUES
 
 #define IGB_MAX_VF_MC_ENTRIES              30
 #define IGB_MAX_VF_FUNCTIONS               8
@@ -249,10 +249,6 @@ struct igb_adapter {
         u16 link_speed;
         u16 link_duplex;
 
-        unsigned int total_tx_bytes;
-        unsigned int total_tx_packets;
-        unsigned int total_rx_bytes;
-        unsigned int total_rx_packets;
         /* Interrupt Throttle Rate */
         u32 rx_itr_setting;
         u32 tx_itr_setting;
@@ -315,6 +311,7 @@ struct igb_adapter {
         u16 rx_ring_count;
         unsigned int vfs_allocated_count;
         struct vf_data_storage *vf_data;
+        u32 rss_queues;
 };
 
 #define IGB_FLAG_HAS_MSI           (1 << 0)
diff --git a/drivers/net/igb/igb_ethtool.c b/drivers/net/igb/igb_ethtool.c
index 90b89a81f66..c1cde5b4490 100644
--- a/drivers/net/igb/igb_ethtool.c
+++ b/drivers/net/igb/igb_ethtool.c
@@ -37,77 +37,88 @@
 
 #include "igb.h"
 
-enum {NETDEV_STATS, IGB_STATS};
-
 struct igb_stats {
         char stat_string[ETH_GSTRING_LEN];
-        int type;
         int sizeof_stat;
         int stat_offset;
 };
 
-#define IGB_STAT(m)             IGB_STATS, \
-                                FIELD_SIZEOF(struct igb_adapter, m), \
-                                offsetof(struct igb_adapter, m)
-#define IGB_NETDEV_STAT(m)      NETDEV_STATS, \
-                                FIELD_SIZEOF(struct net_device, m), \
-                                offsetof(struct net_device, m)
-
+#define IGB_STAT(_name, _stat) { \
+        .stat_string = _name, \
+        .sizeof_stat = FIELD_SIZEOF(struct igb_adapter, _stat), \
+        .stat_offset = offsetof(struct igb_adapter, _stat) \
+}
 static const struct igb_stats igb_gstrings_stats[] = {
-        { "rx_packets", IGB_STAT(stats.gprc) },
-        { "tx_packets", IGB_STAT(stats.gptc) },
-        { "rx_bytes", IGB_STAT(stats.gorc) },
-        { "tx_bytes", IGB_STAT(stats.gotc) },
-        { "rx_broadcast", IGB_STAT(stats.bprc) },
-        { "tx_broadcast", IGB_STAT(stats.bptc) },
-        { "rx_multicast", IGB_STAT(stats.mprc) },
-        { "tx_multicast", IGB_STAT(stats.mptc) },
-        { "rx_errors", IGB_NETDEV_STAT(stats.rx_errors) },
-        { "tx_errors", IGB_NETDEV_STAT(stats.tx_errors) },
-        { "tx_dropped", IGB_NETDEV_STAT(stats.tx_dropped) },
-        { "multicast", IGB_STAT(stats.mprc) },
-        { "collisions", IGB_STAT(stats.colc) },
-        { "rx_length_errors", IGB_NETDEV_STAT(stats.rx_length_errors) },
-        { "rx_over_errors", IGB_NETDEV_STAT(stats.rx_over_errors) },
-        { "rx_crc_errors", IGB_STAT(stats.crcerrs) },
-        { "rx_frame_errors", IGB_NETDEV_STAT(stats.rx_frame_errors) },
-        { "rx_no_buffer_count", IGB_STAT(stats.rnbc) },
-        { "rx_queue_drop_packet_count", IGB_NETDEV_STAT(stats.rx_fifo_errors) },
-        { "rx_missed_errors", IGB_STAT(stats.mpc) },
-        { "tx_aborted_errors", IGB_STAT(stats.ecol) },
-        { "tx_carrier_errors", IGB_STAT(stats.tncrs) },
-        { "tx_fifo_errors", IGB_NETDEV_STAT(stats.tx_fifo_errors) },
-        { "tx_heartbeat_errors", IGB_NETDEV_STAT(stats.tx_heartbeat_errors) },
-        { "tx_window_errors", IGB_STAT(stats.latecol) },
-        { "tx_abort_late_coll", IGB_STAT(stats.latecol) },
-        { "tx_deferred_ok", IGB_STAT(stats.dc) },
-        { "tx_single_coll_ok", IGB_STAT(stats.scc) },
-        { "tx_multi_coll_ok", IGB_STAT(stats.mcc) },
-        { "tx_timeout_count", IGB_STAT(tx_timeout_count) },
-        { "rx_long_length_errors", IGB_STAT(stats.roc) },
-        { "rx_short_length_errors", IGB_STAT(stats.ruc) },
-        { "rx_align_errors", IGB_STAT(stats.algnerrc) },
-        { "tx_tcp_seg_good", IGB_STAT(stats.tsctc) },
-        { "tx_tcp_seg_failed", IGB_STAT(stats.tsctfc) },
-        { "rx_flow_control_xon", IGB_STAT(stats.xonrxc) },
-        { "rx_flow_control_xoff", IGB_STAT(stats.xoffrxc) },
-        { "tx_flow_control_xon", IGB_STAT(stats.xontxc) },
-        { "tx_flow_control_xoff", IGB_STAT(stats.xofftxc) },
-        { "rx_long_byte_count", IGB_STAT(stats.gorc) },
-        { "tx_dma_out_of_sync", IGB_STAT(stats.doosync) },
-        { "tx_smbus", IGB_STAT(stats.mgptc) },
-        { "rx_smbus", IGB_STAT(stats.mgprc) },
-        { "dropped_smbus", IGB_STAT(stats.mgpdc) },
+        IGB_STAT("rx_packets", stats.gprc),
+        IGB_STAT("tx_packets", stats.gptc),
+        IGB_STAT("rx_bytes", stats.gorc),
+        IGB_STAT("tx_bytes", stats.gotc),
+        IGB_STAT("rx_broadcast", stats.bprc),
+        IGB_STAT("tx_broadcast", stats.bptc),
+        IGB_STAT("rx_multicast", stats.mprc),
+        IGB_STAT("tx_multicast", stats.mptc),
+        IGB_STAT("multicast", stats.mprc),
+        IGB_STAT("collisions", stats.colc),
+        IGB_STAT("rx_crc_errors", stats.crcerrs),
+        IGB_STAT("rx_no_buffer_count", stats.rnbc),
+        IGB_STAT("rx_missed_errors", stats.mpc),
+        IGB_STAT("tx_aborted_errors", stats.ecol),
+        IGB_STAT("tx_carrier_errors", stats.tncrs),
+        IGB_STAT("tx_window_errors", stats.latecol),
+        IGB_STAT("tx_abort_late_coll", stats.latecol),
+        IGB_STAT("tx_deferred_ok", stats.dc),
+        IGB_STAT("tx_single_coll_ok", stats.scc),
+        IGB_STAT("tx_multi_coll_ok", stats.mcc),
+        IGB_STAT("tx_timeout_count", tx_timeout_count),
+        IGB_STAT("rx_long_length_errors", stats.roc),
+        IGB_STAT("rx_short_length_errors", stats.ruc),
+        IGB_STAT("rx_align_errors", stats.algnerrc),
+        IGB_STAT("tx_tcp_seg_good", stats.tsctc),
+        IGB_STAT("tx_tcp_seg_failed", stats.tsctfc),
+        IGB_STAT("rx_flow_control_xon", stats.xonrxc),
+        IGB_STAT("rx_flow_control_xoff", stats.xoffrxc),
+        IGB_STAT("tx_flow_control_xon", stats.xontxc),
+        IGB_STAT("tx_flow_control_xoff", stats.xofftxc),
+        IGB_STAT("rx_long_byte_count", stats.gorc),
+        IGB_STAT("tx_dma_out_of_sync", stats.doosync),
+        IGB_STAT("tx_smbus", stats.mgptc),
+        IGB_STAT("rx_smbus", stats.mgprc),
+        IGB_STAT("dropped_smbus", stats.mgpdc),
+};
+
+#define IGB_NETDEV_STAT(_net_stat) { \
+        .stat_string = __stringify(_net_stat), \
+        .sizeof_stat = FIELD_SIZEOF(struct net_device_stats, _net_stat), \
+        .stat_offset = offsetof(struct net_device_stats, _net_stat) \
+}
+static const struct igb_stats igb_gstrings_net_stats[] = {
+        IGB_NETDEV_STAT(rx_errors),
+        IGB_NETDEV_STAT(tx_errors),
+        IGB_NETDEV_STAT(tx_dropped),
+        IGB_NETDEV_STAT(rx_length_errors),
+        IGB_NETDEV_STAT(rx_over_errors),
+        IGB_NETDEV_STAT(rx_frame_errors),
+        IGB_NETDEV_STAT(rx_fifo_errors),
+        IGB_NETDEV_STAT(tx_fifo_errors),
+        IGB_NETDEV_STAT(tx_heartbeat_errors)
 };
 
+#define IGB_GLOBAL_STATS_LEN    \
+        (sizeof(igb_gstrings_stats) / sizeof(struct igb_stats))
+#define IGB_NETDEV_STATS_LEN    \
+        (sizeof(igb_gstrings_net_stats) / sizeof(struct igb_stats))
+#define IGB_RX_QUEUE_STATS_LEN \
+        (sizeof(struct igb_rx_queue_stats) / sizeof(u64))
+#define IGB_TX_QUEUE_STATS_LEN \
+        (sizeof(struct igb_tx_queue_stats) / sizeof(u64))
 #define IGB_QUEUE_STATS_LEN \
         ((((struct igb_adapter *)netdev_priv(netdev))->num_rx_queues * \
-          (sizeof(struct igb_rx_queue_stats) / sizeof(u64))) + \
+          IGB_RX_QUEUE_STATS_LEN) + \
          (((struct igb_adapter *)netdev_priv(netdev))->num_tx_queues * \
-          (sizeof(struct igb_tx_queue_stats) / sizeof(u64))))
-#define IGB_GLOBAL_STATS_LEN    \
-        (sizeof(igb_gstrings_stats) / sizeof(struct igb_stats))
-#define IGB_STATS_LEN (IGB_GLOBAL_STATS_LEN + IGB_QUEUE_STATS_LEN)
+          IGB_TX_QUEUE_STATS_LEN))
+#define IGB_STATS_LEN \
+        (IGB_GLOBAL_STATS_LEN + IGB_NETDEV_STATS_LEN + IGB_QUEUE_STATS_LEN)
+
 static const char igb_gstrings_test[][ETH_GSTRING_LEN] = {
         "Register test  (offline)", "Eeprom test    (offline)",
         "Interrupt test (offline)", "Loopback test  (offline)",
@@ -735,17 +746,17 @@ static int igb_set_ringparam(struct net_device *netdev,
         struct igb_adapter *adapter = netdev_priv(netdev);
         struct igb_ring *temp_ring;
         int i, err = 0;
-        u32 new_rx_count, new_tx_count;
+        u16 new_rx_count, new_tx_count;
 
         if ((ring->rx_mini_pending) || (ring->rx_jumbo_pending))
                 return -EINVAL;
 
-        new_rx_count = min(ring->rx_pending, (u32)IGB_MAX_RXD);
-        new_rx_count = max(new_rx_count, (u32)IGB_MIN_RXD);
+        new_rx_count = min_t(u32, ring->rx_pending, IGB_MAX_RXD);
+        new_rx_count = max_t(u16, new_rx_count, IGB_MIN_RXD);
         new_rx_count = ALIGN(new_rx_count, REQ_RX_DESCRIPTOR_MULTIPLE);
 
-        new_tx_count = min(ring->tx_pending, (u32)IGB_MAX_TXD);
-        new_tx_count = max(new_tx_count, (u32)IGB_MIN_TXD);
+        new_tx_count = min_t(u32, ring->tx_pending, IGB_MAX_TXD);
+        new_tx_count = max_t(u16, new_tx_count, IGB_MIN_TXD);
         new_tx_count = ALIGN(new_tx_count, REQ_TX_DESCRIPTOR_MULTIPLE);
 
         if ((new_tx_count == adapter->tx_ring_count) &&
@@ -1922,43 +1933,32 @@ static void igb_get_ethtool_stats(struct net_device *netdev,
                                   struct ethtool_stats *stats, u64 *data)
 {
         struct igb_adapter *adapter = netdev_priv(netdev);
+        struct net_device_stats *net_stats = &netdev->stats;
         u64 *queue_stat;
-        int stat_count_tx = sizeof(struct igb_tx_queue_stats) / sizeof(u64);
-        int stat_count_rx = sizeof(struct igb_rx_queue_stats) / sizeof(u64);
-        int j;
-        int i;
-        char *p = NULL;
+        int i, j, k;
+        char *p;
 
         igb_update_stats(adapter);
 
         for (i = 0; i < IGB_GLOBAL_STATS_LEN; i++) {
-                switch (igb_gstrings_stats[i].type) {
-                case NETDEV_STATS:
-                        p = (char *) netdev +
-                                        igb_gstrings_stats[i].stat_offset;
-                        break;
-                case IGB_STATS:
-                        p = (char *) adapter +
-                                        igb_gstrings_stats[i].stat_offset;
-                        break;
-                }
-
+                p = (char *)adapter + igb_gstrings_stats[i].stat_offset;
                 data[i] = (igb_gstrings_stats[i].sizeof_stat ==
                         sizeof(u64)) ? *(u64 *)p : *(u32 *)p;
         }
+        for (j = 0; j < IGB_NETDEV_STATS_LEN; j++, i++) {
+                p = (char *)net_stats + igb_gstrings_net_stats[j].stat_offset;
+                data[i] = (igb_gstrings_net_stats[j].sizeof_stat ==
+                        sizeof(u64)) ? *(u64 *)p : *(u32 *)p;
+        }
         for (j = 0; j < adapter->num_tx_queues; j++) {
-                int k;
                 queue_stat = (u64 *)&adapter->tx_ring[j].tx_stats;
-                for (k = 0; k < stat_count_tx; k++)
-                        data[i + k] = queue_stat[k];
-                i += k;
+                for (k = 0; k < IGB_TX_QUEUE_STATS_LEN; k++, i++)
+                        data[i] = queue_stat[k];
         }
         for (j = 0; j < adapter->num_rx_queues; j++) {
-                int k;
                 queue_stat = (u64 *)&adapter->rx_ring[j].rx_stats;
-                for (k = 0; k < stat_count_rx; k++)
-                        data[i + k] = queue_stat[k];
-                i += k;
+                for (k = 0; k < IGB_RX_QUEUE_STATS_LEN; k++, i++)
+                        data[i] = queue_stat[k];
         }
 }
 
@@ -1979,6 +1979,11 @@ static void igb_get_strings(struct net_device *netdev, u32 stringset, u8 *data)
                                ETH_GSTRING_LEN);
                         p += ETH_GSTRING_LEN;
                 }
+                for (i = 0; i < IGB_NETDEV_STATS_LEN; i++) {
+                        memcpy(p, igb_gstrings_net_stats[i].stat_string,
+                               ETH_GSTRING_LEN);
+                        p += ETH_GSTRING_LEN;
+                }
                 for (i = 0; i < adapter->num_tx_queues; i++) {
                         sprintf(p, "tx_queue_%u_packets", i);
                         p += ETH_GSTRING_LEN;
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c
index b044c985df0..0cab5e2b089 100644
--- a/drivers/net/igb/igb_main.c
+++ b/drivers/net/igb/igb_main.c
@@ -296,10 +296,10 @@ static void igb_cache_ring_register(struct igb_adapter *adapter)
                  * and continue consuming queues in the same sequence
                  */
                 if (adapter->vfs_allocated_count) {
-                        for (; i < adapter->num_rx_queues; i++)
+                        for (; i < adapter->rss_queues; i++)
                                 adapter->rx_ring[i].reg_idx = rbase_offset +
                                                               Q_IDX_82576(i);
-                        for (; j < adapter->num_tx_queues; j++)
+                        for (; j < adapter->rss_queues; j++)
                                 adapter->tx_ring[j].reg_idx = rbase_offset +
                                                               Q_IDX_82576(j);
                 }
@@ -618,14 +618,15 @@ static void igb_set_interrupt_capability(struct igb_adapter *adapter)
         int numvecs, i;
 
         /* Number of supported queues. */
-        adapter->num_rx_queues = min_t(u32, IGB_MAX_RX_QUEUES, num_online_cpus());
-        adapter->num_tx_queues = min_t(u32, IGB_MAX_TX_QUEUES, num_online_cpus());
+        adapter->num_rx_queues = adapter->rss_queues;
+        adapter->num_tx_queues = adapter->rss_queues;
 
         /* start with one vector for every rx queue */
         numvecs = adapter->num_rx_queues;
 
         /* if tx handler is seperate add 1 for every tx queue */
-        numvecs += adapter->num_tx_queues;
+        if (!(adapter->flags & IGB_FLAG_QUEUE_PAIRS))
+                numvecs += adapter->num_tx_queues;
 
         /* store the number of vectors reserved for queues */
         adapter->num_q_vectors = numvecs;
@@ -666,6 +667,7 @@ msi_only:
         }
 #endif
         adapter->vfs_allocated_count = 0;
+        adapter->rss_queues = 1;
         adapter->flags |= IGB_FLAG_QUEUE_PAIRS;
         adapter->num_rx_queues = 1;
         adapter->num_tx_queues = 1;
@@ -1566,56 +1568,6 @@ static int __devinit igb_probe(struct pci_dev *pdev,
         }
 
 #endif
-        switch (hw->mac.type) {
-        case e1000_82576:
-                /*
-                 * Initialize hardware timer: we keep it running just in case
-                 * that some program needs it later on.
-                 */
-                memset(&adapter->cycles, 0, sizeof(adapter->cycles));
-                adapter->cycles.read = igb_read_clock;
-                adapter->cycles.mask = CLOCKSOURCE_MASK(64);
-                adapter->cycles.mult = 1;
-                /**
-                 * Scale the NIC clock cycle by a large factor so that
-                 * relatively small clock corrections can be added or
-                 * substracted at each clock tick. The drawbacks of a large
-                 * factor are a) that the clock register overflows more quickly
-                 * (not such a big deal) and b) that the increment per tick has
-                 * to fit into 24 bits.  As a result we need to use a shift of
-                 * 19 so we can fit a value of 16 into the TIMINCA register.
-                 */
-                adapter->cycles.shift = IGB_82576_TSYNC_SHIFT;
-                wr32(E1000_TIMINCA,
-                                (1 << E1000_TIMINCA_16NS_SHIFT) |
-                                (16 << IGB_82576_TSYNC_SHIFT));
-
-                /* Set registers so that rollover occurs soon to test this. */
-                wr32(E1000_SYSTIML, 0x00000000);
-                wr32(E1000_SYSTIMH, 0xFF800000);
-                wrfl();
-
-                timecounter_init(&adapter->clock,
-                                 &adapter->cycles,
-                                 ktime_to_ns(ktime_get_real()));
-                /*
-                 * Synchronize our NIC clock against system wall clock. NIC
-                 * time stamp reading requires ~3us per sample, each sample
-                 * was pretty stable even under load => only require 10
-                 * samples for each offset comparison.
-                 */
-                memset(&adapter->compare, 0, sizeof(adapter->compare));
-                adapter->compare.source = &adapter->clock;
-                adapter->compare.target = ktime_get_real;
-                adapter->compare.num_samples = 10;
-                timecompare_update(&adapter->compare, 0);
-                break;
-        case e1000_82575:
-                /* 82575 does not support timesync */
-        default:
-                break;
-        }
-
         dev_info(&pdev->dev, "Intel(R) Gigabit Ethernet Network Connection\n");
         /* print bus type/speed/width info */
         dev_info(&pdev->dev, "%s: (PCIe:%s:%s) %pM\n",
@@ -1781,6 +1733,70 @@ static void __devinit igb_probe_vfs(struct igb_adapter * adapter)
 #endif /* CONFIG_PCI_IOV */
 }
 
+
+/**
+ * igb_init_hw_timer - Initialize hardware timer used with IEEE 1588 timestamp
+ * @adapter: board private structure to initialize
+ *
+ * igb_init_hw_timer initializes the function pointer and values for the hw
+ * timer found in hardware.
+ **/
+static void igb_init_hw_timer(struct igb_adapter *adapter)
+{
+        struct e1000_hw *hw = &adapter->hw;
+
+        switch (hw->mac.type) {
+        case e1000_82576:
+                /*
+                 * Initialize hardware timer: we keep it running just in case
+                 * that some program needs it later on.
+                 */
+                memset(&adapter->cycles, 0, sizeof(adapter->cycles));
+                adapter->cycles.read = igb_read_clock;
+                adapter->cycles.mask = CLOCKSOURCE_MASK(64);
+                adapter->cycles.mult = 1;
+                /**
+                 * Scale the NIC clock cycle by a large factor so that
+                 * relatively small clock corrections can be added or
+                 * substracted at each clock tick. The drawbacks of a large
+                 * factor are a) that the clock register overflows more quickly
+                 * (not such a big deal) and b) that the increment per tick has
+                 * to fit into 24 bits.  As a result we need to use a shift of
+                 * 19 so we can fit a value of 16 into the TIMINCA register.
+                 */
+                adapter->cycles.shift = IGB_82576_TSYNC_SHIFT;
+                wr32(E1000_TIMINCA,
+                                (1 << E1000_TIMINCA_16NS_SHIFT) |
+                                (16 << IGB_82576_TSYNC_SHIFT));
+
+                /* Set registers so that rollover occurs soon to test this. */
+                wr32(E1000_SYSTIML, 0x00000000);
+                wr32(E1000_SYSTIMH, 0xFF800000);
+                wrfl();
+
+                timecounter_init(&adapter->clock,
+                                 &adapter->cycles,
+                                 ktime_to_ns(ktime_get_real()));
+                /*
+                 * Synchronize our NIC clock against system wall clock. NIC
+                 * time stamp reading requires ~3us per sample, each sample
+                 * was pretty stable even under load => only require 10
+                 * samples for each offset comparison.
+                 */
+                memset(&adapter->compare, 0, sizeof(adapter->compare));
+                adapter->compare.source = &adapter->clock;
+                adapter->compare.target = ktime_get_real;
+                adapter->compare.num_samples = 10;
+                timecompare_update(&adapter->compare, 0);
+                break;
+        case e1000_82575:
+                /* 82575 does not support timesync */
+        default:
+                break;
+        }
+
+}
+
 /**
  * igb_sw_init - Initialize general software structures (struct igb_adapter)
  * @adapter: board private structure to initialize
@@ -1810,12 +1826,24 @@ static int __devinit igb_sw_init(struct igb_adapter *adapter)
                 adapter->vfs_allocated_count = max_vfs;
 
 #endif /* CONFIG_PCI_IOV */
+        adapter->rss_queues = min_t(u32, IGB_MAX_RX_QUEUES, num_online_cpus());
+
+        /*
+         * if rss_queues > 4 or vfs are going to be allocated with rss_queues
+         * then we should combine the queues into a queue pair in order to
+         * conserve interrupts due to limited supply
+         */
+        if ((adapter->rss_queues > 4) ||
+            ((adapter->rss_queues > 1) && (adapter->vfs_allocated_count > 6)))
+                adapter->flags |= IGB_FLAG_QUEUE_PAIRS;
+
         /* This call may decrease the number of queues */
         if (igb_init_interrupt_scheme(adapter)) {
                 dev_err(&pdev->dev, "Unable to allocate memory for queues\n");
                 return -ENOMEM;
         }
 
+        igb_init_hw_timer(adapter);
         igb_probe_vfs(adapter);
 
         /* Explicitly disable IRQ since the NIC can be in any state. */
@@ -2000,7 +2028,7 @@ static int igb_setup_all_tx_resources(struct igb_adapter *adapter)
                 }
         }
 
-        for (i = 0; i < IGB_MAX_TX_QUEUES; i++) {
+        for (i = 0; i < IGB_ABS_MAX_TX_QUEUES; i++) {
                 int r_idx = i % adapter->num_tx_queues;
                 adapter->multi_tx_table[i] = &adapter->tx_ring[r_idx];
         }
@@ -2184,7 +2212,7 @@ static void igb_setup_mrqc(struct igb_adapter *adapter)
                 array_wr32(E1000_RSSRK(0), j, rsskey);
         }
 
-        num_rx_queues = adapter->num_rx_queues;
+        num_rx_queues = adapter->rss_queues;
 
         if (adapter->vfs_allocated_count) {
                 /* 82575 and 82576 supports 2 RSS queues for VMDq */
@@ -2240,7 +2268,7 @@ static void igb_setup_mrqc(struct igb_adapter *adapter)
                                 E1000_VT_CTL_DEFAULT_POOL_SHIFT;
                         wr32(E1000_VT_CTL, vtctl);
                 }
-                if (adapter->num_rx_queues > 1)
+                if (adapter->rss_queues > 1)
                         mrqc = E1000_MRQC_ENABLE_VMDQ_RSS_2Q;
                 else
                         mrqc = E1000_MRQC_ENABLE_VMDQ;
@@ -2370,7 +2398,7 @@ static inline void igb_set_vmolr(struct igb_adapter *adapter, int vfn)
         /* clear all bits that might not be set */
         vmolr &= ~(E1000_VMOLR_BAM | E1000_VMOLR_RSSE);
 
-        if (adapter->num_rx_queues > 1 && vfn == adapter->vfs_allocated_count)
+        if (adapter->rss_queues > 1 && vfn == adapter->vfs_allocated_count)
                 vmolr |= E1000_VMOLR_RSSE; /* enable RSS */
         /*
          * for VMDq only allow the VFs and pool 0 to accept broadcast and
@@ -2915,7 +2943,6 @@ static void igb_watchdog_task(struct work_struct *work)
                                                    watchdog_task);
         struct e1000_hw *hw = &adapter->hw;
         struct net_device *netdev = adapter->netdev;
-        struct igb_ring *tx_ring = adapter->tx_ring;
         u32 link;
         int i;
 
@@ -2985,22 +3012,24 @@ static void igb_watchdog_task(struct work_struct *work)
         igb_update_stats(adapter);
         igb_update_adaptive(hw);
 
-        if (!netif_carrier_ok(netdev)) {
-                if (igb_desc_unused(tx_ring) + 1 < tx_ring->count) {
+        for (i = 0; i < adapter->num_tx_queues; i++) {
+                struct igb_ring *tx_ring = &adapter->tx_ring[i];
+                if (!netif_carrier_ok(netdev)) {
                         /* We've lost link, so the controller stops DMA,
                          * but we've got queued Tx work that's never going
                          * to get done, so reset controller to flush Tx.
                          * (Do the reset outside of interrupt context). */
-                        adapter->tx_timeout_count++;
-                        schedule_work(&adapter->reset_task);
-                        /* return immediately since reset is imminent */
-                        return;
+                        if (igb_desc_unused(tx_ring) + 1 < tx_ring->count) {
+                                adapter->tx_timeout_count++;
+                                schedule_work(&adapter->reset_task);
+                                /* return immediately since reset is imminent */
+                                return;
+                        }
                 }
-        }
 
-        /* Force detection of hung controller every watchdog period */
-        for (i = 0; i < adapter->num_tx_queues; i++)
-                adapter->tx_ring[i].detect_tx_hung = true;
+                /* Force detection of hung controller every watchdog period */
+                tx_ring->detect_tx_hung = true;
+        }
 
         /* Cause software interrupt to ensure rx ring is cleaned */
         if (adapter->msix_entries) {
@@ -3761,7 +3790,7 @@ static int igb_change_mtu(struct net_device *netdev, int new_mtu)
 
 void igb_update_stats(struct igb_adapter *adapter)
 {
-        struct net_device *netdev = adapter->netdev;
+        struct net_device_stats *net_stats = igb_get_stats(adapter->netdev);
         struct e1000_hw *hw = &adapter->hw;
         struct pci_dev *pdev = adapter->pdev;
         u32 rnbc;
@@ -3785,13 +3814,13 @@ void igb_update_stats(struct igb_adapter *adapter)
         for (i = 0; i < adapter->num_rx_queues; i++) {
                 u32 rqdpc_tmp = rd32(E1000_RQDPC(i)) & 0x0FFF;
                 adapter->rx_ring[i].rx_stats.drops += rqdpc_tmp;
-                netdev->stats.rx_fifo_errors += rqdpc_tmp;
+                net_stats->rx_fifo_errors += rqdpc_tmp;
                 bytes += adapter->rx_ring[i].rx_stats.bytes;
                 packets += adapter->rx_ring[i].rx_stats.packets;
         }
 
-        netdev->stats.rx_bytes = bytes;
-        netdev->stats.rx_packets = packets;
+        net_stats->rx_bytes = bytes;
+        net_stats->rx_packets = packets;
 
         bytes = 0;
         packets = 0;
@@ -3799,8 +3828,8 @@ void igb_update_stats(struct igb_adapter *adapter)
                 bytes += adapter->tx_ring[i].tx_stats.bytes;
                 packets += adapter->tx_ring[i].tx_stats.packets;
         }
-        netdev->stats.tx_bytes = bytes;
-        netdev->stats.tx_packets = packets;
+        net_stats->tx_bytes = bytes;
+        net_stats->tx_packets = packets;
 
         /* read stats registers */
         adapter->stats.crcerrs += rd32(E1000_CRCERRS);
@@ -3837,7 +3866,7 @@ void igb_update_stats(struct igb_adapter *adapter)
         rd32(E1000_GOTCH); /* clear GOTCL */
         rnbc = rd32(E1000_RNBC);
         adapter->stats.rnbc += rnbc;
-        netdev->stats.rx_fifo_errors += rnbc;
+        net_stats->rx_fifo_errors += rnbc;
         adapter->stats.ruc += rd32(E1000_RUC);
         adapter->stats.rfc += rd32(E1000_RFC);
         adapter->stats.rjc += rd32(E1000_RJC);
@@ -3878,29 +3907,29 @@ void igb_update_stats(struct igb_adapter *adapter)
         adapter->stats.icrxdmtc += rd32(E1000_ICRXDMTC);
 
         /* Fill out the OS statistics structure */
-        netdev->stats.multicast = adapter->stats.mprc;
-        netdev->stats.collisions = adapter->stats.colc;
+        net_stats->multicast = adapter->stats.mprc;
+        net_stats->collisions = adapter->stats.colc;
 
         /* Rx Errors */
 
         /* RLEC on some newer hardware can be incorrect so build
          * our own version based on RUC and ROC */
-        netdev->stats.rx_errors = adapter->stats.rxerrc +
+        net_stats->rx_errors = adapter->stats.rxerrc +
                 adapter->stats.crcerrs + adapter->stats.algnerrc +
                 adapter->stats.ruc + adapter->stats.roc +
                 adapter->stats.cexterr;
-        netdev->stats.rx_length_errors = adapter->stats.ruc +
-                                              adapter->stats.roc;
-        netdev->stats.rx_crc_errors = adapter->stats.crcerrs;
-        netdev->stats.rx_frame_errors = adapter->stats.algnerrc;
-        netdev->stats.rx_missed_errors = adapter->stats.mpc;
+        net_stats->rx_length_errors = adapter->stats.ruc +
+                                      adapter->stats.roc;
+        net_stats->rx_crc_errors = adapter->stats.crcerrs;
+        net_stats->rx_frame_errors = adapter->stats.algnerrc;
+        net_stats->rx_missed_errors = adapter->stats.mpc;
 
         /* Tx Errors */
-        netdev->stats.tx_errors = adapter->stats.ecol +
-                                       adapter->stats.latecol;
-        netdev->stats.tx_aborted_errors = adapter->stats.ecol;
-        netdev->stats.tx_window_errors = adapter->stats.latecol;
-        netdev->stats.tx_carrier_errors = adapter->stats.tncrs;
+        net_stats->tx_errors = adapter->stats.ecol +
+                               adapter->stats.latecol;
+        net_stats->tx_aborted_errors = adapter->stats.ecol;
+        net_stats->tx_window_errors = adapter->stats.latecol;
+        net_stats->tx_carrier_errors = adapter->stats.tncrs;
 
         /* Tx Dropped needs to be maintained elsewhere */
 
@@ -4923,6 +4952,7 @@ static bool igb_clean_rx_irq_adv(struct igb_q_vector *q_vector,
         struct sk_buff *skb;
         bool cleaned = false;
         int cleaned_count = 0;
+        int current_node = numa_node_id();
         unsigned int total_bytes = 0, total_packets = 0;
         unsigned int i;
         u32 staterr;
@@ -4977,7 +5007,8 @@ static bool igb_clean_rx_irq_adv(struct igb_q_vector *q_vector,
                                                 buffer_info->page_offset,
                                                 length);
 
-                        if (page_count(buffer_info->page) != 1)
+                        if ((page_count(buffer_info->page) != 1) ||
+                            (page_to_nid(buffer_info->page) != current_node))
                                 buffer_info->page = NULL;
                         else
                                 get_page(buffer_info->page);
diff --git a/drivers/net/ipg.c b/drivers/net/ipg.c
index 63056e7b9e2..ba8d246d05a 100644
--- a/drivers/net/ipg.c
+++ b/drivers/net/ipg.c
@@ -1751,7 +1751,7 @@ static int ipg_nic_open(struct net_device *dev)
         /* Register the interrupt line to be used by the IPG within
          * the Linux system.
          */
-        rc = request_irq(pdev->irq, &ipg_interrupt_handler, IRQF_SHARED,
+        rc = request_irq(pdev->irq, ipg_interrupt_handler, IRQF_SHARED,
                          dev->name, dev);
         if (rc < 0) {
                 printk(KERN_INFO "%s: Error when requesting interrupt.\n",
diff --git a/drivers/net/irda/irda-usb.c b/drivers/net/irda/irda-usb.c
index 215adf6377d..ae6eab3e5ee 100644
--- a/drivers/net/irda/irda-usb.c
+++ b/drivers/net/irda/irda-usb.c
@@ -852,7 +852,7 @@ static void irda_usb_receive(struct urb *urb)
                  * hot unplug of the dongle...
                  * Lowest effective timer is 10ms...
                  * Jean II */
-                self->rx_defer_timer.function = &irda_usb_rx_defer_expired;
+                self->rx_defer_timer.function = irda_usb_rx_defer_expired;
                 self->rx_defer_timer.data = (unsigned long) urb;
                 mod_timer(&self->rx_defer_timer, jiffies + (10 * HZ / 1000));
                 return;
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index 448e84d5660..dceed80f16f 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -1204,6 +1204,7 @@ static void ixgbe_check_lsc(struct ixgbe_adapter *adapter)
         adapter->link_check_timeout = jiffies;
         if (!test_bit(__IXGBE_DOWN, &adapter->state)) {
                 IXGBE_WRITE_REG(hw, IXGBE_EIMC, IXGBE_EIMC_LSC);
+                IXGBE_WRITE_FLUSH(hw);
                 schedule_work(&adapter->watchdog_task);
         }
 }
@@ -1339,8 +1340,6 @@ static irqreturn_t ixgbe_msix_clean_rx(int irq, void *data)
         if (!q_vector->rxr_count)
                 return IRQ_HANDLED;
 
-        r_idx = find_first_bit(q_vector->rxr_idx, adapter->num_rx_queues);
-        rx_ring = &(adapter->rx_ring[r_idx]);
         /* disable interrupts on this vector only */
         ixgbe_irq_disable_queues(adapter, ((u64)1 << q_vector->v_idx));
         napi_schedule(&q_vector->napi);
@@ -3627,10 +3626,10 @@ static int ixgbe_set_interrupt_capability(struct ixgbe_adapter *adapter)
          * It's easy to be greedy for MSI-X vectors, but it really
          * doesn't do us much good if we have a lot more vectors
          * than CPU's.  So let's be conservative and only ask for
-         * (roughly) twice the number of vectors as there are CPU's.
+         * (roughly) the same number of vectors as there are CPU's.
          */
         v_budget = min(adapter->num_rx_queues + adapter->num_tx_queues,
-                       (int)(num_online_cpus() * 2)) + NON_Q_VECTORS;
+                       (int)num_online_cpus()) + NON_Q_VECTORS;
 
         /*
          * At the same time, hardware can only support a maximum of
@@ -5989,6 +5988,7 @@ static pci_ers_result_t ixgbe_io_slot_reset(struct pci_dev *pdev)
         } else {
                 pci_set_master(pdev);
                 pci_restore_state(pdev);
+                pci_save_state(pdev);
 
                 pci_wake_from_d3(pdev, false);
 
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index d7dba3f6f76..ae2b5c79c55 100644
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -38,12 +38,27 @@ struct macvlan_port {
         struct list_head        vlans;
 };
 
+/**
+ *      struct macvlan_rx_stats - MACVLAN percpu rx stats
+ *      @rx_packets: number of received packets
+ *      @rx_bytes: number of received bytes
+ *      @multicast: number of received multicast packets
+ *      @rx_errors: number of errors
+ */
+struct macvlan_rx_stats {
+        unsigned long rx_packets;
+        unsigned long rx_bytes;
+        unsigned long multicast;
+        unsigned long rx_errors;
+};
+
 struct macvlan_dev {
         struct net_device       *dev;
         struct list_head        list;
         struct hlist_node       hlist;
         struct macvlan_port     *port;
         struct net_device       *lowerdev;
+        struct macvlan_rx_stats *rx_stats;
 };
 
 
@@ -110,6 +125,7 @@ static void macvlan_broadcast(struct sk_buff *skb,
         struct net_device *dev;
         struct sk_buff *nskb;
         unsigned int i;
+        struct macvlan_rx_stats *rx_stats;
 
         if (skb->protocol == htons(ETH_P_PAUSE))
                 return;
@@ -117,17 +133,17 @@ static void macvlan_broadcast(struct sk_buff *skb,
         for (i = 0; i < MACVLAN_HASH_SIZE; i++) {
                 hlist_for_each_entry_rcu(vlan, n, &port->vlan_hash[i], hlist) {
                         dev = vlan->dev;
+                        rx_stats = per_cpu_ptr(vlan->rx_stats, smp_processor_id());
 
                         nskb = skb_clone(skb, GFP_ATOMIC);
                         if (nskb == NULL) {
-                                dev->stats.rx_errors++;
-                                dev->stats.rx_dropped++;
+                                rx_stats->rx_errors++;
                                 continue;
                         }
 
-                        dev->stats.rx_bytes += skb->len + ETH_HLEN;
-                        dev->stats.rx_packets++;
-                        dev->stats.multicast++;
+                        rx_stats->rx_bytes += skb->len + ETH_HLEN;
+                        rx_stats->rx_packets++;
+                        rx_stats->multicast++;
 
                         nskb->dev = dev;
                         if (!compare_ether_addr_64bits(eth->h_dest, dev->broadcast))
@@ -147,6 +163,7 @@ static struct sk_buff *macvlan_handle_frame(struct sk_buff *skb)
         const struct macvlan_port *port;
         const struct macvlan_dev *vlan;
         struct net_device *dev;
+        struct macvlan_rx_stats *rx_stats;
 
         port = rcu_dereference(skb->dev->macvlan_port);
         if (port == NULL)
@@ -166,16 +183,15 @@ static struct sk_buff *macvlan_handle_frame(struct sk_buff *skb)
                 kfree_skb(skb);
                 return NULL;
         }
-
+        rx_stats = per_cpu_ptr(vlan->rx_stats, smp_processor_id());
         skb = skb_share_check(skb, GFP_ATOMIC);
         if (skb == NULL) {
-                dev->stats.rx_errors++;
-                dev->stats.rx_dropped++;
+                rx_stats->rx_errors++;
                 return NULL;
         }
 
-        dev->stats.rx_bytes += skb->len + ETH_HLEN;
-        dev->stats.rx_packets++;
+        rx_stats->rx_bytes += skb->len + ETH_HLEN;
+        rx_stats->rx_packets++;
 
         skb->dev = dev;
         skb->pkt_type = PACKET_HOST;
@@ -202,7 +218,7 @@ static netdev_tx_t macvlan_start_xmit(struct sk_buff *skb,
         } else
                 txq->tx_dropped++;
 
-        return NETDEV_TX_OK;
+        return ret;
 }
 
 static int macvlan_hard_header(struct sk_buff *skb, struct net_device *dev,
@@ -365,9 +381,47 @@ static int macvlan_init(struct net_device *dev)
 
         macvlan_set_lockdep_class(dev);
 
+        vlan->rx_stats = alloc_percpu(struct macvlan_rx_stats);
+        if (!vlan->rx_stats)
+                return -ENOMEM;
+
         return 0;
 }
 
+static void macvlan_uninit(struct net_device *dev)
+{
+        struct macvlan_dev *vlan = netdev_priv(dev);
+
+        free_percpu(vlan->rx_stats);
+}
+
+static struct net_device_stats *macvlan_dev_get_stats(struct net_device *dev)
+{
+        struct net_device_stats *stats = &dev->stats;
+        struct macvlan_dev *vlan = netdev_priv(dev);
+
+        dev_txq_stats_fold(dev, stats);
+
+        if (vlan->rx_stats) {
+                struct macvlan_rx_stats *p, rx = {0};
+                int i;
+
+                for_each_possible_cpu(i) {
+                        p = per_cpu_ptr(vlan->rx_stats, i);
+                        rx.rx_packets += p->rx_packets;
+                        rx.rx_bytes   += p->rx_bytes;
+                        rx.rx_errors  += p->rx_errors;
+                        rx.multicast  += p->multicast;
+                }
+                stats->rx_packets = rx.rx_packets;
+                stats->rx_bytes   = rx.rx_bytes;
+                stats->rx_errors  = rx.rx_errors;
+                stats->rx_dropped = rx.rx_errors;
+                stats->multicast  = rx.multicast;
+        }
+        return stats;
+}
+
 static void macvlan_ethtool_get_drvinfo(struct net_device *dev,
                                         struct ethtool_drvinfo *drvinfo)
 {
@@ -404,6 +458,7 @@ static const struct ethtool_ops macvlan_ethtool_ops = {
 
 static const struct net_device_ops macvlan_netdev_ops = {
         .ndo_init               = macvlan_init,
+        .ndo_uninit             = macvlan_uninit,
         .ndo_open               = macvlan_open,
         .ndo_stop               = macvlan_stop,
         .ndo_start_xmit         = macvlan_start_xmit,
@@ -411,6 +466,7 @@ static const struct net_device_ops macvlan_netdev_ops = {
         .ndo_change_rx_flags    = macvlan_change_rx_flags,
         .ndo_set_mac_address    = macvlan_set_mac_address,
         .ndo_set_multicast_list = macvlan_set_multicast_list,
+        .ndo_get_stats          = macvlan_dev_get_stats,
         .ndo_validate_addr      = eth_validate_addr,
 };
 
diff --git a/drivers/net/niu.c b/drivers/net/niu.c
index 44558fcb56a..8ce58c4c7dd 100644
--- a/drivers/net/niu.c
+++ b/drivers/net/niu.c
@@ -8143,7 +8143,7 @@ static void __devinit niu_vpd_parse_version(struct niu *np)
         int i;
 
         for (i = 0; i < len - 5; i++) {
-                if (!strncmp(s + i, "FCode ", 5))
+                if (!strncmp(s + i, "FCode ", 6))
                         break;
         }
         if (i >= len - 5)
diff --git a/drivers/net/pcmcia/fmvj18x_cs.c b/drivers/net/pcmcia/fmvj18x_cs.c
index 7e01fbdb87e..57e09616330 100644
--- a/drivers/net/pcmcia/fmvj18x_cs.c
+++ b/drivers/net/pcmcia/fmvj18x_cs.c
@@ -264,7 +264,7 @@ static int fmvj18x_probe(struct pcmcia_device *link)
     /* Interrupt setup */
     link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING|IRQ_HANDLE_PRESENT;
     link->irq.IRQInfo1 = IRQ_LEVEL_ID;
-    link->irq.Handler = &fjn_interrupt;
+    link->irq.Handler = fjn_interrupt;
     link->irq.Instance = dev;
 
     /* General socket configuration */
diff --git a/drivers/net/pcmcia/nmclan_cs.c b/drivers/net/pcmcia/nmclan_cs.c
index 5ed6339c52b..b12e69592d1 100644
--- a/drivers/net/pcmcia/nmclan_cs.c
+++ b/drivers/net/pcmcia/nmclan_cs.c
@@ -479,7 +479,7 @@ static int nmclan_probe(struct pcmcia_device *link)
     link->io.IOAddrLines = 5;
     link->irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_HANDLE_PRESENT;
     link->irq.IRQInfo1 = IRQ_LEVEL_ID;
-    link->irq.Handler = &mace_interrupt;
+    link->irq.Handler = mace_interrupt;
     link->irq.Instance = dev;
     link->conf.Attributes = CONF_ENABLE_IRQ;
     link->conf.IntType = INT_MEMORY_AND_IO;
diff --git a/drivers/net/ppp_async.c b/drivers/net/ppp_async.c
index 30b1b332676..c311fa6597f 100644
--- a/drivers/net/ppp_async.c
+++ b/drivers/net/ppp_async.c
@@ -36,7 +36,7 @@
 
 #define PPP_VERSION     "2.4.2"
 
-#define OBUFSIZE        256
+#define OBUFSIZE        4096
 
 /* Structure for storing local state. */
 struct asyncppp {
diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c
index 9bf2a6be903..0a56a778af0 100644
--- a/drivers/net/ppp_generic.c
+++ b/drivers/net/ppp_generic.c
@@ -184,7 +184,7 @@ static atomic_t ppp_unit_count = ATOMIC_INIT(0);
 static atomic_t channel_count = ATOMIC_INIT(0);
 
 /* per-net private data for this module */
-static int ppp_net_id;
+static int ppp_net_id __read_mostly;
 struct ppp_net {
         /* units to ppp mapping */
         struct idr units_idr;
@@ -1944,8 +1944,15 @@ ppp_receive_mp_frame(struct ppp *ppp, struct sk_buff *skb, struct channel *pch)
         }
 
         /* Pull completed packets off the queue and receive them. */
-        while ((skb = ppp_mp_reconstruct(ppp)))
-                ppp_receive_nonmp_frame(ppp, skb);
+        while ((skb = ppp_mp_reconstruct(ppp))) {
+                if (pskb_may_pull(skb, 2))
+                        ppp_receive_nonmp_frame(ppp, skb);
+                else {
+                        ++ppp->dev->stats.rx_length_errors;
+                        kfree_skb(skb);
+                        ppp_receive_error(ppp);
+                }
+        }
 
         return;
 
diff --git a/drivers/net/pppoe.c b/drivers/net/pppoe.c
index 60c8d233209..a1dcba255b0 100644
--- a/drivers/net/pppoe.c
+++ b/drivers/net/pppoe.c
@@ -97,7 +97,7 @@ static const struct proto_ops pppoe_ops;
 static struct ppp_channel_ops pppoe_chan_ops;
 
 /* per-net private data for this module */
-static int pppoe_net_id;
+static int pppoe_net_id __read_mostly;
 struct pppoe_net {
         /*
          * we could use _single_ hash table for all
diff --git a/drivers/net/pppol2tp.c b/drivers/net/pppol2tp.c
index 849cc9c62c2..c58b50f8ba3 100644
--- a/drivers/net/pppol2tp.c
+++ b/drivers/net/pppol2tp.c
@@ -232,7 +232,7 @@ static struct ppp_channel_ops pppol2tp_chan_ops = { pppol2tp_xmit , NULL };
 static const struct proto_ops pppol2tp_ops;
 
 /* per-net private data for this module */
-static int pppol2tp_net_id;
+static int pppol2tp_net_id __read_mostly;
 struct pppol2tp_net {
         struct list_head pppol2tp_tunnel_list;
         rwlock_t pppol2tp_tunnel_list_lock;
@@ -1537,7 +1537,7 @@ static struct sock *pppol2tp_prepare_tunnel_socket(struct net *net,
          * if the tunnel socket goes away.
          */
         tunnel->old_sk_destruct = sk->sk_destruct;
-        sk->sk_destruct = &pppol2tp_tunnel_destruct;
+        sk->sk_destruct = pppol2tp_tunnel_destruct;
 
         tunnel->sock = sk;
         sk->sk_allocation = GFP_ATOMIC;
diff --git a/drivers/net/qlge/qlge.h b/drivers/net/qlge/qlge.h
index 1f59f054452..862c1aaf386 100644
--- a/drivers/net/qlge/qlge.h
+++ b/drivers/net/qlge/qlge.h
@@ -16,7 +16,7 @@
  */
 #define DRV_NAME        "qlge"
 #define DRV_STRING      "QLogic 10 Gigabit PCI-E Ethernet Driver "
-#define DRV_VERSION     "v1.00.00-b3"
+#define DRV_VERSION     "v1.00.00.23.00.00-01"
 
 #define PFX "qlge: "
 #define QPRINTK(qdev, nlevel, klevel, fmt, args...)     \
diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c
index bd8e164b121..7692299e782 100644
--- a/drivers/net/qlge/qlge_main.c
+++ b/drivers/net/qlge/qlge_main.c
@@ -69,9 +69,9 @@ MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all)");
 #define MSIX_IRQ 0
 #define MSI_IRQ 1
 #define LEG_IRQ 2
-static int irq_type = MSIX_IRQ;
-module_param(irq_type, int, MSIX_IRQ);
-MODULE_PARM_DESC(irq_type, "0 = MSI-X, 1 = MSI, 2 = Legacy.");
+static int qlge_irq_type = MSIX_IRQ;
+module_param(qlge_irq_type, int, MSIX_IRQ);
+MODULE_PARM_DESC(qlge_irq_type, "0 = MSI-X, 1 = MSI, 2 = Legacy.");
 
 static struct pci_device_id qlge_pci_tbl[] __devinitdata = {
         {PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, QLGE_DEVICE_ID_8012)},
@@ -2870,7 +2870,7 @@ static void ql_enable_msix(struct ql_adapter *qdev)
         int i, err;
 
         /* Get the MSIX vectors. */
-        if (irq_type == MSIX_IRQ) {
+        if (qlge_irq_type == MSIX_IRQ) {
                 /* Try to alloc space for the msix struct,
                  * if it fails then go to MSI/legacy.
                  */
@@ -2878,7 +2878,7 @@ static void ql_enable_msix(struct ql_adapter *qdev)
                                             sizeof(struct msix_entry),
                                             GFP_KERNEL);
                 if (!qdev->msi_x_entry) {
-                        irq_type = MSI_IRQ;
+                        qlge_irq_type = MSI_IRQ;
                         goto msi;
                 }
 
@@ -2901,7 +2901,7 @@ static void ql_enable_msix(struct ql_adapter *qdev)
                         QPRINTK(qdev, IFUP, WARNING,
                                 "MSI-X Enable failed, trying MSI.\n");
                         qdev->intr_count = 1;
-                        irq_type = MSI_IRQ;
+                        qlge_irq_type = MSI_IRQ;
                 } else if (err == 0) {
                         set_bit(QL_MSIX_ENABLED, &qdev->flags);
                         QPRINTK(qdev, IFUP, INFO,
@@ -2912,7 +2912,7 @@ static void ql_enable_msix(struct ql_adapter *qdev)
         }
 msi:
         qdev->intr_count = 1;
-        if (irq_type == MSI_IRQ) {
+        if (qlge_irq_type == MSI_IRQ) {
                 if (!pci_enable_msi(qdev->pdev)) {
                         set_bit(QL_MSI_ENABLED, &qdev->flags);
                         QPRINTK(qdev, IFUP, INFO,
@@ -2920,7 +2920,7 @@ msi:
                         return;
                 }
         }
-        irq_type = LEG_IRQ;
+        qlge_irq_type = LEG_IRQ;
         QPRINTK(qdev, IFUP, DEBUG, "Running with legacy interrupts.\n");
 }
 
@@ -3514,9 +3514,6 @@ int ql_wol(struct ql_adapter *qdev)
         }
 
         if (qdev->wol) {
-                /* Reroute all packets to Management Interface */
-                ql_write32(qdev, MGMT_RCV_CFG, (MGMT_RCV_CFG_RM |
-                        (MGMT_RCV_CFG_RM << 16)));
                 wol |= MB_WOL_MODE_ON;
                 status = ql_mb_wol_mode(qdev, wol);
                 QPRINTK(qdev, DRV, ERR, "WOL %s (wol code 0x%x) on %s\n",
@@ -3717,6 +3714,10 @@ static int qlge_open(struct net_device *ndev)
         int err = 0;
         struct ql_adapter *qdev = netdev_priv(ndev);
 
+        err = ql_adapter_reset(qdev);
+        if (err)
+                return err;
+
         err = ql_configure_rings(qdev);
         if (err)
                 return err;
@@ -3950,9 +3951,6 @@ static int qlge_set_mac_address(struct net_device *ndev, void *p)
         struct sockaddr *addr = p;
         int status;
 
-        if (netif_running(ndev))
-                return -EBUSY;
-
         if (!is_valid_ether_addr(addr->sa_data))
                 return -EADDRNOTAVAIL;
         memcpy(ndev->dev_addr, addr->sa_data, ndev->addr_len);
diff --git a/drivers/net/r6040.c b/drivers/net/r6040.c
index 7dfcb58b0eb..0f30ea4e97e 100644
--- a/drivers/net/r6040.c
+++ b/drivers/net/r6040.c
@@ -842,7 +842,7 @@ static int r6040_open(struct net_device *dev)
         int ret;
 
         /* Request IRQ and Register interrupt handler */
-        ret = request_irq(dev->irq, &r6040_interrupt,
+        ret = request_irq(dev->irq, r6040_interrupt,
                 IRQF_SHARED, dev->name, dev);
         if (ret)
                 return ret;
@@ -1085,7 +1085,7 @@ static int __devinit r6040_init_one(struct pci_dev *pdev,
         int bar = 0;
         u16 *adrp;
 
-        printk(KERN_INFO "%s\n", version);
+        printk("%s\n", version);
 
         err = pci_enable_device(pdev);
         if (err)
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index 1b0aa4cf89b..98f6c51b760 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -3243,9 +3243,9 @@ static void __devexit rtl8169_remove_one(struct pci_dev *pdev)
 static void rtl8169_set_rxbufsize(struct rtl8169_private *tp,
                                   struct net_device *dev)
 {
-        unsigned int mtu = dev->mtu;
+        unsigned int max_frame = dev->mtu + VLAN_ETH_HLEN + ETH_FCS_LEN;
 
-        tp->rx_buf_sz = (mtu > RX_BUF_SIZE) ? mtu + ETH_HLEN + 8 : RX_BUF_SIZE;
+        tp->rx_buf_sz = (max_frame > RX_BUF_SIZE) ? max_frame : RX_BUF_SIZE;
 }
 
 static int rtl8169_open(struct net_device *dev)
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index ddccf5fa56b..0dd7839322b 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -3494,6 +3494,7 @@ static void s2io_reset(struct s2io_nic *sp)
 
                 /* Restore the PCI state saved during initialization. */
                 pci_restore_state(sp->pdev);
+                pci_save_state(sp->pdev);
                 pci_read_config_word(sp->pdev, 0x2, &val16);
                 if (check_pci_device_id(val16) != (u16)PCI_ANY_ID)
                         break;
diff --git a/drivers/net/smsc911x.c b/drivers/net/smsc911x.c
index 6a9f51d1d9f..7f01e60d517 100644
--- a/drivers/net/smsc911x.c
+++ b/drivers/net/smsc911x.c
@@ -986,7 +986,7 @@ static int smsc911x_poll(struct napi_struct *napi, int budget)
         struct net_device *dev = pdata->dev;
         int npackets = 0;
 
-        while (likely(netif_running(dev)) && (npackets < budget)) {
+        while (npackets < budget) {
                 unsigned int pktlength;
                 unsigned int pktwords;
                 struct sk_buff *skb;
diff --git a/drivers/net/smsc9420.c b/drivers/net/smsc9420.c
index b4909a2dec6..92e2bbe6b49 100644
--- a/drivers/net/smsc9420.c
+++ b/drivers/net/smsc9420.c
@@ -1161,7 +1161,7 @@ static int smsc9420_mii_probe(struct net_device *dev)
                 phydev->phy_id);
 
         phydev = phy_connect(dev, dev_name(&phydev->dev),
-                &smsc9420_phy_adjust_link, 0, PHY_INTERFACE_MODE_MII);
+                smsc9420_phy_adjust_link, 0, PHY_INTERFACE_MODE_MII);
 
         if (IS_ERR(phydev)) {
                 pr_err("%s: Could not attach to PHY\n", dev->name);
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 47a4f094787..6e6db955b4a 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -68,8 +68,8 @@
 
 #define DRV_MODULE_NAME         "tg3"
 #define PFX DRV_MODULE_NAME     ": "
-#define DRV_MODULE_VERSION      "3.103"
-#define DRV_MODULE_RELDATE      "November 2, 2009"
+#define DRV_MODULE_VERSION      "3.104"
+#define DRV_MODULE_RELDATE      "November 13, 2009"
 
 #define TG3_DEF_MAC_MODE        0
 #define TG3_DEF_RX_MODE         0
@@ -137,6 +137,12 @@
 #define TG3_RX_STD_MAP_SZ               TG3_RX_DMA_TO_MAP_SZ(TG3_RX_STD_DMA_SZ)
 #define TG3_RX_JMB_MAP_SZ               TG3_RX_DMA_TO_MAP_SZ(TG3_RX_JMB_DMA_SZ)
 
+#define TG3_RX_STD_BUFF_RING_SIZE \
+        (sizeof(struct ring_info) * TG3_RX_RING_SIZE)
+
+#define TG3_RX_JMB_BUFF_RING_SIZE \
+        (sizeof(struct ring_info) * TG3_RX_JUMBO_RING_SIZE)
+
 /* minimum number of free TX descriptors required to wake up TX process */
 #define TG3_TX_WAKEUP_THRESH(tnapi)             ((tnapi)->tx_pending / 4)
 
@@ -235,6 +241,9 @@ static struct pci_device_id tg3_pci_tbl[] = {
         {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_57760)},
         {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_57790)},
         {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_57788)},
+        {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_5717)},
+        {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_5718)},
+        {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_5724)},
         {PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, PCI_DEVICE_ID_SYSKONNECT_9DXX)},
         {PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, PCI_DEVICE_ID_SYSKONNECT_9MXX)},
         {PCI_DEVICE(PCI_VENDOR_ID_ALTIMA, PCI_DEVICE_ID_ALTIMA_AC1000)},
@@ -396,7 +405,7 @@ static void tg3_write_indirect_mbox(struct tg3 *tp, u32 off, u32 val)
                                        TG3_64BIT_REG_LOW, val);
                 return;
         }
-        if (off == (MAILBOX_RCV_STD_PROD_IDX + TG3_64BIT_REG_LOW)) {
+        if (off == TG3_RX_STD_PROD_IDX_REG) {
                 pci_write_config_dword(tp->pdev, TG3PCI_STD_RING_PROD_IDX +
                                        TG3_64BIT_REG_LOW, val);
                 return;
@@ -2249,7 +2258,7 @@ static void tg3_nvram_unlock(struct tg3 *tp)
 static void tg3_enable_nvram_access(struct tg3 *tp)
 {
         if ((tp->tg3_flags2 & TG3_FLG2_5750_PLUS) &&
-            !(tp->tg3_flags2 & TG3_FLG2_PROTECTED_NVRAM)) {
+            !(tp->tg3_flags3 & TG3_FLG3_PROTECTED_NVRAM)) {
                 u32 nvaccess = tr32(NVRAM_ACCESS);
 
                 tw32(NVRAM_ACCESS, nvaccess | ACCESS_ENABLE);
@@ -2260,7 +2269,7 @@ static void tg3_enable_nvram_access(struct tg3 *tp)
 static void tg3_disable_nvram_access(struct tg3 *tp)
 {
         if ((tp->tg3_flags2 & TG3_FLG2_5750_PLUS) &&
-            !(tp->tg3_flags2 & TG3_FLG2_PROTECTED_NVRAM)) {
+            !(tp->tg3_flags3 & TG3_FLG3_PROTECTED_NVRAM)) {
                 u32 nvaccess = tr32(NVRAM_ACCESS);
 
                 tw32(NVRAM_ACCESS, nvaccess & ~ACCESS_ENABLE);
@@ -4397,6 +4406,17 @@ static void tg3_tx(struct tg3_napi *tnapi)
         }
 }
 
+static void tg3_rx_skb_free(struct tg3 *tp, struct ring_info *ri, u32 map_sz)
+{
+        if (!ri->skb)
+                return;
+
+        pci_unmap_single(tp->pdev, pci_unmap_addr(ri, mapping),
+                         map_sz, PCI_DMA_FROMDEVICE);
+        dev_kfree_skb_any(ri->skb);
+        ri->skb = NULL;
+}
+
 /* Returns size of skb allocated or < 0 on error.
  *
  * We only need to fill in the address because the other members
@@ -4408,16 +4428,14 @@ static void tg3_tx(struct tg3_napi *tnapi)
  * buffers the cpu only reads the last cacheline of the RX descriptor
  * (to fetch the error flags, vlan tag, checksum, and opaque cookie).
  */
-static int tg3_alloc_rx_skb(struct tg3_napi *tnapi, u32 opaque_key,
-                            int src_idx, u32 dest_idx_unmasked)
+static int tg3_alloc_rx_skb(struct tg3 *tp, struct tg3_rx_prodring_set *tpr,
+                            u32 opaque_key, u32 dest_idx_unmasked)
 {
-        struct tg3 *tp = tnapi->tp;
         struct tg3_rx_buffer_desc *desc;
         struct ring_info *map, *src_map;
         struct sk_buff *skb;
         dma_addr_t mapping;
         int skb_size, dest_idx;
-        struct tg3_rx_prodring_set *tpr = &tp->prodring[0];
 
         src_map = NULL;
         switch (opaque_key) {
@@ -4425,8 +4443,6 @@ static int tg3_alloc_rx_skb(struct tg3_napi *tnapi, u32 opaque_key,
                 dest_idx = dest_idx_unmasked % TG3_RX_RING_SIZE;
                 desc = &tpr->rx_std[dest_idx];
                 map = &tpr->rx_std_buffers[dest_idx];
-                if (src_idx >= 0)
-                        src_map = &tpr->rx_std_buffers[src_idx];
                 skb_size = tp->rx_pkt_map_sz;
                 break;
 
@@ -4434,8 +4450,6 @@ static int tg3_alloc_rx_skb(struct tg3_napi *tnapi, u32 opaque_key,
                 dest_idx = dest_idx_unmasked % TG3_RX_JUMBO_RING_SIZE;
                 desc = &tpr->rx_jmb[dest_idx].std;
                 map = &tpr->rx_jmb_buffers[dest_idx];
-                if (src_idx >= 0)
-                        src_map = &tpr->rx_jmb_buffers[src_idx];
                 skb_size = TG3_RX_JMB_MAP_SZ;
                 break;
 
@@ -4465,9 +4479,6 @@ static int tg3_alloc_rx_skb(struct tg3_napi *tnapi, u32 opaque_key,
         map->skb = skb;
         pci_unmap_addr_set(map, mapping, mapping);
 
-        if (src_map != NULL)
-                src_map->skb = NULL;
-
         desc->addr_hi = ((u64)mapping >> 32);
         desc->addr_lo = ((u64)mapping & 0xffffffff);
 
@@ -4478,30 +4489,32 @@ static int tg3_alloc_rx_skb(struct tg3_napi *tnapi, u32 opaque_key,
  * members of the RX descriptor are invariant.  See notes above
  * tg3_alloc_rx_skb for full details.
  */
-static void tg3_recycle_rx(struct tg3_napi *tnapi, u32 opaque_key,
-                           int src_idx, u32 dest_idx_unmasked)
+static void tg3_recycle_rx(struct tg3_napi *tnapi,
+                           struct tg3_rx_prodring_set *dpr,
+                           u32 opaque_key, int src_idx,
+                           u32 dest_idx_unmasked)
 {
         struct tg3 *tp = tnapi->tp;
         struct tg3_rx_buffer_desc *src_desc, *dest_desc;
         struct ring_info *src_map, *dest_map;
         int dest_idx;
-        struct tg3_rx_prodring_set *tpr = &tp->prodring[0];
+        struct tg3_rx_prodring_set *spr = &tp->prodring[0];
 
         switch (opaque_key) {
         case RXD_OPAQUE_RING_STD:
                 dest_idx = dest_idx_unmasked % TG3_RX_RING_SIZE;
-                dest_desc = &tpr->rx_std[dest_idx];
-                dest_map = &tpr->rx_std_buffers[dest_idx];
-                src_desc = &tpr->rx_std[src_idx];
-                src_map = &tpr->rx_std_buffers[src_idx];
+                dest_desc = &dpr->rx_std[dest_idx];
+                dest_map = &dpr->rx_std_buffers[dest_idx];
+                src_desc = &spr->rx_std[src_idx];
+                src_map = &spr->rx_std_buffers[src_idx];
                 break;
 
         case RXD_OPAQUE_RING_JUMBO:
                 dest_idx = dest_idx_unmasked % TG3_RX_JUMBO_RING_SIZE;
-                dest_desc = &tpr->rx_jmb[dest_idx].std;
-                dest_map = &tpr->rx_jmb_buffers[dest_idx];
-                src_desc = &tpr->rx_jmb[src_idx].std;
-                src_map = &tpr->rx_jmb_buffers[src_idx];
+                dest_desc = &dpr->rx_jmb[dest_idx].std;
+                dest_map = &dpr->rx_jmb_buffers[dest_idx];
+                src_desc = &spr->rx_jmb[src_idx].std;
+                src_map = &spr->rx_jmb_buffers[src_idx];
                 break;
 
         default:
@@ -4513,7 +4526,6 @@ static void tg3_recycle_rx(struct tg3_napi *tnapi, u32 opaque_key,
                            pci_unmap_addr(src_map, mapping));
         dest_desc->addr_hi = src_desc->addr_hi;
         dest_desc->addr_lo = src_desc->addr_lo;
-
         src_map->skb = NULL;
 }
 
@@ -4545,10 +4557,11 @@ static int tg3_rx(struct tg3_napi *tnapi, int budget)
 {
         struct tg3 *tp = tnapi->tp;
         u32 work_mask, rx_std_posted = 0;
+        u32 std_prod_idx, jmb_prod_idx;
         u32 sw_idx = tnapi->rx_rcb_ptr;
         u16 hw_idx;
         int received;
-        struct tg3_rx_prodring_set *tpr = &tp->prodring[0];
+        struct tg3_rx_prodring_set *tpr = tnapi->prodring;
 
         hw_idx = *(tnapi->rx_rcb_prod_idx);
         /*
@@ -4558,7 +4571,10 @@ static int tg3_rx(struct tg3_napi *tnapi, int budget)
         rmb();
         work_mask = 0;
         received = 0;
+        std_prod_idx = tpr->rx_std_prod_idx;
+        jmb_prod_idx = tpr->rx_jmb_prod_idx;
         while (sw_idx != hw_idx && budget > 0) {
+                struct ring_info *ri;
                 struct tg3_rx_buffer_desc *desc = &tnapi->rx_rcb[sw_idx];
                 unsigned int len;
                 struct sk_buff *skb;
@@ -4568,16 +4584,16 @@ static int tg3_rx(struct tg3_napi *tnapi, int budget)
                 desc_idx = desc->opaque & RXD_OPAQUE_INDEX_MASK;
                 opaque_key = desc->opaque & RXD_OPAQUE_RING_MASK;
                 if (opaque_key == RXD_OPAQUE_RING_STD) {
-                        struct ring_info *ri = &tpr->rx_std_buffers[desc_idx];
+                        ri = &tp->prodring[0].rx_std_buffers[desc_idx];
                         dma_addr = pci_unmap_addr(ri, mapping);
                         skb = ri->skb;
-                        post_ptr = &tpr->rx_std_ptr;
+                        post_ptr = &std_prod_idx;
                         rx_std_posted++;
                 } else if (opaque_key == RXD_OPAQUE_RING_JUMBO) {
-                        struct ring_info *ri = &tpr->rx_jmb_buffers[desc_idx];
+                        ri = &tp->prodring[0].rx_jmb_buffers[desc_idx];
                         dma_addr = pci_unmap_addr(ri, mapping);
                         skb = ri->skb;
-                        post_ptr = &tpr->rx_jmb_ptr;
+                        post_ptr = &jmb_prod_idx;
                 } else
                         goto next_pkt_nopost;
 
@@ -4586,7 +4602,7 @@ static int tg3_rx(struct tg3_napi *tnapi, int budget)
                 if ((desc->err_vlan & RXD_ERR_MASK) != 0 &&
                     (desc->err_vlan != RXD_ERR_ODD_NIBBLE_RCVD_MII)) {
                 drop_it:
-                        tg3_recycle_rx(tnapi, opaque_key,
+                        tg3_recycle_rx(tnapi, tpr, opaque_key,
                                        desc_idx, *post_ptr);
                 drop_it_no_recycle:
                         /* Other statistics kept track of by card. */
@@ -4606,11 +4622,13 @@ static int tg3_rx(struct tg3_napi *tnapi, int budget)
                 ) {
                         int skb_size;
 
-                        skb_size = tg3_alloc_rx_skb(tnapi, opaque_key,
-                                                    desc_idx, *post_ptr);
+                        skb_size = tg3_alloc_rx_skb(tp, tpr, opaque_key,
+                                                    *post_ptr);
                         if (skb_size < 0)
                                 goto drop_it;
 
+                        ri->skb = NULL;
+
                         pci_unmap_single(tp->pdev, dma_addr, skb_size,
                                          PCI_DMA_FROMDEVICE);
 
@@ -4618,7 +4636,7 @@ static int tg3_rx(struct tg3_napi *tnapi, int budget)
                 } else {
                         struct sk_buff *copy_skb;
 
-                        tg3_recycle_rx(tnapi, opaque_key,
+                        tg3_recycle_rx(tnapi, tpr, opaque_key,
                                        desc_idx, *post_ptr);
 
                         copy_skb = netdev_alloc_skb(tp->dev,
@@ -4669,9 +4687,7 @@ next_pkt:
 
                 if (unlikely(rx_std_posted >= tp->rx_std_max_post)) {
                         u32 idx = *post_ptr % TG3_RX_RING_SIZE;
-
-                        tw32_rx_mbox(MAILBOX_RCV_STD_PROD_IDX +
-                                     TG3_64BIT_REG_LOW, idx);
+                        tw32_rx_mbox(TG3_RX_STD_PROD_IDX_REG, idx);
                         work_mask &= ~RXD_OPAQUE_RING_STD;
                         rx_std_posted = 0;
                 }
@@ -4691,33 +4707,45 @@ next_pkt_nopost:
         tw32_rx_mbox(tnapi->consmbox, sw_idx);
 
         /* Refill RX ring(s). */
-        if (work_mask & RXD_OPAQUE_RING_STD) {
-                sw_idx = tpr->rx_std_ptr % TG3_RX_RING_SIZE;
-                tw32_rx_mbox(MAILBOX_RCV_STD_PROD_IDX + TG3_64BIT_REG_LOW,
-                             sw_idx);
-        }
-        if (work_mask & RXD_OPAQUE_RING_JUMBO) {
-                sw_idx = tpr->rx_jmb_ptr % TG3_RX_JUMBO_RING_SIZE;
-                tw32_rx_mbox(MAILBOX_RCV_JUMBO_PROD_IDX + TG3_64BIT_REG_LOW,
-                             sw_idx);
+        if (!(tp->tg3_flags3 & TG3_FLG3_ENABLE_RSS) || tnapi == &tp->napi[1]) {
+                if (work_mask & RXD_OPAQUE_RING_STD) {
+                        tpr->rx_std_prod_idx = std_prod_idx % TG3_RX_RING_SIZE;
+                        tw32_rx_mbox(TG3_RX_STD_PROD_IDX_REG,
+                                     tpr->rx_std_prod_idx);
+                }
+                if (work_mask & RXD_OPAQUE_RING_JUMBO) {
+                        tpr->rx_jmb_prod_idx = jmb_prod_idx %
+                                               TG3_RX_JUMBO_RING_SIZE;
+                        tw32_rx_mbox(TG3_RX_JMB_PROD_IDX_REG,
+                                     tpr->rx_jmb_prod_idx);
+                }
+                mmiowb();
+        } else if (work_mask) {
+                /* rx_std_buffers[] and rx_jmb_buffers[] entries must be
+                 * updated before the producer indices can be updated.
+                 */
+                smp_wmb();
+
+                tpr->rx_std_prod_idx = std_prod_idx % TG3_RX_RING_SIZE;
+                tpr->rx_jmb_prod_idx = jmb_prod_idx % TG3_RX_JUMBO_RING_SIZE;
+
+                napi_schedule(&tp->napi[1].napi);
         }
-        mmiowb();
 
         return received;
 }
 
-static int tg3_poll_work(struct tg3_napi *tnapi, int work_done, int budget)
+static void tg3_poll_link(struct tg3 *tp)
 {
-        struct tg3 *tp = tnapi->tp;
-        struct tg3_hw_status *sblk = tnapi->hw_status;
-
         /* handle link change and other phy events */
         if (!(tp->tg3_flags &
               (TG3_FLAG_USE_LINKCHG_REG |
                TG3_FLAG_POLL_SERDES))) {
+                struct tg3_hw_status *sblk = tp->napi[0].hw_status;
+
                 if (sblk->status & SD_STATUS_LINK_CHG) {
                         sblk->status = SD_STATUS_UPDATED |
-                                (sblk->status & ~SD_STATUS_LINK_CHG);
+                                       (sblk->status & ~SD_STATUS_LINK_CHG);
                         spin_lock(&tp->lock);
                         if (tp->tg3_flags3 & TG3_FLG3_USE_PHYLIB) {
                                 tw32_f(MAC_STATUS,
@@ -4731,6 +4759,98 @@ static int tg3_poll_work(struct tg3_napi *tnapi, int work_done, int budget)
                         spin_unlock(&tp->lock);
                 }
         }
+}
+
+static void tg3_rx_prodring_xfer(struct tg3 *tp,
+                                 struct tg3_rx_prodring_set *dpr,
+                                 struct tg3_rx_prodring_set *spr)
+{
+        u32 si, di, cpycnt, src_prod_idx;
+        int i;
+
+        while (1) {
+                src_prod_idx = spr->rx_std_prod_idx;
+
+                /* Make sure updates to the rx_std_buffers[] entries and the
+                 * standard producer index are seen in the correct order.
+                 */
+                smp_rmb();
+
+                if (spr->rx_std_cons_idx == src_prod_idx)
+                        break;
+
+                if (spr->rx_std_cons_idx < src_prod_idx)
+                        cpycnt = src_prod_idx - spr->rx_std_cons_idx;
+                else
+                        cpycnt = TG3_RX_RING_SIZE - spr->rx_std_cons_idx;
+
+                cpycnt = min(cpycnt, TG3_RX_RING_SIZE - dpr->rx_std_prod_idx);
+
+                si = spr->rx_std_cons_idx;
+                di = dpr->rx_std_prod_idx;
+
+                memcpy(&dpr->rx_std_buffers[di],
+                       &spr->rx_std_buffers[si],
+                       cpycnt * sizeof(struct ring_info));
+
+                for (i = 0; i < cpycnt; i++, di++, si++) {
+                        struct tg3_rx_buffer_desc *sbd, *dbd;
+                        sbd = &spr->rx_std[si];
+                        dbd = &dpr->rx_std[di];
+                        dbd->addr_hi = sbd->addr_hi;
+                        dbd->addr_lo = sbd->addr_lo;
+                }
+
+                spr->rx_std_cons_idx = (spr->rx_std_cons_idx + cpycnt) %
+                                       TG3_RX_RING_SIZE;
+                dpr->rx_std_prod_idx = (dpr->rx_std_prod_idx + cpycnt) %
+                                       TG3_RX_RING_SIZE;
+        }
+
+        while (1) {
+                src_prod_idx = spr->rx_jmb_prod_idx;
+
+                /* Make sure updates to the rx_jmb_buffers[] entries and
+                 * the jumbo producer index are seen in the correct order.
+                 */
+                smp_rmb();
+
+                if (spr->rx_jmb_cons_idx == src_prod_idx)
+                        break;
+
+                if (spr->rx_jmb_cons_idx < src_prod_idx)
+                        cpycnt = src_prod_idx - spr->rx_jmb_cons_idx;
+                else
+                        cpycnt = TG3_RX_JUMBO_RING_SIZE - spr->rx_jmb_cons_idx;
+
+                cpycnt = min(cpycnt,
+                             TG3_RX_JUMBO_RING_SIZE - dpr->rx_jmb_prod_idx);
+
+                si = spr->rx_jmb_cons_idx;
+                di = dpr->rx_jmb_prod_idx;
+
+                memcpy(&dpr->rx_jmb_buffers[di],
+                       &spr->rx_jmb_buffers[si],
+                       cpycnt * sizeof(struct ring_info));
+
+                for (i = 0; i < cpycnt; i++, di++, si++) {
+                        struct tg3_rx_buffer_desc *sbd, *dbd;
+                        sbd = &spr->rx_jmb[si].std;
+                        dbd = &dpr->rx_jmb[di].std;
+                        dbd->addr_hi = sbd->addr_hi;
+                        dbd->addr_lo = sbd->addr_lo;
+                }
+
+                spr->rx_jmb_cons_idx = (spr->rx_jmb_cons_idx + cpycnt) %
+                                       TG3_RX_JUMBO_RING_SIZE;
+                dpr->rx_jmb_prod_idx = (dpr->rx_jmb_prod_idx + cpycnt) %
+                                       TG3_RX_JUMBO_RING_SIZE;
+        }
+}
+
+static int tg3_poll_work(struct tg3_napi *tnapi, int work_done, int budget)
+{
+        struct tg3 *tp = tnapi->tp;
 
         /* run TX completion thread */
         if (tnapi->hw_status->idx[0].tx_consumer != tnapi->tx_cons) {
@@ -4746,6 +4866,74 @@ static int tg3_poll_work(struct tg3_napi *tnapi, int work_done, int budget)
         if (*(tnapi->rx_rcb_prod_idx) != tnapi->rx_rcb_ptr)
                 work_done += tg3_rx(tnapi, budget - work_done);
 
+        if ((tp->tg3_flags3 & TG3_FLG3_ENABLE_RSS) && tnapi == &tp->napi[1]) {
+                int i;
+                u32 std_prod_idx = tp->prodring[0].rx_std_prod_idx;
+                u32 jmb_prod_idx = tp->prodring[0].rx_jmb_prod_idx;
+
+                for (i = 2; i < tp->irq_cnt; i++)
+                        tg3_rx_prodring_xfer(tp, tnapi->prodring,
+                                             tp->napi[i].prodring);
+
+                wmb();
+
+                if (std_prod_idx != tp->prodring[0].rx_std_prod_idx) {
+                        u32 mbox = TG3_RX_STD_PROD_IDX_REG;
+                        tw32_rx_mbox(mbox, tp->prodring[0].rx_std_prod_idx);
+                }
+
+                if (jmb_prod_idx != tp->prodring[0].rx_jmb_prod_idx) {
+                        u32 mbox = TG3_RX_JMB_PROD_IDX_REG;
+                        tw32_rx_mbox(mbox, tp->prodring[0].rx_jmb_prod_idx);
+                }
+
+                mmiowb();
+        }
+
+        return work_done;
+}
+
+static int tg3_poll_msix(struct napi_struct *napi, int budget)
+{
+        struct tg3_napi *tnapi = container_of(napi, struct tg3_napi, napi);
+        struct tg3 *tp = tnapi->tp;
+        int work_done = 0;
+        struct tg3_hw_status *sblk = tnapi->hw_status;
+
+        while (1) {
+                work_done = tg3_poll_work(tnapi, work_done, budget);
+
+                if (unlikely(tp->tg3_flags & TG3_FLAG_TX_RECOVERY_PENDING))
+                        goto tx_recovery;
+
+                if (unlikely(work_done >= budget))
+                        break;
+
+                /* tp->last_tag is used in tg3_restart_ints() below
+                 * to tell the hw how much work has been processed,
+                 * so we must read it before checking for more work.
+                 */
+                tnapi->last_tag = sblk->status_tag;
+                tnapi->last_irq_tag = tnapi->last_tag;
+                rmb();
+
+                /* check for RX/TX work to do */
+                if (sblk->idx[0].tx_consumer == tnapi->tx_cons &&
+                    *(tnapi->rx_rcb_prod_idx) == tnapi->rx_rcb_ptr) {
+                        napi_complete(napi);
+                        /* Reenable interrupts. */
+                        tw32_mailbox(tnapi->int_mbox, tnapi->last_tag << 24);
+                        mmiowb();
+                        break;
+                }
+        }
+
+        return work_done;
+
+tx_recovery:
+        /* work_done is guaranteed to be less than budget. */
+        napi_complete(napi);
+        schedule_work(&tp->reset_task);
         return work_done;
 }
 
@@ -4757,6 +4945,8 @@ static int tg3_poll(struct napi_struct *napi, int budget)
         struct tg3_hw_status *sblk = tnapi->hw_status;
 
         while (1) {
+                tg3_poll_link(tp);
+
                 work_done = tg3_poll_work(tnapi, work_done, budget);
 
                 if (unlikely(tp->tg3_flags & TG3_FLAG_TX_RECOVERY_PENDING))
@@ -5119,11 +5309,11 @@ static inline int tg3_40bit_overflow_test(struct tg3 *tp, dma_addr_t mapping,
 static void tg3_set_txd(struct tg3_napi *, int, dma_addr_t, int, u32, u32);
 
 /* Workaround 4GB and 40-bit hardware DMA bugs. */
-static int tigon3_dma_hwbug_workaround(struct tg3 *tp, struct sk_buff *skb,
-                                       u32 last_plus_one, u32 *start,
-                                       u32 base_flags, u32 mss)
+static int tigon3_dma_hwbug_workaround(struct tg3_napi *tnapi,
+                                       struct sk_buff *skb, u32 last_plus_one,
+                                       u32 *start, u32 base_flags, u32 mss)
 {
-        struct tg3_napi *tnapi = &tp->napi[0];
+        struct tg3 *tp = tnapi->tp;
         struct sk_buff *new_skb;
         dma_addr_t new_addr = 0;
         u32 entry = *start;
@@ -5206,7 +5396,7 @@ static void tg3_set_txd(struct tg3_napi *tnapi, int entry,
 }
 
 /* hard_start_xmit for devices that don't have any bugs and
- * support TG3_FLG2_HW_TSO_2 only.
+ * support TG3_FLG2_HW_TSO_2 and TG3_FLG2_HW_TSO_3 only.
  */
 static netdev_tx_t tg3_start_xmit(struct sk_buff *skb,
                                   struct net_device *dev)
@@ -5265,7 +5455,7 @@ static netdev_tx_t tg3_start_xmit(struct sk_buff *skb,
                         hdrlen = ip_tcp_len + tcp_opt_len;
                 }
 
-                if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717) {
+                if (tp->tg3_flags2 & TG3_FLG2_HW_TSO_3) {
                         mss |= (hdrlen & 0xc) << 12;
                         if (hdrlen & 0x10)
                                 base_flags |= 0x00000010;
@@ -5392,9 +5582,13 @@ static netdev_tx_t tg3_start_xmit_dma_bug(struct sk_buff *skb,
         struct skb_shared_info *sp;
         int would_hit_hwbug;
         dma_addr_t mapping;
-        struct tg3_napi *tnapi = &tp->napi[0];
+        struct tg3_napi *tnapi;
+        struct netdev_queue *txq;
 
-        len = skb_headlen(skb);
+        txq = netdev_get_tx_queue(dev, skb_get_queue_mapping(skb));
+        tnapi = &tp->napi[skb_get_queue_mapping(skb)];
+        if (tp->tg3_flags2 & TG3_FLG2_USING_MSIX)
+                tnapi++;
 
         /* We are running in BH disabled context with netif_tx_lock
          * and TX reclaim runs via tp->napi.poll inside of a software
@@ -5402,8 +5596,8 @@ static netdev_tx_t tg3_start_xmit_dma_bug(struct sk_buff *skb,
          * no IRQ context deadlocks to worry about either.  Rejoice!
          */
         if (unlikely(tg3_tx_avail(tnapi) <= (skb_shinfo(skb)->nr_frags + 1))) {
-                if (!netif_queue_stopped(dev)) {
-                        netif_stop_queue(dev);
+                if (!netif_tx_queue_stopped(txq)) {
+                        netif_tx_stop_queue(txq);
 
                         /* This is a hard error, log it. */
                         printk(KERN_ERR PFX "%s: BUG! Tx Ring full when "
@@ -5416,7 +5610,7 @@ static netdev_tx_t tg3_start_xmit_dma_bug(struct sk_buff *skb,
         base_flags = 0;
         if (skb->ip_summed == CHECKSUM_PARTIAL)
                 base_flags |= TXD_FLAG_TCPUDP_CSUM;
-        mss = 0;
+
         if ((mss = skb_shinfo(skb)->gso_size) != 0) {
                 struct iphdr *iph;
                 u32 tcp_opt_len, ip_tcp_len, hdr_len;
@@ -5450,7 +5644,12 @@ static netdev_tx_t tg3_start_xmit_dma_bug(struct sk_buff *skb,
                                                                  IPPROTO_TCP,
                                                                  0);
 
-                if (tp->tg3_flags2 & TG3_FLG2_HW_TSO_2)
+                if (tp->tg3_flags2 & TG3_FLG2_HW_TSO_3) {
+                        mss |= (hdr_len & 0xc) << 12;
+                        if (hdr_len & 0x10)
+                                base_flags |= 0x00000010;
+                        base_flags |= (hdr_len & 0x3e0) << 5;
+                } else if (tp->tg3_flags2 & TG3_FLG2_HW_TSO_2)
                         mss |= hdr_len << 9;
                 else if ((tp->tg3_flags2 & TG3_FLG2_HW_TSO_1) ||
                          GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705) {
@@ -5475,6 +5674,10 @@ static netdev_tx_t tg3_start_xmit_dma_bug(struct sk_buff *skb,
                                (vlan_tx_tag_get(skb) << 16));
 #endif
 
+        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 &&
+            !mss && skb->len > ETH_DATA_LEN)
+                base_flags |= TXD_FLAG_JMB_PKT;
+
         if (skb_dma_map(&tp->pdev->dev, skb, DMA_TO_DEVICE)) {
                 dev_kfree_skb(skb);
                 goto out_unlock;
@@ -5488,6 +5691,8 @@ static netdev_tx_t tg3_start_xmit_dma_bug(struct sk_buff *skb,
 
         would_hit_hwbug = 0;
 
+        len = skb_headlen(skb);
+
         if ((tp->tg3_flags3 & TG3_FLG3_SHORT_DMA_BUG) && len <= 8)
                 would_hit_hwbug = 1;
 
@@ -5553,7 +5758,7 @@ static netdev_tx_t tg3_start_xmit_dma_bug(struct sk_buff *skb,
                 /* If the workaround fails due to memory/mapping
                  * failure, silently drop this packet.
                  */
-                if (tigon3_dma_hwbug_workaround(tp, skb, last_plus_one,
+                if (tigon3_dma_hwbug_workaround(tnapi, skb, last_plus_one,
                                                 &start, base_flags, mss))
                         goto out_unlock;
 
@@ -5561,13 +5766,13 @@ static netdev_tx_t tg3_start_xmit_dma_bug(struct sk_buff *skb,
         }
 
         /* Packets are ready, update Tx producer idx local and on card. */
-        tw32_tx_mbox(MAILBOX_SNDHOST_PROD_IDX_0 + TG3_64BIT_REG_LOW, entry);
+        tw32_tx_mbox(tnapi->prodmbox, entry);
 
         tnapi->tx_prod = entry;
         if (unlikely(tg3_tx_avail(tnapi) <= (MAX_SKB_FRAGS + 1))) {
-                netif_stop_queue(dev);
+                netif_tx_stop_queue(txq);
                 if (tg3_tx_avail(tnapi) > TG3_TX_WAKEUP_THRESH(tnapi))
-                        netif_wake_queue(tp->dev);
+                        netif_tx_wake_queue(txq);
         }
 
 out_unlock:
@@ -5638,36 +5843,33 @@ static void tg3_rx_prodring_free(struct tg3 *tp,
                                  struct tg3_rx_prodring_set *tpr)
 {
         int i;
-        struct ring_info *rxp;
-
-        for (i = 0; i < TG3_RX_RING_SIZE; i++) {
-                rxp = &tpr->rx_std_buffers[i];
 
-                if (rxp->skb == NULL)
-                        continue;
+        if (tpr != &tp->prodring[0]) {
+                for (i = tpr->rx_std_cons_idx; i != tpr->rx_std_prod_idx;
+                     i = (i + 1) % TG3_RX_RING_SIZE)
+                        tg3_rx_skb_free(tp, &tpr->rx_std_buffers[i],
+                                        tp->rx_pkt_map_sz);
+
+                if (tp->tg3_flags & TG3_FLAG_JUMBO_CAPABLE) {
+                        for (i = tpr->rx_jmb_cons_idx;
+                             i != tpr->rx_jmb_prod_idx;
+                             i = (i + 1) % TG3_RX_JUMBO_RING_SIZE) {
+                                tg3_rx_skb_free(tp, &tpr->rx_jmb_buffers[i],
+                                                TG3_RX_JMB_MAP_SZ);
+                        }
+                }
 
-                pci_unmap_single(tp->pdev,
-                                 pci_unmap_addr(rxp, mapping),
-                                 tp->rx_pkt_map_sz,
-                                 PCI_DMA_FROMDEVICE);
-                dev_kfree_skb_any(rxp->skb);
-                rxp->skb = NULL;
+                return;
         }
 
-        if (tp->tg3_flags & TG3_FLAG_JUMBO_CAPABLE) {
-                for (i = 0; i < TG3_RX_JUMBO_RING_SIZE; i++) {
-                        rxp = &tpr->rx_jmb_buffers[i];
-
-                        if (rxp->skb == NULL)
-                                continue;
+        for (i = 0; i < TG3_RX_RING_SIZE; i++)
+                tg3_rx_skb_free(tp, &tpr->rx_std_buffers[i],
+                                tp->rx_pkt_map_sz);
 
-                        pci_unmap_single(tp->pdev,
-                                         pci_unmap_addr(rxp, mapping),
-                                         TG3_RX_JMB_MAP_SZ,
-                                         PCI_DMA_FROMDEVICE);
-                        dev_kfree_skb_any(rxp->skb);
-                        rxp->skb = NULL;
-                }
+        if (tp->tg3_flags & TG3_FLAG_JUMBO_CAPABLE) {
+                for (i = 0; i < TG3_RX_JUMBO_RING_SIZE; i++)
+                        tg3_rx_skb_free(tp, &tpr->rx_jmb_buffers[i],
+                                        TG3_RX_JMB_MAP_SZ);
         }
 }
 
@@ -5682,7 +5884,19 @@ static int tg3_rx_prodring_alloc(struct tg3 *tp,
                                  struct tg3_rx_prodring_set *tpr)
 {
         u32 i, rx_pkt_dma_sz;
-        struct tg3_napi *tnapi = &tp->napi[0];
+
+        tpr->rx_std_cons_idx = 0;
+        tpr->rx_std_prod_idx = 0;
+        tpr->rx_jmb_cons_idx = 0;
+        tpr->rx_jmb_prod_idx = 0;
+
+        if (tpr != &tp->prodring[0]) {
+                memset(&tpr->rx_std_buffers[0], 0, TG3_RX_STD_BUFF_RING_SIZE);
+                if (tp->tg3_flags & TG3_FLAG_JUMBO_CAPABLE)
+                        memset(&tpr->rx_jmb_buffers[0], 0,
+                               TG3_RX_JMB_BUFF_RING_SIZE);
+                goto done;
+        }
 
         /* Zero out all descriptors. */
         memset(tpr->rx_std, 0, TG3_RX_RING_BYTES);
@@ -5709,7 +5923,7 @@ static int tg3_rx_prodring_alloc(struct tg3 *tp,
 
         /* Now allocate fresh SKBs for each rx ring. */
         for (i = 0; i < tp->rx_pending; i++) {
-                if (tg3_alloc_rx_skb(tnapi, RXD_OPAQUE_RING_STD, -1, i) < 0) {
+                if (tg3_alloc_rx_skb(tp, tpr, RXD_OPAQUE_RING_STD, i) < 0) {
                         printk(KERN_WARNING PFX
                                "%s: Using a smaller RX standard ring, "
                                "only %d out of %d buffers were allocated "
@@ -5740,8 +5954,8 @@ static int tg3_rx_prodring_alloc(struct tg3 *tp,
                 }
 
                 for (i = 0; i < tp->rx_jumbo_pending; i++) {
-                        if (tg3_alloc_rx_skb(tnapi, RXD_OPAQUE_RING_JUMBO,
-                                             -1, i) < 0) {
+                        if (tg3_alloc_rx_skb(tp, tpr, RXD_OPAQUE_RING_JUMBO,
+                                             i) < 0) {
                                 printk(KERN_WARNING PFX
                                        "%s: Using a smaller RX jumbo ring, "
                                        "only %d out of %d buffers were "
@@ -5785,8 +5999,7 @@ static void tg3_rx_prodring_fini(struct tg3 *tp,
 static int tg3_rx_prodring_init(struct tg3 *tp,
                                 struct tg3_rx_prodring_set *tpr)
 {
-        tpr->rx_std_buffers = kzalloc(sizeof(struct ring_info) *
-                                      TG3_RX_RING_SIZE, GFP_KERNEL);
+        tpr->rx_std_buffers = kzalloc(TG3_RX_STD_BUFF_RING_SIZE, GFP_KERNEL);
         if (!tpr->rx_std_buffers)
                 return -ENOMEM;
 
@@ -5796,8 +6009,7 @@ static int tg3_rx_prodring_init(struct tg3 *tp,
                 goto err_out;
 
         if (tp->tg3_flags & TG3_FLAG_JUMBO_CAPABLE) {
-                tpr->rx_jmb_buffers = kzalloc(sizeof(struct ring_info) *
-                                              TG3_RX_JUMBO_RING_SIZE,
+                tpr->rx_jmb_buffers = kzalloc(TG3_RX_JMB_BUFF_RING_SIZE,
                                               GFP_KERNEL);
                 if (!tpr->rx_jmb_buffers)
                         goto err_out;
@@ -5853,9 +6065,10 @@ static void tg3_free_rings(struct tg3 *tp)
 
                         dev_kfree_skb_any(skb);
                 }
-        }
 
-        tg3_rx_prodring_free(tp, &tp->prodring[0]);
+                if (tp->irq_cnt == 1 || j != tp->irq_cnt - 1)
+                        tg3_rx_prodring_free(tp, &tp->prodring[j]);
+        }
 }
 
 /* Initialize tx/rx rings for packet processing.
@@ -5889,9 +6102,13 @@ static int tg3_init_rings(struct tg3 *tp)
                 tnapi->rx_rcb_ptr = 0;
                 if (tnapi->rx_rcb)
                         memset(tnapi->rx_rcb, 0, TG3_RX_RCB_RING_BYTES(tp));
+
+                if ((tp->irq_cnt == 1 || i != tp->irq_cnt - 1) &&
+                        tg3_rx_prodring_alloc(tp, &tp->prodring[i]))
+                        return -ENOMEM;
         }
 
-        return tg3_rx_prodring_alloc(tp, &tp->prodring[0]);
+        return 0;
 }
 
 /*
@@ -5935,7 +6152,8 @@ static void tg3_free_consistent(struct tg3 *tp)
                 tp->hw_stats = NULL;
         }
 
-        tg3_rx_prodring_fini(tp, &tp->prodring[0]);
+        for (i = 0; i < (tp->irq_cnt == 1 ? 1 : tp->irq_cnt - 1); i++)
+                tg3_rx_prodring_fini(tp, &tp->prodring[i]);
 }
 
 /*
@@ -5946,8 +6164,10 @@ static int tg3_alloc_consistent(struct tg3 *tp)
 {
         int i;
 
-        if (tg3_rx_prodring_init(tp, &tp->prodring[0]))
-                return -ENOMEM;
+        for (i = 0; i < (tp->irq_cnt == 1 ? 1 : tp->irq_cnt - 1); i++) {
+                if (tg3_rx_prodring_init(tp, &tp->prodring[i]))
+                        goto err_out;
+        }
 
         tp->hw_stats = pci_alloc_consistent(tp->pdev,
                                             sizeof(struct tg3_hw_stats),
@@ -5991,6 +6211,11 @@ static int tg3_alloc_consistent(struct tg3 *tp)
                         break;
                 }
 
+                if (tp->irq_cnt == 1)
+                        tnapi->prodring = &tp->prodring[0];
+                else if (i)
+                        tnapi->prodring = &tp->prodring[i - 1];
+
                 /*
                  * If multivector RSS is enabled, vector 0 does not handle
                  * rx or tx interrupts.  Don't allocate any resources for it.
@@ -7279,9 +7504,12 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
         if (err)
                 return err;
 
-        if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5784 &&
-            GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5761 &&
-            GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5717) {
+        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717) {
+                val = tr32(TG3PCI_DMA_RW_CTRL) &
+                      ~DMA_RWCTRL_DIS_CACHE_ALIGNMENT;
+                tw32(TG3PCI_DMA_RW_CTRL, val | tp->dma_rwctrl);
+        } else if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5784 &&
+                   GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5761) {
                 /* This value is determined during the probe time DMA
                  * engine test, tg3_test_dma.
                  */
@@ -7404,8 +7632,9 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
              ((u64) tpr->rx_std_mapping >> 32));
         tw32(RCVDBDI_STD_BD + TG3_BDINFO_HOST_ADDR + TG3_64BIT_REG_LOW,
              ((u64) tpr->rx_std_mapping & 0xffffffff));
-        tw32(RCVDBDI_STD_BD + TG3_BDINFO_NIC_ADDR,
-             NIC_SRAM_RX_BUFFER_DESC);
+        if (!(tp->tg3_flags3 & TG3_FLG3_5755_PLUS))
+                tw32(RCVDBDI_STD_BD + TG3_BDINFO_NIC_ADDR,
+                     NIC_SRAM_RX_BUFFER_DESC);
 
         /* Disable the mini ring */
         if (!(tp->tg3_flags2 & TG3_FLG2_5705_PLUS))
@@ -7428,8 +7657,9 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
                         tw32(RCVDBDI_JUMBO_BD + TG3_BDINFO_MAXLEN_FLAGS,
                              (RX_JUMBO_MAX_SIZE << BDINFO_FLAGS_MAXLEN_SHIFT) |
                              BDINFO_FLAGS_USE_EXT_RECV);
-                        tw32(RCVDBDI_JUMBO_BD + TG3_BDINFO_NIC_ADDR,
-                             NIC_SRAM_RX_JUMBO_BUFFER_DESC);
+                        if (!(tp->tg3_flags2 & TG3_FLG2_5705_PLUS))
+                                tw32(RCVDBDI_JUMBO_BD + TG3_BDINFO_NIC_ADDR,
+                                     NIC_SRAM_RX_JUMBO_BUFFER_DESC);
                 } else {
                         tw32(RCVDBDI_JUMBO_BD + TG3_BDINFO_MAXLEN_FLAGS,
                              BDINFO_FLAGS_DISABLED);
@@ -7445,14 +7675,12 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
 
         tw32(RCVDBDI_STD_BD + TG3_BDINFO_MAXLEN_FLAGS, val);
 
-        tpr->rx_std_ptr = tp->rx_pending;
-        tw32_rx_mbox(MAILBOX_RCV_STD_PROD_IDX + TG3_64BIT_REG_LOW,
-                     tpr->rx_std_ptr);
+        tpr->rx_std_prod_idx = tp->rx_pending;
+        tw32_rx_mbox(TG3_RX_STD_PROD_IDX_REG, tpr->rx_std_prod_idx);
 
-        tpr->rx_jmb_ptr = (tp->tg3_flags & TG3_FLAG_JUMBO_RING_ENABLE) ?
+        tpr->rx_jmb_prod_idx = (tp->tg3_flags & TG3_FLAG_JUMBO_RING_ENABLE) ?
                           tp->rx_jumbo_pending : 0;
-        tw32_rx_mbox(MAILBOX_RCV_JUMBO_PROD_IDX + TG3_64BIT_REG_LOW,
-                     tpr->rx_jmb_ptr);
+        tw32_rx_mbox(TG3_RX_JMB_PROD_IDX_REG, tpr->rx_jmb_prod_idx);
 
         if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717) {
                 tw32(STD_REPLENISH_LWM, 32);
@@ -7515,7 +7743,8 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
         if (tp->tg3_flags2 & TG3_FLG2_HW_TSO)
                 rdmac_mode |= RDMAC_MODE_IPV4_LSO_EN;
 
-        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5785 ||
+        if ((tp->tg3_flags2 & TG3_FLG2_HW_TSO_3) ||
+            GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5785 ||
             GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57780)
                 rdmac_mode |= RDMAC_MODE_IPV6_LSO_EN;
 
@@ -9505,15 +9734,16 @@ static int tg3_set_tso(struct net_device *dev, u32 value)
                 return 0;
         }
         if ((dev->features & NETIF_F_IPV6_CSUM) &&
-            (tp->tg3_flags2 & TG3_FLG2_HW_TSO_2)) {
+            ((tp->tg3_flags2 & TG3_FLG2_HW_TSO_2) ||
+             (tp->tg3_flags2 & TG3_FLG2_HW_TSO_3))) {
                 if (value) {
                         dev->features |= NETIF_F_TSO6;
-                        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5761 ||
+                        if ((tp->tg3_flags2 & TG3_FLG2_HW_TSO_3) ||
+                            GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5761 ||
                             (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5784 &&
                              GET_CHIP_REV(tp->pci_chip_rev_id) != CHIPREV_5784_AX) ||
                             GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5785 ||
-                            GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57780 ||
-                            GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717)
+                            GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57780)
                                 dev->features |= NETIF_F_TSO_ECN;
                 } else
                         dev->features &= ~(NETIF_F_TSO6 | NETIF_F_TSO_ECN);
@@ -10962,7 +11192,7 @@ static void __devinit tg3_get_5752_nvram_info(struct tg3 *tp)
 
         /* NVRAM protection for TPM */
         if (nvcfg1 & (1 << 27))
-                tp->tg3_flags2 |= TG3_FLG2_PROTECTED_NVRAM;
+                tp->tg3_flags3 |= TG3_FLG3_PROTECTED_NVRAM;
 
         switch (nvcfg1 & NVRAM_CFG1_5752VENDOR_MASK) {
         case FLASH_5752VENDOR_ATMEL_EEPROM_64KHZ:
@@ -11003,7 +11233,7 @@ static void __devinit tg3_get_5755_nvram_info(struct tg3 *tp)
 
         /* NVRAM protection for TPM */
         if (nvcfg1 & (1 << 27)) {
-                tp->tg3_flags2 |= TG3_FLG2_PROTECTED_NVRAM;
+                tp->tg3_flags3 |= TG3_FLG3_PROTECTED_NVRAM;
                 protect = 1;
         }
 
@@ -11097,7 +11327,7 @@ static void __devinit tg3_get_5761_nvram_info(struct tg3 *tp)
 
         /* NVRAM protection for TPM */
         if (nvcfg1 & (1 << 27)) {
-                tp->tg3_flags2 |= TG3_FLG2_PROTECTED_NVRAM;
+                tp->tg3_flags3 |= TG3_FLG3_PROTECTED_NVRAM;
                 protect = 1;
         }
 
@@ -11599,7 +11829,7 @@ static int tg3_nvram_write_block(struct tg3 *tp, u32 offset, u32 len, u8 *buf)
 
                 tg3_enable_nvram_access(tp);
                 if ((tp->tg3_flags2 & TG3_FLG2_5750_PLUS) &&
-                    !(tp->tg3_flags2 & TG3_FLG2_PROTECTED_NVRAM))
+                    !(tp->tg3_flags3 & TG3_FLG3_PROTECTED_NVRAM))
                         tw32(NVRAM_WRITE1, 0x406);
 
                 grc_mode = tr32(GRC_MODE);
@@ -12475,10 +12705,9 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
         if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_USE_PROD_ID_REG) {
                 u32 prod_id_asic_rev;
 
-                if (tp->pdev->device == TG3PCI_DEVICE_TIGON3_5717C ||
-                    tp->pdev->device == TG3PCI_DEVICE_TIGON3_5717S ||
-                    tp->pdev->device == TG3PCI_DEVICE_TIGON3_5718C ||
-                    tp->pdev->device == TG3PCI_DEVICE_TIGON3_5718S)
+                if (tp->pdev->device == TG3PCI_DEVICE_TIGON3_5717 ||
+                    tp->pdev->device == TG3PCI_DEVICE_TIGON3_5718 ||
+                    tp->pdev->device == TG3PCI_DEVICE_TIGON3_5724)
                         pci_read_config_dword(tp->pdev,
                                               TG3PCI_GEN2_PRODID_ASICREV,
                                               &prod_id_asic_rev);
@@ -12661,6 +12890,29 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
                         tp->dev->features |= NETIF_F_IPV6_CSUM;
         }
 
+        /* Determine TSO capabilities */
+        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717)
+                tp->tg3_flags2 |= TG3_FLG2_HW_TSO_3;
+        else if ((tp->tg3_flags3 & TG3_FLG3_5755_PLUS) ||
+                 GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5906)
+                tp->tg3_flags2 |= TG3_FLG2_HW_TSO_2;
+        else if (tp->tg3_flags2 & TG3_FLG2_5750_PLUS) {
+                tp->tg3_flags2 |= TG3_FLG2_HW_TSO_1 | TG3_FLG2_TSO_BUG;
+                if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5750 &&
+                    tp->pci_chip_rev_id >= CHIPREV_ID_5750_C2)
+                        tp->tg3_flags2 &= ~TG3_FLG2_TSO_BUG;
+        } else if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5700 &&
+                   GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5701 &&
+                   tp->pci_chip_rev_id != CHIPREV_ID_5705_A0) {
+                tp->tg3_flags2 |= TG3_FLG2_TSO_BUG;
+                if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705)
+                        tp->fw_needed = FIRMWARE_TG3TSO5;
+                else
+                        tp->fw_needed = FIRMWARE_TG3TSO;
+        }
+
+        tp->irq_max = 1;
+
         if (tp->tg3_flags2 & TG3_FLG2_5750_PLUS) {
                 tp->tg3_flags |= TG3_FLAG_SUPPORT_MSI;
                 if (GET_CHIP_REV(tp->pci_chip_rev_id) == CHIPREV_5750_AX ||
@@ -12672,31 +12924,21 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
 
                 if ((tp->tg3_flags3 & TG3_FLG3_5755_PLUS) ||
                     GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5906) {
-                        tp->tg3_flags2 |= TG3_FLG2_HW_TSO_2;
                         tp->tg3_flags2 |= TG3_FLG2_1SHOT_MSI;
-                } else {
-                        tp->tg3_flags2 |= TG3_FLG2_HW_TSO_1 | TG3_FLG2_TSO_BUG;
-                        if (GET_ASIC_REV(tp->pci_chip_rev_id) ==
-                                ASIC_REV_5750 &&
-                            tp->pci_chip_rev_id >= CHIPREV_ID_5750_C2)
-                                tp->tg3_flags2 &= ~TG3_FLG2_TSO_BUG;
                 }
-        }
 
-        tp->irq_max = 1;
-
-        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717) {
-                tp->tg3_flags |= TG3_FLAG_SUPPORT_MSIX;
-                tp->irq_max = TG3_IRQ_MAX_VECS;
+                if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717) {
+                        tp->tg3_flags |= TG3_FLAG_SUPPORT_MSIX;
+                        tp->irq_max = TG3_IRQ_MAX_VECS;
+                }
         }
 
-        if (!(tp->tg3_flags3 & TG3_FLG3_5755_PLUS)) {
-                if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5906)
-                        tp->tg3_flags3 |= TG3_FLG3_SHORT_DMA_BUG;
-                else {
-                        tp->tg3_flags3 |= TG3_FLG3_4G_DMA_BNDRY_BUG;
-                        tp->tg3_flags3 |= TG3_FLG3_40BIT_DMA_LIMIT_BUG;
-                }
+        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 ||
+            GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5906)
+                tp->tg3_flags3 |= TG3_FLG3_SHORT_DMA_BUG;
+        else if (!(tp->tg3_flags3 & TG3_FLG3_5755_PLUS)) {
+                tp->tg3_flags3 |= TG3_FLG3_4G_DMA_BNDRY_BUG;
+                tp->tg3_flags3 |= TG3_FLG3_40BIT_DMA_LIMIT_BUG;
         }
 
         if (!(tp->tg3_flags2 & TG3_FLG2_5705_PLUS) ||
@@ -13297,6 +13539,11 @@ static u32 __devinit tg3_calc_dma_bndry(struct tg3 *tp, u32 val)
 #endif
 #endif
 
+        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717) {
+                val = goal ? 0 : DMA_RWCTRL_DIS_CACHE_ALIGNMENT;
+                goto out;
+        }
+
         if (!goal)
                 goto out;
 
@@ -13491,7 +13738,7 @@ static int __devinit tg3_test_dma(struct tg3 *tp)
 {
         dma_addr_t buf_dma;
         u32 *buf, saved_dma_rwctrl;
-        int ret;
+        int ret = 0;
 
         buf = pci_alloc_consistent(tp->pdev, TEST_BUFFER_SIZE, &buf_dma);
         if (!buf) {
@@ -13504,6 +13751,9 @@ static int __devinit tg3_test_dma(struct tg3 *tp)
 
         tp->dma_rwctrl = tg3_calc_dma_bndry(tp, tp->dma_rwctrl);
 
+        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717)
+                goto out;
+
         if (tp->tg3_flags2 & TG3_FLG2_PCI_EXPRESS) {
                 /* DMA read watermark not used on PCIE */
                 tp->dma_rwctrl |= 0x00180000;
@@ -13576,7 +13826,6 @@ static int __devinit tg3_test_dma(struct tg3 *tp)
         tg3_switch_clocks(tp);
 #endif
 
-        ret = 0;
         if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5700 &&
             GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5701)
                 goto out;
@@ -13755,6 +14004,7 @@ static char * __devinit tg3_phy_string(struct tg3 *tp)
         case PHY_ID_BCM5756:    return "5722/5756";
         case PHY_ID_BCM5906:    return "5906";
         case PHY_ID_BCM5761:    return "5761";
+        case PHY_ID_BCM5717:    return "5717";
         case PHY_ID_BCM8002:    return "8002/serdes";
         case 0:                 return "serdes";
         default:                return "unknown";
@@ -13996,51 +14246,6 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
         tp->rx_pending = TG3_DEF_RX_RING_PENDING;
         tp->rx_jumbo_pending = TG3_DEF_RX_JUMBO_RING_PENDING;
 
-        intmbx = MAILBOX_INTERRUPT_0 + TG3_64BIT_REG_LOW;
-        rcvmbx = MAILBOX_RCVRET_CON_IDX_0 + TG3_64BIT_REG_LOW;
-        sndmbx = MAILBOX_SNDHOST_PROD_IDX_0 + TG3_64BIT_REG_LOW;
-        for (i = 0; i < TG3_IRQ_MAX_VECS; i++) {
-                struct tg3_napi *tnapi = &tp->napi[i];
-
-                tnapi->tp = tp;
-                tnapi->tx_pending = TG3_DEF_TX_RING_PENDING;
-
-                tnapi->int_mbox = intmbx;
-                if (i < 4)
-                        intmbx += 0x8;
-                else
-                        intmbx += 0x4;
-
-                tnapi->consmbox = rcvmbx;
-                tnapi->prodmbox = sndmbx;
-
-                if (i)
-                        tnapi->coal_now = HOSTCC_MODE_COAL_VEC1_NOW << (i - 1);
-                else
-                        tnapi->coal_now = HOSTCC_MODE_NOW;
-
-                if (!(tp->tg3_flags & TG3_FLAG_SUPPORT_MSIX))
-                        break;
-
-                /*
-                 * If we support MSIX, we'll be using RSS.  If we're using
-                 * RSS, the first vector only handles link interrupts and the
-                 * remaining vectors handle rx and tx interrupts.  Reuse the
-                 * mailbox values for the next iteration.  The values we setup
-                 * above are still useful for the single vectored mode.
-                 */
-                if (!i)
-                        continue;
-
-                rcvmbx += 0x8;
-
-                if (sndmbx & 0x4)
-                        sndmbx -= 0x4;
-                else
-                        sndmbx += 0xc;
-        }
-
-        netif_napi_add(dev, &tp->napi[0].napi, tg3_poll, 64);
         dev->ethtool_ops = &tg3_ethtool_ops;
         dev->watchdog_timeo = TG3_TX_TIMEOUT;
         dev->irq = pdev->irq;
@@ -14052,7 +14257,8 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
                 goto err_out_iounmap;
         }
 
-        if (tp->tg3_flags3 & TG3_FLG3_5755_PLUS)
+        if ((tp->tg3_flags3 & TG3_FLG3_5755_PLUS) &&
+            tp->pci_chip_rev_id != CHIPREV_ID_5717_A0)
                 dev->netdev_ops = &tg3_netdev_ops;
         else
                 dev->netdev_ops = &tg3_netdev_ops_dma_bug;
@@ -14099,46 +14305,39 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
 
         tg3_init_bufmgr_config(tp);
 
-        if (tp->pci_chip_rev_id == CHIPREV_ID_5701_A0)
-                tp->fw_needed = FIRMWARE_TG3;
-
-        if (tp->tg3_flags2 & TG3_FLG2_HW_TSO) {
+        /* Selectively allow TSO based on operating conditions */
+        if ((tp->tg3_flags2 & TG3_FLG2_HW_TSO) ||
+            (tp->fw_needed && !(tp->tg3_flags & TG3_FLAG_ENABLE_ASF)))
                 tp->tg3_flags2 |= TG3_FLG2_TSO_CAPABLE;
+        else {
+                tp->tg3_flags2 &= ~(TG3_FLG2_TSO_CAPABLE | TG3_FLG2_TSO_BUG);
+                tp->fw_needed = NULL;
         }
-        else if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5700 ||
-            GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5701 ||
-            tp->pci_chip_rev_id == CHIPREV_ID_5705_A0 ||
-            GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5906 ||
-            (tp->tg3_flags & TG3_FLAG_ENABLE_ASF) != 0) {
-                tp->tg3_flags2 &= ~TG3_FLG2_TSO_CAPABLE;
-        } else {
-                tp->tg3_flags2 |= TG3_FLG2_TSO_CAPABLE | TG3_FLG2_TSO_BUG;
-                if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705)
-                        tp->fw_needed = FIRMWARE_TG3TSO5;
-                else
-                        tp->fw_needed = FIRMWARE_TG3TSO;
-        }
+
+        if (tp->pci_chip_rev_id == CHIPREV_ID_5701_A0)
+                tp->fw_needed = FIRMWARE_TG3;
 
         /* TSO is on by default on chips that support hardware TSO.
          * Firmware TSO on older chips gives lower performance, so it
          * is off by default, but can be enabled using ethtool.
          */
-        if (tp->tg3_flags2 & TG3_FLG2_HW_TSO) {
-                if (dev->features & NETIF_F_IP_CSUM)
-                        dev->features |= NETIF_F_TSO;
-                if ((dev->features & NETIF_F_IPV6_CSUM) &&
-                    (tp->tg3_flags2 & TG3_FLG2_HW_TSO_2))
+        if ((tp->tg3_flags2 & TG3_FLG2_HW_TSO) &&
+            (dev->features & NETIF_F_IP_CSUM))
+                dev->features |= NETIF_F_TSO;
+
+        if ((tp->tg3_flags2 & TG3_FLG2_HW_TSO_2) ||
+            (tp->tg3_flags2 & TG3_FLG2_HW_TSO_3)) {
+                if (dev->features & NETIF_F_IPV6_CSUM)
                         dev->features |= NETIF_F_TSO6;
-                if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5761 ||
+                if ((tp->tg3_flags2 & TG3_FLG2_HW_TSO_3) ||
+                    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5761 ||
                     (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5784 &&
                      GET_CHIP_REV(tp->pci_chip_rev_id) != CHIPREV_5784_AX) ||
                         GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5785 ||
-                    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57780 ||
-                    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717)
+                    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57780)
                         dev->features |= NETIF_F_TSO_ECN;
         }
 
-
         if (tp->pci_chip_rev_id == CHIPREV_ID_5705_A1 &&
             !(tp->tg3_flags2 & TG3_FLG2_TSO_CAPABLE) &&
             !(tr32(TG3PCI_PCISTATE) & PCISTATE_BUS_SPEED_HIGH)) {
@@ -14189,6 +14388,53 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
         tp->tg3_flags |= TG3_FLAG_PAUSE_AUTONEG;
         tp->link_config.flowctrl = FLOW_CTRL_TX | FLOW_CTRL_RX;
 
+        intmbx = MAILBOX_INTERRUPT_0 + TG3_64BIT_REG_LOW;
+        rcvmbx = MAILBOX_RCVRET_CON_IDX_0 + TG3_64BIT_REG_LOW;
+        sndmbx = MAILBOX_SNDHOST_PROD_IDX_0 + TG3_64BIT_REG_LOW;
+        for (i = 0; i < TG3_IRQ_MAX_VECS; i++) {
+                struct tg3_napi *tnapi = &tp->napi[i];
+
+                tnapi->tp = tp;
+                tnapi->tx_pending = TG3_DEF_TX_RING_PENDING;
+
+                tnapi->int_mbox = intmbx;
+                if (i < 4)
+                        intmbx += 0x8;
+                else
+                        intmbx += 0x4;
+
+                tnapi->consmbox = rcvmbx;
+                tnapi->prodmbox = sndmbx;
+
+                if (i) {
+                        tnapi->coal_now = HOSTCC_MODE_COAL_VEC1_NOW << (i - 1);
+                        netif_napi_add(dev, &tnapi->napi, tg3_poll_msix, 64);
+                } else {
+                        tnapi->coal_now = HOSTCC_MODE_NOW;
+                        netif_napi_add(dev, &tnapi->napi, tg3_poll, 64);
+                }
+
+                if (!(tp->tg3_flags & TG3_FLAG_SUPPORT_MSIX))
+                        break;
+
+                /*
+                 * If we support MSIX, we'll be using RSS.  If we're using
+                 * RSS, the first vector only handles link interrupts and the
+                 * remaining vectors handle rx and tx interrupts.  Reuse the
+                 * mailbox values for the next iteration.  The values we setup
+                 * above are still useful for the single vectored mode.
+                 */
+                if (!i)
+                        continue;
+
+                rcvmbx += 0x8;
+
+                if (sndmbx & 0x4)
+                        sndmbx -= 0x4;
+                else
+                        sndmbx += 0xc;
+        }
+
         tg3_init_coal(tp);
 
         pci_set_drvdata(pdev, dev);
diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h
index d770da124b8..453a34fb72b 100644
--- a/drivers/net/tg3.h
+++ b/drivers/net/tg3.h
@@ -46,10 +46,9 @@
 #define  TG3PCI_DEVICE_TIGON3_57788      0x1691
 #define  TG3PCI_DEVICE_TIGON3_5785_G     0x1699 /* GPHY */
 #define  TG3PCI_DEVICE_TIGON3_5785_F     0x16a0 /* 10/100 only */
-#define  TG3PCI_DEVICE_TIGON3_5717C      0x1655
-#define  TG3PCI_DEVICE_TIGON3_5717S      0x1656
-#define  TG3PCI_DEVICE_TIGON3_5718C      0x1665
-#define  TG3PCI_DEVICE_TIGON3_5718S      0x1666
+#define  TG3PCI_DEVICE_TIGON3_5717       0x1655
+#define  TG3PCI_DEVICE_TIGON3_5718       0x1656
+#define  TG3PCI_DEVICE_TIGON3_5724       0x165c
 /* 0x04 --> 0x64 unused */
 #define TG3PCI_MSI_DATA                 0x00000064
 /* 0x66 --> 0x68 unused */
@@ -103,6 +102,7 @@
 #define  CHIPREV_ID_5906_A1              0xc001
 #define  CHIPREV_ID_57780_A0             0x57780000
 #define  CHIPREV_ID_57780_A1             0x57780001
+#define  CHIPREV_ID_5717_A0              0x05717000
 #define  GET_ASIC_REV(CHIP_REV_ID)      ((CHIP_REV_ID) >> 12)
 #define   ASIC_REV_5700                  0x07
 #define   ASIC_REV_5701                  0x00
@@ -141,8 +141,7 @@
 #define   METAL_REV_B1                   0x01
 #define   METAL_REV_B2                   0x02
 #define TG3PCI_DMA_RW_CTRL              0x0000006c
-#define  DMA_RWCTRL_MIN_DMA              0x000000ff
-#define  DMA_RWCTRL_MIN_DMA_SHIFT        0
+#define  DMA_RWCTRL_DIS_CACHE_ALIGNMENT  0x00000001
 #define  DMA_RWCTRL_READ_BNDRY_MASK      0x00000700
 #define  DMA_RWCTRL_READ_BNDRY_DISAB     0x00000000
 #define  DMA_RWCTRL_READ_BNDRY_16        0x00000100
@@ -242,7 +241,11 @@
 #define MAILBOX_GENERAL_7               0x00000258 /* 64-bit */
 #define MAILBOX_RELOAD_STAT             0x00000260 /* 64-bit */
 #define MAILBOX_RCV_STD_PROD_IDX        0x00000268 /* 64-bit */
+#define TG3_RX_STD_PROD_IDX_REG         (MAILBOX_RCV_STD_PROD_IDX + \
+                                         TG3_64BIT_REG_LOW)
 #define MAILBOX_RCV_JUMBO_PROD_IDX      0x00000270 /* 64-bit */
+#define TG3_RX_JMB_PROD_IDX_REG         (MAILBOX_RCV_JUMBO_PROD_IDX + \
+                                         TG3_64BIT_REG_LOW)
 #define MAILBOX_RCV_MINI_PROD_IDX       0x00000278 /* 64-bit */
 #define MAILBOX_RCVRET_CON_IDX_0        0x00000280 /* 64-bit */
 #define MAILBOX_RCVRET_CON_IDX_1        0x00000288 /* 64-bit */
@@ -2570,8 +2573,10 @@ struct tg3_ethtool_stats {
 };
 
 struct tg3_rx_prodring_set {
-        u32                             rx_std_ptr;
-        u32                             rx_jmb_ptr;
+        u32                             rx_std_prod_idx;
+        u32                             rx_std_cons_idx;
+        u32                             rx_jmb_prod_idx;
+        u32                             rx_jmb_cons_idx;
         struct tg3_rx_buffer_desc       *rx_std;
         struct tg3_ext_rx_buffer_desc   *rx_jmb;
         struct ring_info                *rx_std_buffers;
@@ -2599,6 +2604,7 @@ struct tg3_napi {
         u32                             consmbox;
         u32                             rx_rcb_ptr;
         u16                             *rx_rcb_prod_idx;
+        struct tg3_rx_prodring_set      *prodring;
 
         struct tg3_rx_buffer_desc       *rx_rcb;
         struct tg3_tx_buffer_desc       *tx_ring;
@@ -2682,7 +2688,7 @@ struct tg3 {
         struct vlan_group               *vlgrp;
 #endif
 
-        struct tg3_rx_prodring_set      prodring[1];
+        struct tg3_rx_prodring_set      prodring[TG3_IRQ_MAX_VECS - 1];
 
 
         /* begin "everything else" cacheline(s) section */
@@ -2753,7 +2759,7 @@ struct tg3 {
 #define TG3_FLG2_SERDES_PREEMPHASIS     0x00020000
 #define TG3_FLG2_5705_PLUS              0x00040000
 #define TG3_FLG2_5750_PLUS              0x00080000
-#define TG3_FLG2_PROTECTED_NVRAM        0x00100000
+#define TG3_FLG2_HW_TSO_3               0x00100000
 #define TG3_FLG2_USING_MSI              0x00200000
 #define TG3_FLG2_USING_MSIX             0x00400000
 #define TG3_FLG2_USING_MSI_OR_MSIX      (TG3_FLG2_USING_MSI | \
@@ -2765,7 +2771,9 @@ struct tg3 {
 #define TG3_FLG2_ICH_WORKAROUND         0x02000000
 #define TG3_FLG2_5780_CLASS             0x04000000
 #define TG3_FLG2_HW_TSO_2               0x08000000
-#define TG3_FLG2_HW_TSO                 (TG3_FLG2_HW_TSO_1 | TG3_FLG2_HW_TSO_2)
+#define TG3_FLG2_HW_TSO                 (TG3_FLG2_HW_TSO_1 | \
+                                         TG3_FLG2_HW_TSO_2 | \
+                                         TG3_FLG2_HW_TSO_3)
 #define TG3_FLG2_1SHOT_MSI              0x10000000
 #define TG3_FLG2_PHY_JITTER_BUG         0x20000000
 #define TG3_FLG2_NO_FWARE_REPORTED      0x40000000
@@ -2773,6 +2781,7 @@ struct tg3 {
         u32                             tg3_flags3;
 #define TG3_FLG3_NO_NVRAM_ADDR_TRANS    0x00000001
 #define TG3_FLG3_ENABLE_APE             0x00000002
+#define TG3_FLG3_PROTECTED_NVRAM        0x00000004
 #define TG3_FLG3_5701_DMA_BUG           0x00000008
 #define TG3_FLG3_USE_PHYLIB             0x00000010
 #define TG3_FLG3_MDIOBUS_INITED         0x00000020
@@ -2855,6 +2864,7 @@ struct tg3 {
 #define PHY_ID_BCM5756                  0xbc050ed0
 #define PHY_ID_BCM5784                  0xbc050fa0
 #define PHY_ID_BCM5761                  0xbc050fd0
+#define PHY_ID_BCM5717                  0x5c0d8a00
 #define PHY_ID_BCM5906                  0xdc00ac40
 #define PHY_ID_BCM8002                  0x60010140
 #define PHY_ID_INVALID                  0xffffffff
@@ -2896,7 +2906,7 @@ struct tg3 {
          (X) == PHY_ID_BCM5780 || (X) == PHY_ID_BCM5787 || \
          (X) == PHY_ID_BCM5755 || (X) == PHY_ID_BCM5756 || \
          (X) == PHY_ID_BCM5906 || (X) == PHY_ID_BCM5761 || \
-         (X) == PHY_ID_BCM8002)
+         (X) == PHY_ID_BCM5717 || (X) == PHY_ID_BCM8002)
 
         struct tg3_hw_stats             *hw_stats;
         dma_addr_t                      stats_mapping;
diff --git a/drivers/net/tokenring/3c359.c b/drivers/net/tokenring/3c359.c
index 724158966ec..cf552d1d962 100644
--- a/drivers/net/tokenring/3c359.c
+++ b/drivers/net/tokenring/3c359.c
@@ -610,9 +610,8 @@ static int xl_open(struct net_device *dev)
 
         u16 switchsettings, switchsettings_eeprom  ;
  
-        if(request_irq(dev->irq, &xl_interrupt, IRQF_SHARED , "3c359", dev)) {
+        if (request_irq(dev->irq, xl_interrupt, IRQF_SHARED , "3c359", dev))
                 return -EAGAIN;
-        }
 
         /* 
          * Read the information from the EEPROM that we need.
diff --git a/drivers/net/tokenring/olympic.c b/drivers/net/tokenring/olympic.c
index d9ec7f0bbd0..df32025c513 100644
--- a/drivers/net/tokenring/olympic.c
+++ b/drivers/net/tokenring/olympic.c
@@ -445,9 +445,9 @@ static int olympic_open(struct net_device *dev)
 
         olympic_init(dev);
 
-        if(request_irq(dev->irq, &olympic_interrupt, IRQF_SHARED , "olympic", dev)) {
+        if (request_irq(dev->irq, olympic_interrupt, IRQF_SHARED , "olympic",
+                        dev))
                 return -EAGAIN;
-        }
 
 #if OLYMPIC_DEBUG
         printk("BMCTL: %x\n",readl(olympic_mmio+BMCTL_SUM));
diff --git a/drivers/net/typhoon.c b/drivers/net/typhoon.c
index d6d345229fe..4b754102442 100644
--- a/drivers/net/typhoon.c
+++ b/drivers/net/typhoon.c
@@ -2150,7 +2150,7 @@ typhoon_open(struct net_device *dev)
                 goto out_sleep;
         }
 
-        err = request_irq(dev->irq, &typhoon_interrupt, IRQF_SHARED,
+        err = request_irq(dev->irq, typhoon_interrupt, IRQF_SHARED,
                                 dev->name, dev);
         if(err < 0)
                 goto out_sleep;
diff --git a/drivers/net/via-rhine.c b/drivers/net/via-rhine.c
index 4535e89dfff..ec94ddf01f5 100644
--- a/drivers/net/via-rhine.c
+++ b/drivers/net/via-rhine.c
@@ -1150,7 +1150,7 @@ static int rhine_open(struct net_device *dev)
         void __iomem *ioaddr = rp->base;
         int rc;
 
-        rc = request_irq(rp->pdev->irq, &rhine_interrupt, IRQF_SHARED, dev->name,
+        rc = request_irq(rp->pdev->irq, rhine_interrupt, IRQF_SHARED, dev->name,
                         dev);
         if (rc)
                 return rc;
diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c
index 158f411bd55..1e6b395c555 100644
--- a/drivers/net/via-velocity.c
+++ b/drivers/net/via-velocity.c
@@ -2176,7 +2176,7 @@ static int velocity_open(struct net_device *dev)
 
         velocity_init_registers(vptr, VELOCITY_INIT_COLD);
 
-        ret = request_irq(vptr->pdev->irq, &velocity_intr, IRQF_SHARED,
+        ret = request_irq(vptr->pdev->irq, velocity_intr, IRQF_SHARED,
                           dev->name, dev);
         if (ret < 0) {
                 /* Power down the chip */
diff --git a/drivers/net/vmxnet3/vmxnet3_defs.h b/drivers/net/vmxnet3/vmxnet3_defs.h
index dc8ee4438a4..b4889e6c4a5 100644
--- a/drivers/net/vmxnet3/vmxnet3_defs.h
+++ b/drivers/net/vmxnet3/vmxnet3_defs.h
@@ -90,23 +90,60 @@ enum {
         VMXNET3_CMD_GET_CONF_INTR
 };
 
-struct Vmxnet3_TxDesc {
-        u64             addr;
+/*
+ *      Little Endian layout of bitfields -
+ *      Byte 0 :        7.....len.....0
+ *      Byte 1 :        rsvd gen 13.len.8
+ *      Byte 2 :        5.msscof.0 ext1  dtype
+ *      Byte 3 :        13...msscof...6
+ *
+ *      Big Endian layout of bitfields -
+ *      Byte 0:         13...msscof...6
+ *      Byte 1 :        5.msscof.0 ext1  dtype
+ *      Byte 2 :        rsvd gen 13.len.8
+ *      Byte 3 :        7.....len.....0
+ *
+ *      Thus, le32_to_cpu on the dword will allow the big endian driver to read
+ *      the bit fields correctly. And cpu_to_le32 will convert bitfields
+ *      bit fields written by big endian driver to format required by device.
+ */
 
-        u32             len:14;
-        u32             gen:1;      /* generation bit */
-        u32             rsvd:1;
-        u32             dtype:1;    /* descriptor type */
-        u32             ext1:1;
-        u32             msscof:14;  /* MSS, checksum offset, flags */
-
-        u32             hlen:10;    /* header len */
-        u32             om:2;       /* offload mode */
-        u32             eop:1;      /* End Of Packet */
-        u32             cq:1;       /* completion request */
-        u32             ext2:1;
-        u32             ti:1;       /* VLAN Tag Insertion */
-        u32             tci:16;     /* Tag to Insert */
+struct Vmxnet3_TxDesc {
+        __le64 addr;
+
+#ifdef __BIG_ENDIAN_BITFIELD
+        u32 msscof:14;  /* MSS, checksum offset, flags */
+        u32 ext1:1;
+        u32 dtype:1;    /* descriptor type */
+        u32 rsvd:1;
+        u32 gen:1;      /* generation bit */
+        u32 len:14;
+#else
+        u32 len:14;
+        u32 gen:1;      /* generation bit */
+        u32 rsvd:1;
+        u32 dtype:1;    /* descriptor type */
+        u32 ext1:1;
+        u32 msscof:14;  /* MSS, checksum offset, flags */
+#endif  /* __BIG_ENDIAN_BITFIELD */
+
+#ifdef __BIG_ENDIAN_BITFIELD
+        u32 tci:16;     /* Tag to Insert */
+        u32 ti:1;       /* VLAN Tag Insertion */
+        u32 ext2:1;
+        u32 cq:1;       /* completion request */
+        u32 eop:1;      /* End Of Packet */
+        u32 om:2;       /* offload mode */
+        u32 hlen:10;    /* header len */
+#else
+        u32 hlen:10;    /* header len */
+        u32 om:2;       /* offload mode */
+        u32 eop:1;      /* End Of Packet */
+        u32 cq:1;       /* completion request */
+        u32 ext2:1;
+        u32 ti:1;       /* VLAN Tag Insertion */
+        u32 tci:16;     /* Tag to Insert */
+#endif  /* __BIG_ENDIAN_BITFIELD */
 };
 
 /* TxDesc.OM values */
@@ -118,6 +155,8 @@ struct Vmxnet3_TxDesc {
 #define VMXNET3_TXD_EOP_SHIFT   12
 #define VMXNET3_TXD_CQ_SHIFT    13
 #define VMXNET3_TXD_GEN_SHIFT   14
+#define VMXNET3_TXD_EOP_DWORD_SHIFT 3
+#define VMXNET3_TXD_GEN_DWORD_SHIFT 2
 
 #define VMXNET3_TXD_CQ          (1 << VMXNET3_TXD_CQ_SHIFT)
 #define VMXNET3_TXD_EOP         (1 << VMXNET3_TXD_EOP_SHIFT)
@@ -130,29 +169,40 @@ struct Vmxnet3_TxDataDesc {
         u8              data[VMXNET3_HDR_COPY_SIZE];
 };
 
+#define VMXNET3_TCD_GEN_SHIFT   31
+#define VMXNET3_TCD_GEN_SIZE    1
+#define VMXNET3_TCD_TXIDX_SHIFT 0
+#define VMXNET3_TCD_TXIDX_SIZE  12
+#define VMXNET3_TCD_GEN_DWORD_SHIFT     3
 
 struct Vmxnet3_TxCompDesc {
         u32             txdIdx:12;    /* Index of the EOP TxDesc */
         u32             ext1:20;
 
-        u32             ext2;
-        u32             ext3;
+        __le32          ext2;
+        __le32          ext3;
 
         u32             rsvd:24;
         u32             type:7;       /* completion type */
         u32             gen:1;        /* generation bit */
 };
 
-
 struct Vmxnet3_RxDesc {
-        u64             addr;
+        __le64          addr;
 
+#ifdef __BIG_ENDIAN_BITFIELD
+        u32             gen:1;        /* Generation bit */
+        u32             rsvd:15;
+        u32             dtype:1;      /* Descriptor type */
+        u32             btype:1;      /* Buffer Type */
+        u32             len:14;
+#else
         u32             len:14;
         u32             btype:1;      /* Buffer Type */
         u32             dtype:1;      /* Descriptor type */
         u32             rsvd:15;
         u32             gen:1;        /* Generation bit */
-
+#endif
         u32             ext1;
 };
 
@@ -164,8 +214,17 @@ struct Vmxnet3_RxDesc {
 #define VMXNET3_RXD_BTYPE_SHIFT  14
 #define VMXNET3_RXD_GEN_SHIFT    31
 
-
 struct Vmxnet3_RxCompDesc {
+#ifdef __BIG_ENDIAN_BITFIELD
+        u32             ext2:1;
+        u32             cnc:1;        /* Checksum Not Calculated */
+        u32             rssType:4;    /* RSS hash type used */
+        u32             rqID:10;      /* rx queue/ring ID */
+        u32             sop:1;        /* Start of Packet */
+        u32             eop:1;        /* End of Packet */
+        u32             ext1:2;
+        u32             rxdIdx:12;    /* Index of the RxDesc */
+#else
         u32             rxdIdx:12;    /* Index of the RxDesc */
         u32             ext1:2;
         u32             eop:1;        /* End of Packet */
@@ -174,14 +233,36 @@ struct Vmxnet3_RxCompDesc {
         u32             rssType:4;    /* RSS hash type used */
         u32             cnc:1;        /* Checksum Not Calculated */
         u32             ext2:1;
+#endif  /* __BIG_ENDIAN_BITFIELD */
 
-        u32             rssHash;      /* RSS hash value */
+        __le32          rssHash;      /* RSS hash value */
 
+#ifdef __BIG_ENDIAN_BITFIELD
+        u32             tci:16;       /* Tag stripped */
+        u32             ts:1;         /* Tag is stripped */
+        u32             err:1;        /* Error */
+        u32             len:14;       /* data length */
+#else
         u32             len:14;       /* data length */
         u32             err:1;        /* Error */
         u32             ts:1;         /* Tag is stripped */
         u32             tci:16;       /* Tag stripped */
+#endif  /* __BIG_ENDIAN_BITFIELD */
+
 
+#ifdef __BIG_ENDIAN_BITFIELD
+        u32             gen:1;        /* generation bit */
+        u32             type:7;       /* completion type */
+        u32             fcs:1;        /* Frame CRC correct */
+        u32             frg:1;        /* IP Fragment */
+        u32             v4:1;         /* IPv4 */
+        u32             v6:1;         /* IPv6 */
+        u32             ipc:1;        /* IP Checksum Correct */
+        u32             tcp:1;        /* TCP packet */
+        u32             udp:1;        /* UDP packet */
+        u32             tuc:1;        /* TCP/UDP Checksum Correct */
+        u32             csum:16;
+#else
         u32             csum:16;
         u32             tuc:1;        /* TCP/UDP Checksum Correct */
         u32             udp:1;        /* UDP packet */
@@ -193,6 +274,7 @@ struct Vmxnet3_RxCompDesc {
         u32             fcs:1;        /* Frame CRC correct */
         u32             type:7;       /* completion type */
         u32             gen:1;        /* generation bit */
+#endif  /* __BIG_ENDIAN_BITFIELD */
 };
 
 /* fields in RxCompDesc we access via Vmxnet3_GenericDesc.dword[3] */
@@ -206,6 +288,8 @@ struct Vmxnet3_RxCompDesc {
 /* csum OK for TCP/UDP pkts over IP */
 #define VMXNET3_RCD_CSUM_OK (1 << VMXNET3_RCD_TUC_SHIFT | \
                              1 << VMXNET3_RCD_IPC_SHIFT)
+#define VMXNET3_TXD_GEN_SIZE 1
+#define VMXNET3_TXD_EOP_SIZE 1
 
 /* value of RxCompDesc.rssType */
 enum {
@@ -219,9 +303,9 @@ enum {
 
 /* a union for accessing all cmd/completion descriptors */
 union Vmxnet3_GenericDesc {
-        u64                             qword[2];
-        u32                             dword[4];
-        u16                             word[8];
+        __le64                          qword[2];
+        __le32                          dword[4];
+        __le16                          word[8];
         struct Vmxnet3_TxDesc           txd;
         struct Vmxnet3_RxDesc           rxd;
         struct Vmxnet3_TxCompDesc       tcd;
@@ -287,18 +371,24 @@ enum {
 
 
 struct Vmxnet3_GOSInfo {
-        u32                             gosBits:2;      /* 32-bit or 64-bit? */
-        u32                             gosType:4;   /* which guest */
-        u32                             gosVer:16;   /* gos version */
-        u32                             gosMisc:10;  /* other info about gos */
+#ifdef __BIG_ENDIAN_BITFIELD
+        u32             gosMisc:10;    /* other info about gos */
+        u32             gosVer:16;     /* gos version */
+        u32             gosType:4;     /* which guest */
+        u32             gosBits:2;    /* 32-bit or 64-bit? */
+#else
+        u32             gosBits:2;     /* 32-bit or 64-bit? */
+        u32             gosType:4;     /* which guest */
+        u32             gosVer:16;     /* gos version */
+        u32             gosMisc:10;    /* other info about gos */
+#endif  /* __BIG_ENDIAN_BITFIELD */
 };
 
-
 struct Vmxnet3_DriverInfo {
-        u32                             version;
+        __le32                          version;
         struct Vmxnet3_GOSInfo          gos;
-        u32                             vmxnet3RevSpt;
-        u32                             uptVerSpt;
+        __le32                          vmxnet3RevSpt;
+        __le32                          uptVerSpt;
 };
 
 
@@ -315,42 +405,42 @@ struct Vmxnet3_DriverInfo {
 
 struct Vmxnet3_MiscConf {
         struct Vmxnet3_DriverInfo driverInfo;
-        u64             uptFeatures;
-        u64             ddPA;         /* driver data PA */
-        u64             queueDescPA;  /* queue descriptor table PA */
-        u32             ddLen;        /* driver data len */
-        u32             queueDescLen; /* queue desc. table len in bytes */
-        u32             mtu;
-        u16             maxNumRxSG;
+        __le64          uptFeatures;
+        __le64          ddPA;         /* driver data PA */
+        __le64          queueDescPA;  /* queue descriptor table PA */
+        __le32          ddLen;        /* driver data len */
+        __le32          queueDescLen; /* queue desc. table len in bytes */
+        __le32          mtu;
+        __le16          maxNumRxSG;
         u8              numTxQueues;
         u8              numRxQueues;
-        u32             reserved[4];
+        __le32          reserved[4];
 };
 
 
 struct Vmxnet3_TxQueueConf {
-        u64             txRingBasePA;
-        u64             dataRingBasePA;
-        u64             compRingBasePA;
-        u64             ddPA;         /* driver data */
-        u64             reserved;
-        u32             txRingSize;   /* # of tx desc */
-        u32             dataRingSize; /* # of data desc */
-        u32             compRingSize; /* # of comp desc */
-        u32             ddLen;        /* size of driver data */
+        __le64          txRingBasePA;
+        __le64          dataRingBasePA;
+        __le64          compRingBasePA;
+        __le64          ddPA;         /* driver data */
+        __le64          reserved;
+        __le32          txRingSize;   /* # of tx desc */
+        __le32          dataRingSize; /* # of data desc */
+        __le32          compRingSize; /* # of comp desc */
+        __le32          ddLen;        /* size of driver data */
         u8              intrIdx;
         u8              _pad[7];
 };
 
 
 struct Vmxnet3_RxQueueConf {
-        u64             rxRingBasePA[2];
-        u64             compRingBasePA;
-        u64             ddPA;            /* driver data */
-        u64             reserved;
-        u32             rxRingSize[2];   /* # of rx desc */
-        u32             compRingSize;    /* # of rx comp desc */
-        u32             ddLen;           /* size of driver data */
+        __le64          rxRingBasePA[2];
+        __le64          compRingBasePA;
+        __le64          ddPA;            /* driver data */
+        __le64          reserved;
+        __le32          rxRingSize[2];   /* # of rx desc */
+        __le32          compRingSize;    /* # of rx comp desc */
+        __le32          ddLen;           /* size of driver data */
         u8              intrIdx;
         u8              _pad[7];
 };
@@ -381,7 +471,7 @@ struct Vmxnet3_IntrConf {
         u8              eventIntrIdx;
         u8              modLevels[VMXNET3_MAX_INTRS];   /* moderation level for
                                                          * each intr */
-        u32             reserved[3];
+        __le32          reserved[3];
 };
 
 /* one bit per VLAN ID, the size is in the units of u32 */
@@ -391,21 +481,21 @@ struct Vmxnet3_IntrConf {
 struct Vmxnet3_QueueStatus {
         bool            stopped;
         u8              _pad[3];
-        u32             error;
+        __le32          error;
 };
 
 
 struct Vmxnet3_TxQueueCtrl {
-        u32             txNumDeferred;
-        u32             txThreshold;
-        u64             reserved;
+        __le32          txNumDeferred;
+        __le32          txThreshold;
+        __le64          reserved;
 };
 
 
 struct Vmxnet3_RxQueueCtrl {
         bool            updateRxProd;
         u8              _pad[7];
-        u64             reserved;
+        __le64          reserved;
 };
 
 enum {
@@ -417,11 +507,11 @@ enum {
 };
 
 struct Vmxnet3_RxFilterConf {
-        u32             rxMode;       /* VMXNET3_RXM_xxx */
-        u16             mfTableLen;   /* size of the multicast filter table */
-        u16             _pad1;
-        u64             mfTablePA;    /* PA of the multicast filters table */
-        u32             vfTable[VMXNET3_VFT_SIZE]; /* vlan filter */
+        __le32          rxMode;       /* VMXNET3_RXM_xxx */
+        __le16          mfTableLen;   /* size of the multicast filter table */
+        __le16          _pad1;
+        __le64          mfTablePA;    /* PA of the multicast filters table */
+        __le32          vfTable[VMXNET3_VFT_SIZE]; /* vlan filter */
 };
 
 
@@ -444,7 +534,7 @@ struct Vmxnet3_PM_PktFilter {
 
 
 struct Vmxnet3_PMConf {
-        u16             wakeUpEvents;  /* VMXNET3_PM_WAKEUP_xxx */
+        __le16          wakeUpEvents;  /* VMXNET3_PM_WAKEUP_xxx */
         u8              numFilters;
         u8              pad[5];
         struct Vmxnet3_PM_PktFilter filters[VMXNET3_PM_MAX_FILTERS];
@@ -452,9 +542,9 @@ struct Vmxnet3_PMConf {
 
 
 struct Vmxnet3_VariableLenConfDesc {
-        u32             confVer;
-        u32             confLen;
-        u64             confPA;
+        __le32          confVer;
+        __le32          confLen;
+        __le64          confPA;
 };
 
 
@@ -491,12 +581,12 @@ struct Vmxnet3_DSDevRead {
 
 /* All structures in DriverShared are padded to multiples of 8 bytes */
 struct Vmxnet3_DriverShared {
-        u32                             magic;
+        __le32                          magic;
         /* make devRead start at 64bit boundaries */
-        u32                                     pad;
-        struct Vmxnet3_DSDevRead                devRead;
-        u32                                     ecr;
-        u32                                     reserved[5];
+        __le32                          pad;
+        struct Vmxnet3_DSDevRead        devRead;
+        __le32                          ecr;
+        __le32                          reserved[5];
 };
 
 
diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c
index 004353a46af..a4c97e786ee 100644
--- a/drivers/net/vmxnet3/vmxnet3_drv.c
+++ b/drivers/net/vmxnet3/vmxnet3_drv.c
@@ -24,12 +24,13 @@
  *
  */
 
+#include <net/ip6_checksum.h>
+
 #include "vmxnet3_int.h"
 
 char vmxnet3_driver_name[] = "vmxnet3";
 #define VMXNET3_DRIVER_DESC "VMware vmxnet3 virtual NIC driver"
 
-
 /*
  * PCI Device ID Table
  * Last entry must be all 0s
@@ -151,11 +152,10 @@ vmxnet3_check_link(struct vmxnet3_adapter *adapter)
         }
 }
 
-
 static void
 vmxnet3_process_events(struct vmxnet3_adapter *adapter)
 {
-        u32 events = adapter->shared->ecr;
+        u32 events = le32_to_cpu(adapter->shared->ecr);
         if (!events)
                 return;
 
@@ -173,7 +173,7 @@ vmxnet3_process_events(struct vmxnet3_adapter *adapter)
                 if (adapter->tqd_start->status.stopped) {
                         printk(KERN_ERR "%s: tq error 0x%x\n",
                                adapter->netdev->name,
-                               adapter->tqd_start->status.error);
+                               le32_to_cpu(adapter->tqd_start->status.error));
                 }
                 if (adapter->rqd_start->status.stopped) {
                         printk(KERN_ERR "%s: rq error 0x%x\n",
@@ -185,6 +185,106 @@ vmxnet3_process_events(struct vmxnet3_adapter *adapter)
         }
 }
 
+#ifdef __BIG_ENDIAN_BITFIELD
+/*
+ * The device expects the bitfields in shared structures to be written in
+ * little endian. When CPU is big endian, the following routines are used to
+ * correctly read and write into ABI.
+ * The general technique used here is : double word bitfields are defined in
+ * opposite order for big endian architecture. Then before reading them in
+ * driver the complete double word is translated using le32_to_cpu. Similarly
+ * After the driver writes into bitfields, cpu_to_le32 is used to translate the
+ * double words into required format.
+ * In order to avoid touching bits in shared structure more than once, temporary
+ * descriptors are used. These are passed as srcDesc to following functions.
+ */
+static void vmxnet3_RxDescToCPU(const struct Vmxnet3_RxDesc *srcDesc,
+                                struct Vmxnet3_RxDesc *dstDesc)
+{
+        u32 *src = (u32 *)srcDesc + 2;
+        u32 *dst = (u32 *)dstDesc + 2;
+        dstDesc->addr = le64_to_cpu(srcDesc->addr);
+        *dst = le32_to_cpu(*src);
+        dstDesc->ext1 = le32_to_cpu(srcDesc->ext1);
+}
+
+static void vmxnet3_TxDescToLe(const struct Vmxnet3_TxDesc *srcDesc,
+                               struct Vmxnet3_TxDesc *dstDesc)
+{
+        int i;
+        u32 *src = (u32 *)(srcDesc + 1);
+        u32 *dst = (u32 *)(dstDesc + 1);
+
+        /* Working backwards so that the gen bit is set at the end. */
+        for (i = 2; i > 0; i--) {
+                src--;
+                dst--;
+                *dst = cpu_to_le32(*src);
+        }
+}
+
+
+static void vmxnet3_RxCompToCPU(const struct Vmxnet3_RxCompDesc *srcDesc,
+                                struct Vmxnet3_RxCompDesc *dstDesc)
+{
+        int i = 0;
+        u32 *src = (u32 *)srcDesc;
+        u32 *dst = (u32 *)dstDesc;
+        for (i = 0; i < sizeof(struct Vmxnet3_RxCompDesc) / sizeof(u32); i++) {
+                *dst = le32_to_cpu(*src);
+                src++;
+                dst++;
+        }
+}
+
+
+/* Used to read bitfield values from double words. */
+static u32 get_bitfield32(const __le32 *bitfield, u32 pos, u32 size)
+{
+        u32 temp = le32_to_cpu(*bitfield);
+        u32 mask = ((1 << size) - 1) << pos;
+        temp &= mask;
+        temp >>= pos;
+        return temp;
+}
+
+
+
+#endif  /* __BIG_ENDIAN_BITFIELD */
+
+#ifdef __BIG_ENDIAN_BITFIELD
+
+#   define VMXNET3_TXDESC_GET_GEN(txdesc) get_bitfield32(((const __le32 *) \
+                        txdesc) + VMXNET3_TXD_GEN_DWORD_SHIFT, \
+                        VMXNET3_TXD_GEN_SHIFT, VMXNET3_TXD_GEN_SIZE)
+#   define VMXNET3_TXDESC_GET_EOP(txdesc) get_bitfield32(((const __le32 *) \
+                        txdesc) + VMXNET3_TXD_EOP_DWORD_SHIFT, \
+                        VMXNET3_TXD_EOP_SHIFT, VMXNET3_TXD_EOP_SIZE)
+#   define VMXNET3_TCD_GET_GEN(tcd) get_bitfield32(((const __le32 *)tcd) + \
+                        VMXNET3_TCD_GEN_DWORD_SHIFT, VMXNET3_TCD_GEN_SHIFT, \
+                        VMXNET3_TCD_GEN_SIZE)
+#   define VMXNET3_TCD_GET_TXIDX(tcd) get_bitfield32((const __le32 *)tcd, \
+                        VMXNET3_TCD_TXIDX_SHIFT, VMXNET3_TCD_TXIDX_SIZE)
+#   define vmxnet3_getRxComp(dstrcd, rcd, tmp) do { \
+                        (dstrcd) = (tmp); \
+                        vmxnet3_RxCompToCPU((rcd), (tmp)); \
+                } while (0)
+#   define vmxnet3_getRxDesc(dstrxd, rxd, tmp) do { \
+                        (dstrxd) = (tmp); \
+                        vmxnet3_RxDescToCPU((rxd), (tmp)); \
+                } while (0)
+
+#else
+
+#   define VMXNET3_TXDESC_GET_GEN(txdesc) ((txdesc)->gen)
+#   define VMXNET3_TXDESC_GET_EOP(txdesc) ((txdesc)->eop)
+#   define VMXNET3_TCD_GET_GEN(tcd) ((tcd)->gen)
+#   define VMXNET3_TCD_GET_TXIDX(tcd) ((tcd)->txdIdx)
+#   define vmxnet3_getRxComp(dstrcd, rcd, tmp) (dstrcd) = (rcd)
+#   define vmxnet3_getRxDesc(dstrxd, rxd, tmp) (dstrxd) = (rxd)
+
+#endif /* __BIG_ENDIAN_BITFIELD  */
+
 
 static void
 vmxnet3_unmap_tx_buf(struct vmxnet3_tx_buf_info *tbi,
@@ -212,7 +312,7 @@ vmxnet3_unmap_pkt(u32 eop_idx, struct vmxnet3_tx_queue *tq,
 
         /* no out of order completion */
         BUG_ON(tq->buf_info[eop_idx].sop_idx != tq->tx_ring.next2comp);
-        BUG_ON(tq->tx_ring.base[eop_idx].txd.eop != 1);
+        BUG_ON(VMXNET3_TXDESC_GET_EOP(&(tq->tx_ring.base[eop_idx].txd)) != 1);
 
         skb = tq->buf_info[eop_idx].skb;
         BUG_ON(skb == NULL);
@@ -246,9 +346,10 @@ vmxnet3_tq_tx_complete(struct vmxnet3_tx_queue *tq,
         union Vmxnet3_GenericDesc *gdesc;
 
         gdesc = tq->comp_ring.base + tq->comp_ring.next2proc;
-        while (gdesc->tcd.gen == tq->comp_ring.gen) {
-                completed += vmxnet3_unmap_pkt(gdesc->tcd.txdIdx, tq,
-                                               adapter->pdev, adapter);
+        while (VMXNET3_TCD_GET_GEN(&gdesc->tcd) == tq->comp_ring.gen) {
+                completed += vmxnet3_unmap_pkt(VMXNET3_TCD_GET_TXIDX(
+                                               &gdesc->tcd), tq, adapter->pdev,
+                                               adapter);
 
                 vmxnet3_comp_ring_adv_next2proc(&tq->comp_ring);
                 gdesc = tq->comp_ring.base + tq->comp_ring.next2proc;
@@ -472,9 +573,9 @@ vmxnet3_rq_alloc_rx_buf(struct vmxnet3_rx_queue *rq, u32 ring_idx,
                 }
 
                 BUG_ON(rbi->dma_addr == 0);
-                gd->rxd.addr = rbi->dma_addr;
-                gd->dword[2] = (ring->gen << VMXNET3_RXD_GEN_SHIFT) | val |
-                                rbi->len;
+                gd->rxd.addr = cpu_to_le64(rbi->dma_addr);
+                gd->dword[2] = cpu_to_le32((ring->gen << VMXNET3_RXD_GEN_SHIFT)
+                                           | val | rbi->len);
 
                 num_allocated++;
                 vmxnet3_cmd_ring_adv_next2fill(ring);
@@ -531,10 +632,10 @@ vmxnet3_map_pkt(struct sk_buff *skb, struct vmxnet3_tx_ctx *ctx,
 
         /* no need to map the buffer if headers are copied */
         if (ctx->copy_size) {
-                ctx->sop_txd->txd.addr = tq->data_ring.basePA +
+                ctx->sop_txd->txd.addr = cpu_to_le64(tq->data_ring.basePA +
                                         tq->tx_ring.next2fill *
-                                        sizeof(struct Vmxnet3_TxDataDesc);
-                ctx->sop_txd->dword[2] = dw2 | ctx->copy_size;
+                                        sizeof(struct Vmxnet3_TxDataDesc));
+                ctx->sop_txd->dword[2] = cpu_to_le32(dw2 | ctx->copy_size);
                 ctx->sop_txd->dword[3] = 0;
 
                 tbi = tq->buf_info + tq->tx_ring.next2fill;
@@ -542,7 +643,8 @@ vmxnet3_map_pkt(struct sk_buff *skb, struct vmxnet3_tx_ctx *ctx,
 
                 dev_dbg(&adapter->netdev->dev,
                         "txd[%u]: 0x%Lx 0x%x 0x%x\n",
-                        tq->tx_ring.next2fill, ctx->sop_txd->txd.addr,
+                        tq->tx_ring.next2fill,
+                        le64_to_cpu(ctx->sop_txd->txd.addr),
                         ctx->sop_txd->dword[2], ctx->sop_txd->dword[3]);
                 vmxnet3_cmd_ring_adv_next2fill(&tq->tx_ring);
 
@@ -570,14 +672,14 @@ vmxnet3_map_pkt(struct sk_buff *skb, struct vmxnet3_tx_ctx *ctx,
                 gdesc = tq->tx_ring.base + tq->tx_ring.next2fill;
                 BUG_ON(gdesc->txd.gen == tq->tx_ring.gen);
 
-                gdesc->txd.addr = tbi->dma_addr;
-                gdesc->dword[2] = dw2 | buf_size;
+                gdesc->txd.addr = cpu_to_le64(tbi->dma_addr);
+                gdesc->dword[2] = cpu_to_le32(dw2 | buf_size);
                 gdesc->dword[3] = 0;
 
                 dev_dbg(&adapter->netdev->dev,
                         "txd[%u]: 0x%Lx 0x%x 0x%x\n",
-                        tq->tx_ring.next2fill, gdesc->txd.addr,
-                        gdesc->dword[2], gdesc->dword[3]);
+                        tq->tx_ring.next2fill, le64_to_cpu(gdesc->txd.addr),
+                        le32_to_cpu(gdesc->dword[2]), gdesc->dword[3]);
                 vmxnet3_cmd_ring_adv_next2fill(&tq->tx_ring);
                 dw2 = tq->tx_ring.gen << VMXNET3_TXD_GEN_SHIFT;
 
@@ -599,14 +701,14 @@ vmxnet3_map_pkt(struct sk_buff *skb, struct vmxnet3_tx_ctx *ctx,
                 gdesc = tq->tx_ring.base + tq->tx_ring.next2fill;
                 BUG_ON(gdesc->txd.gen == tq->tx_ring.gen);
 
-                gdesc->txd.addr = tbi->dma_addr;
-                gdesc->dword[2] = dw2 | frag->size;
+                gdesc->txd.addr = cpu_to_le64(tbi->dma_addr);
+                gdesc->dword[2] = cpu_to_le32(dw2 | frag->size);
                 gdesc->dword[3] = 0;
 
                 dev_dbg(&adapter->netdev->dev,
                         "txd[%u]: 0x%llu %u %u\n",
-                        tq->tx_ring.next2fill, gdesc->txd.addr,
-                        gdesc->dword[2], gdesc->dword[3]);
+                        tq->tx_ring.next2fill, le64_to_cpu(gdesc->txd.addr),
+                        le32_to_cpu(gdesc->dword[2]), gdesc->dword[3]);
                 vmxnet3_cmd_ring_adv_next2fill(&tq->tx_ring);
                 dw2 = tq->tx_ring.gen << VMXNET3_TXD_GEN_SHIFT;
         }
@@ -751,6 +853,10 @@ vmxnet3_tq_xmit(struct sk_buff *skb, struct vmxnet3_tx_queue *tq,
         unsigned long flags;
         struct vmxnet3_tx_ctx ctx;
         union Vmxnet3_GenericDesc *gdesc;
+#ifdef __BIG_ENDIAN_BITFIELD
+        /* Use temporary descriptor to avoid touching bits multiple times */
+        union Vmxnet3_GenericDesc tempTxDesc;
+#endif
 
         /* conservatively estimate # of descriptors to use */
         count = VMXNET3_TXD_NEEDED(skb_headlen(skb)) +
@@ -827,16 +933,22 @@ vmxnet3_tq_xmit(struct sk_buff *skb, struct vmxnet3_tx_queue *tq,
         vmxnet3_map_pkt(skb, &ctx, tq, adapter->pdev, adapter);
 
         /* setup the EOP desc */
-        ctx.eop_txd->dword[3] = VMXNET3_TXD_CQ | VMXNET3_TXD_EOP;
+        ctx.eop_txd->dword[3] = cpu_to_le32(VMXNET3_TXD_CQ | VMXNET3_TXD_EOP);
 
         /* setup the SOP desc */
+#ifdef __BIG_ENDIAN_BITFIELD
+        gdesc = &tempTxDesc;
+        gdesc->dword[2] = ctx.sop_txd->dword[2];
+        gdesc->dword[3] = ctx.sop_txd->dword[3];
+#else
         gdesc = ctx.sop_txd;
+#endif
         if (ctx.mss) {
                 gdesc->txd.hlen = ctx.eth_ip_hdr_size + ctx.l4_hdr_size;
                 gdesc->txd.om = VMXNET3_OM_TSO;
                 gdesc->txd.msscof = ctx.mss;
-                tq->shared->txNumDeferred += (skb->len - gdesc->txd.hlen +
-                                             ctx.mss - 1) / ctx.mss;
+                le32_add_cpu(&tq->shared->txNumDeferred, (skb->len -
+                             gdesc->txd.hlen + ctx.mss - 1) / ctx.mss);
         } else {
                 if (skb->ip_summed == CHECKSUM_PARTIAL) {
                         gdesc->txd.hlen = ctx.eth_ip_hdr_size;
@@ -847,7 +959,7 @@ vmxnet3_tq_xmit(struct sk_buff *skb, struct vmxnet3_tx_queue *tq,
                         gdesc->txd.om = 0;
                         gdesc->txd.msscof = 0;
                 }
-                tq->shared->txNumDeferred++;
+                le32_add_cpu(&tq->shared->txNumDeferred, 1);
         }
 
         if (vlan_tx_tag_present(skb)) {
@@ -855,19 +967,27 @@ vmxnet3_tq_xmit(struct sk_buff *skb, struct vmxnet3_tx_queue *tq,
                 gdesc->txd.tci = vlan_tx_tag_get(skb);
         }
 
-        wmb();
-
-        /* finally flips the GEN bit of the SOP desc */
-        gdesc->dword[2] ^= VMXNET3_TXD_GEN;
+        /* finally flips the GEN bit of the SOP desc. */
+        gdesc->dword[2] = cpu_to_le32(le32_to_cpu(gdesc->dword[2]) ^
+                                                  VMXNET3_TXD_GEN);
+#ifdef __BIG_ENDIAN_BITFIELD
+        /* Finished updating in bitfields of Tx Desc, so write them in original
+         * place.
+         */
+        vmxnet3_TxDescToLe((struct Vmxnet3_TxDesc *)gdesc,
+                           (struct Vmxnet3_TxDesc *)ctx.sop_txd);
+        gdesc = ctx.sop_txd;
+#endif
         dev_dbg(&adapter->netdev->dev,
                 "txd[%u]: SOP 0x%Lx 0x%x 0x%x\n",
                 (u32)((union Vmxnet3_GenericDesc *)ctx.sop_txd -
-                tq->tx_ring.base), gdesc->txd.addr, gdesc->dword[2],
-                gdesc->dword[3]);
+                tq->tx_ring.base), le64_to_cpu(gdesc->txd.addr),
+                le32_to_cpu(gdesc->dword[2]), le32_to_cpu(gdesc->dword[3]));
 
         spin_unlock_irqrestore(&tq->tx_lock, flags);
 
-        if (tq->shared->txNumDeferred >= tq->shared->txThreshold) {
+        if (le32_to_cpu(tq->shared->txNumDeferred) >=
+                                        le32_to_cpu(tq->shared->txThreshold)) {
                 tq->shared->txNumDeferred = 0;
                 VMXNET3_WRITE_BAR0_REG(adapter, VMXNET3_REG_TXPROD,
                                        tq->tx_ring.next2fill);
@@ -889,9 +1009,8 @@ static netdev_tx_t
 vmxnet3_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
 {
         struct vmxnet3_adapter *adapter = netdev_priv(netdev);
-        struct vmxnet3_tx_queue *tq = &adapter->tx_queue;
 
-        return vmxnet3_tq_xmit(skb, tq, adapter, netdev);
+        return vmxnet3_tq_xmit(skb, &adapter->tx_queue, adapter, netdev);
 }
 
 
@@ -902,7 +1021,7 @@ vmxnet3_rx_csum(struct vmxnet3_adapter *adapter,
 {
         if (!gdesc->rcd.cnc && adapter->rxcsum) {
                 /* typical case: TCP/UDP over IP and both csums are correct */
-                if ((gdesc->dword[3] & VMXNET3_RCD_CSUM_OK) ==
+                if ((le32_to_cpu(gdesc->dword[3]) & VMXNET3_RCD_CSUM_OK) ==
                                                         VMXNET3_RCD_CSUM_OK) {
                         skb->ip_summed = CHECKSUM_UNNECESSARY;
                         BUG_ON(!(gdesc->rcd.tcp || gdesc->rcd.udp));
@@ -957,8 +1076,12 @@ vmxnet3_rq_rx_complete(struct vmxnet3_rx_queue *rq,
         u32 num_rxd = 0;
         struct Vmxnet3_RxCompDesc *rcd;
         struct vmxnet3_rx_ctx *ctx = &rq->rx_ctx;
-
-        rcd = &rq->comp_ring.base[rq->comp_ring.next2proc].rcd;
+#ifdef __BIG_ENDIAN_BITFIELD
+        struct Vmxnet3_RxDesc rxCmdDesc;
+        struct Vmxnet3_RxCompDesc rxComp;
+#endif
+        vmxnet3_getRxComp(rcd, &rq->comp_ring.base[rq->comp_ring.next2proc].rcd,
+                          &rxComp);
         while (rcd->gen == rq->comp_ring.gen) {
                 struct vmxnet3_rx_buf_info *rbi;
                 struct sk_buff *skb;
@@ -976,11 +1099,12 @@ vmxnet3_rq_rx_complete(struct vmxnet3_rx_queue *rq,
 
                 idx = rcd->rxdIdx;
                 ring_idx = rcd->rqID == rq->qid ? 0 : 1;
-
-                rxd = &rq->rx_ring[ring_idx].base[idx].rxd;
+                vmxnet3_getRxDesc(rxd, &rq->rx_ring[ring_idx].base[idx].rxd,
+                                  &rxCmdDesc);
                 rbi = rq->buf_info[ring_idx] + idx;
 
-                BUG_ON(rxd->addr != rbi->dma_addr || rxd->len != rbi->len);
+                BUG_ON(rxd->addr != rbi->dma_addr ||
+                       rxd->len != rbi->len);
 
                 if (unlikely(rcd->eop && rcd->err)) {
                         vmxnet3_rx_error(rq, rcd, ctx, adapter);
@@ -1078,7 +1202,8 @@ rcd_done:
                 }
 
                 vmxnet3_comp_ring_adv_next2proc(&rq->comp_ring);
-                rcd = &rq->comp_ring.base[rq->comp_ring.next2proc].rcd;
+                vmxnet3_getRxComp(rcd,
+                     &rq->comp_ring.base[rq->comp_ring.next2proc].rcd, &rxComp);
         }
 
         return num_rxd;
@@ -1094,7 +1219,11 @@ vmxnet3_rq_cleanup(struct vmxnet3_rx_queue *rq,
 
         for (ring_idx = 0; ring_idx < 2; ring_idx++) {
                 for (i = 0; i < rq->rx_ring[ring_idx].size; i++) {
-                        rxd = &rq->rx_ring[ring_idx].base[i].rxd;
+#ifdef __BIG_ENDIAN_BITFIELD
+                        struct Vmxnet3_RxDesc rxDesc;
+#endif
+                        vmxnet3_getRxDesc(rxd,
+                                &rq->rx_ring[ring_idx].base[i].rxd, &rxDesc);
 
                         if (rxd->btype == VMXNET3_RXD_BTYPE_HEAD &&
                                         rq->buf_info[ring_idx][i].skb) {
@@ -1346,12 +1475,12 @@ vmxnet3_request_irqs(struct vmxnet3_adapter *adapter)
                 err = request_irq(adapter->intr.msix_entries[0].vector,
                                   vmxnet3_intr, 0, adapter->netdev->name,
                                   adapter->netdev);
-        } else
-#endif
-        if (adapter->intr.type == VMXNET3_IT_MSI) {
+        } else if (adapter->intr.type == VMXNET3_IT_MSI) {
                 err = request_irq(adapter->pdev->irq, vmxnet3_intr, 0,
                                   adapter->netdev->name, adapter->netdev);
-        } else {
+        } else
+#endif
+        {
                 err = request_irq(adapter->pdev->irq, vmxnet3_intr,
                                   IRQF_SHARED, adapter->netdev->name,
                                   adapter->netdev);
@@ -1412,6 +1541,22 @@ vmxnet3_free_irqs(struct vmxnet3_adapter *adapter)
 }
 
 
+inline void set_flag_le16(__le16 *data, u16 flag)
+{
+        *data = cpu_to_le16(le16_to_cpu(*data) | flag);
+}
+
+inline void set_flag_le64(__le64 *data, u64 flag)
+{
+        *data = cpu_to_le64(le64_to_cpu(*data) | flag);
+}
+
+inline void reset_flag_le64(__le64 *data, u64 flag)
+{
+        *data = cpu_to_le64(le64_to_cpu(*data) & ~flag);
+}
+
+
 static void
 vmxnet3_vlan_rx_register(struct net_device *netdev, struct vlan_group *grp)
 {
@@ -1427,7 +1572,8 @@ vmxnet3_vlan_rx_register(struct net_device *netdev, struct vlan_group *grp)
                         adapter->vlan_grp = grp;
 
                         /* update FEATURES to device */
-                        devRead->misc.uptFeatures |= UPT1_F_RXVLAN;
+                        set_flag_le64(&devRead->misc.uptFeatures,
+                                      UPT1_F_RXVLAN);
                         VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
                                                VMXNET3_CMD_UPDATE_FEATURE);
                         /*
@@ -1450,7 +1596,7 @@ vmxnet3_vlan_rx_register(struct net_device *netdev, struct vlan_group *grp)
                 struct Vmxnet3_DSDevRead *devRead = &shared->devRead;
                 adapter->vlan_grp = NULL;
 
-                if (devRead->misc.uptFeatures & UPT1_F_RXVLAN) {
+                if (le64_to_cpu(devRead->misc.uptFeatures) & UPT1_F_RXVLAN) {
                         int i;
 
                         for (i = 0; i < VMXNET3_VFT_SIZE; i++) {
@@ -1463,7 +1609,8 @@ vmxnet3_vlan_rx_register(struct net_device *netdev, struct vlan_group *grp)
                                                VMXNET3_CMD_UPDATE_VLAN_FILTERS);
 
                         /* update FEATURES to device */
-                        devRead->misc.uptFeatures &= ~UPT1_F_RXVLAN;
+                        reset_flag_le64(&devRead->misc.uptFeatures,
+                                        UPT1_F_RXVLAN);
                         VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
                                                VMXNET3_CMD_UPDATE_FEATURE);
                 }
@@ -1565,9 +1712,10 @@ vmxnet3_set_mc(struct net_device *netdev)
                         new_table = vmxnet3_copy_mc(netdev);
                         if (new_table) {
                                 new_mode |= VMXNET3_RXM_MCAST;
-                                rxConf->mfTableLen = netdev->mc_count *
-                                                     ETH_ALEN;
-                                rxConf->mfTablePA = virt_to_phys(new_table);
+                                rxConf->mfTableLen = cpu_to_le16(
+                                                netdev->mc_count * ETH_ALEN);
+                                rxConf->mfTablePA = cpu_to_le64(virt_to_phys(
+                                                    new_table));
                         } else {
                                 printk(KERN_INFO "%s: failed to copy mcast list"
                                        ", setting ALL_MULTI\n", netdev->name);
@@ -1582,7 +1730,7 @@ vmxnet3_set_mc(struct net_device *netdev)
         }
 
         if (new_mode != rxConf->rxMode) {
-                rxConf->rxMode = new_mode;
+                rxConf->rxMode = cpu_to_le32(new_mode);
                 VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
                                        VMXNET3_CMD_UPDATE_RX_MODE);
         }
@@ -1610,63 +1758,69 @@ vmxnet3_setup_driver_shared(struct vmxnet3_adapter *adapter)
         memset(shared, 0, sizeof(*shared));
 
         /* driver settings */
-        shared->magic = VMXNET3_REV1_MAGIC;
-        devRead->misc.driverInfo.version = VMXNET3_DRIVER_VERSION_NUM;
+        shared->magic = cpu_to_le32(VMXNET3_REV1_MAGIC);
+        devRead->misc.driverInfo.version = cpu_to_le32(
+                                                VMXNET3_DRIVER_VERSION_NUM);
         devRead->misc.driverInfo.gos.gosBits = (sizeof(void *) == 4 ?
                                 VMXNET3_GOS_BITS_32 : VMXNET3_GOS_BITS_64);
         devRead->misc.driverInfo.gos.gosType = VMXNET3_GOS_TYPE_LINUX;
-        devRead->misc.driverInfo.vmxnet3RevSpt = 1;
-        devRead->misc.driverInfo.uptVerSpt = 1;
+        *((u32 *)&devRead->misc.driverInfo.gos) = cpu_to_le32(
+                                *((u32 *)&devRead->misc.driverInfo.gos));
+        devRead->misc.driverInfo.vmxnet3RevSpt = cpu_to_le32(1);
+        devRead->misc.driverInfo.uptVerSpt = cpu_to_le32(1);
 
-        devRead->misc.ddPA = virt_to_phys(adapter);
-        devRead->misc.ddLen = sizeof(struct vmxnet3_adapter);
+        devRead->misc.ddPA = cpu_to_le64(virt_to_phys(adapter));
+        devRead->misc.ddLen = cpu_to_le32(sizeof(struct vmxnet3_adapter));
 
         /* set up feature flags */
         if (adapter->rxcsum)
-                devRead->misc.uptFeatures |= UPT1_F_RXCSUM;
+                set_flag_le64(&devRead->misc.uptFeatures, UPT1_F_RXCSUM);
 
         if (adapter->lro) {
-                devRead->misc.uptFeatures |= UPT1_F_LRO;
-                devRead->misc.maxNumRxSG = 1 + MAX_SKB_FRAGS;
+                set_flag_le64(&devRead->misc.uptFeatures, UPT1_F_LRO);
+                devRead->misc.maxNumRxSG = cpu_to_le16(1 + MAX_SKB_FRAGS);
         }
         if ((adapter->netdev->features & NETIF_F_HW_VLAN_RX)
                         && adapter->vlan_grp) {
-                devRead->misc.uptFeatures |= UPT1_F_RXVLAN;
+                set_flag_le64(&devRead->misc.uptFeatures, UPT1_F_RXVLAN);
         }
 
-        devRead->misc.mtu = adapter->netdev->mtu;
-        devRead->misc.queueDescPA = adapter->queue_desc_pa;
-        devRead->misc.queueDescLen = sizeof(struct Vmxnet3_TxQueueDesc) +
-                                     sizeof(struct Vmxnet3_RxQueueDesc);
+        devRead->misc.mtu = cpu_to_le32(adapter->netdev->mtu);
+        devRead->misc.queueDescPA = cpu_to_le64(adapter->queue_desc_pa);
+        devRead->misc.queueDescLen = cpu_to_le32(
+                                     sizeof(struct Vmxnet3_TxQueueDesc) +
+                                     sizeof(struct Vmxnet3_RxQueueDesc));
 
         /* tx queue settings */
         BUG_ON(adapter->tx_queue.tx_ring.base == NULL);
 
         devRead->misc.numTxQueues = 1;
         tqc = &adapter->tqd_start->conf;
-        tqc->txRingBasePA   = adapter->tx_queue.tx_ring.basePA;
-        tqc->dataRingBasePA = adapter->tx_queue.data_ring.basePA;
-        tqc->compRingBasePA = adapter->tx_queue.comp_ring.basePA;
-        tqc->ddPA           = virt_to_phys(adapter->tx_queue.buf_info);
-        tqc->txRingSize     = adapter->tx_queue.tx_ring.size;
-        tqc->dataRingSize   = adapter->tx_queue.data_ring.size;
-        tqc->compRingSize   = adapter->tx_queue.comp_ring.size;
-        tqc->ddLen          = sizeof(struct vmxnet3_tx_buf_info) *
-                              tqc->txRingSize;
+        tqc->txRingBasePA   = cpu_to_le64(adapter->tx_queue.tx_ring.basePA);
+        tqc->dataRingBasePA = cpu_to_le64(adapter->tx_queue.data_ring.basePA);
+        tqc->compRingBasePA = cpu_to_le64(adapter->tx_queue.comp_ring.basePA);
+        tqc->ddPA           = cpu_to_le64(virt_to_phys(
+                                                adapter->tx_queue.buf_info));
+        tqc->txRingSize     = cpu_to_le32(adapter->tx_queue.tx_ring.size);
+        tqc->dataRingSize   = cpu_to_le32(adapter->tx_queue.data_ring.size);
+        tqc->compRingSize   = cpu_to_le32(adapter->tx_queue.comp_ring.size);
+        tqc->ddLen          = cpu_to_le32(sizeof(struct vmxnet3_tx_buf_info) *
+                              tqc->txRingSize);
         tqc->intrIdx        = adapter->tx_queue.comp_ring.intr_idx;
 
         /* rx queue settings */
         devRead->misc.numRxQueues = 1;
         rqc = &adapter->rqd_start->conf;
-        rqc->rxRingBasePA[0] = adapter->rx_queue.rx_ring[0].basePA;
-        rqc->rxRingBasePA[1] = adapter->rx_queue.rx_ring[1].basePA;
-        rqc->compRingBasePA  = adapter->rx_queue.comp_ring.basePA;
-        rqc->ddPA            = virt_to_phys(adapter->rx_queue.buf_info);
-        rqc->rxRingSize[0]   = adapter->rx_queue.rx_ring[0].size;
-        rqc->rxRingSize[1]   = adapter->rx_queue.rx_ring[1].size;
-        rqc->compRingSize    = adapter->rx_queue.comp_ring.size;
-        rqc->ddLen           = sizeof(struct vmxnet3_rx_buf_info) *
-                               (rqc->rxRingSize[0] + rqc->rxRingSize[1]);
+        rqc->rxRingBasePA[0] = cpu_to_le64(adapter->rx_queue.rx_ring[0].basePA);
+        rqc->rxRingBasePA[1] = cpu_to_le64(adapter->rx_queue.rx_ring[1].basePA);
+        rqc->compRingBasePA  = cpu_to_le64(adapter->rx_queue.comp_ring.basePA);
+        rqc->ddPA            = cpu_to_le64(virt_to_phys(
+                                                adapter->rx_queue.buf_info));
+        rqc->rxRingSize[0]   = cpu_to_le32(adapter->rx_queue.rx_ring[0].size);
+        rqc->rxRingSize[1]   = cpu_to_le32(adapter->rx_queue.rx_ring[1].size);
+        rqc->compRingSize    = cpu_to_le32(adapter->rx_queue.comp_ring.size);
+        rqc->ddLen           = cpu_to_le32(sizeof(struct vmxnet3_rx_buf_info) *
+                               (rqc->rxRingSize[0] + rqc->rxRingSize[1]));
         rqc->intrIdx         = adapter->rx_queue.comp_ring.intr_idx;
 
         /* intr settings */
@@ -1715,11 +1869,10 @@ vmxnet3_activate_dev(struct vmxnet3_adapter *adapter)
 
         vmxnet3_setup_driver_shared(adapter);
 
-        VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_DSAL,
-                               VMXNET3_GET_ADDR_LO(adapter->shared_pa));
-        VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_DSAH,
-                               VMXNET3_GET_ADDR_HI(adapter->shared_pa));
-
+        VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_DSAL, VMXNET3_GET_ADDR_LO(
+                               adapter->shared_pa));
+        VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_DSAH, VMXNET3_GET_ADDR_HI(
+                               adapter->shared_pa));
         VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
                                VMXNET3_CMD_ACTIVATE_DEV);
         ret = VMXNET3_READ_BAR1_REG(adapter, VMXNET3_REG_CMD);
@@ -2425,7 +2578,7 @@ vmxnet3_suspend(struct device *device)
                 memcpy(pmConf->filters[i].pattern, netdev->dev_addr, ETH_ALEN);
                 pmConf->filters[i].mask[0] = 0x3F; /* LSB ETH_ALEN bits */
 
-                pmConf->wakeUpEvents |= VMXNET3_PM_WAKEUP_FILTER;
+                set_flag_le16(&pmConf->wakeUpEvents, VMXNET3_PM_WAKEUP_FILTER);
                 i++;
         }
 
@@ -2467,19 +2620,21 @@ vmxnet3_suspend(struct device *device)
                 pmConf->filters[i].mask[5] = 0x03; /* IPv4 TIP */
                 in_dev_put(in_dev);
 
-                pmConf->wakeUpEvents |= VMXNET3_PM_WAKEUP_FILTER;
+                set_flag_le16(&pmConf->wakeUpEvents, VMXNET3_PM_WAKEUP_FILTER);
                 i++;
         }
 
 skip_arp:
         if (adapter->wol & WAKE_MAGIC)
-                pmConf->wakeUpEvents |= VMXNET3_PM_WAKEUP_MAGIC;
+                set_flag_le16(&pmConf->wakeUpEvents, VMXNET3_PM_WAKEUP_MAGIC);
 
         pmConf->numFilters = i;
 
-        adapter->shared->devRead.pmConfDesc.confVer = 1;
-        adapter->shared->devRead.pmConfDesc.confLen = sizeof(*pmConf);
-        adapter->shared->devRead.pmConfDesc.confPA = virt_to_phys(pmConf);
+        adapter->shared->devRead.pmConfDesc.confVer = cpu_to_le32(1);
+        adapter->shared->devRead.pmConfDesc.confLen = cpu_to_le32(sizeof(
+                                                                  *pmConf));
+        adapter->shared->devRead.pmConfDesc.confPA = cpu_to_le64(virt_to_phys(
+                                                                 pmConf));
 
         VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
                                VMXNET3_CMD_UPDATE_PMCFG);
@@ -2510,9 +2665,11 @@ vmxnet3_resume(struct device *device)
         pmConf = adapter->pm_conf;
         memset(pmConf, 0, sizeof(*pmConf));
 
-        adapter->shared->devRead.pmConfDesc.confVer = 1;
-        adapter->shared->devRead.pmConfDesc.confLen = sizeof(*pmConf);
-        adapter->shared->devRead.pmConfDesc.confPA = virt_to_phys(pmConf);
+        adapter->shared->devRead.pmConfDesc.confVer = cpu_to_le32(1);
+        adapter->shared->devRead.pmConfDesc.confLen = cpu_to_le32(sizeof(
+                                                                  *pmConf));
+        adapter->shared->devRead.pmConfDesc.confPA = cpu_to_le32(virt_to_phys(
+                                                                 pmConf));
 
         netif_device_attach(netdev);
         pci_set_power_state(pdev, PCI_D0);
diff --git a/drivers/net/vmxnet3/vmxnet3_ethtool.c b/drivers/net/vmxnet3/vmxnet3_ethtool.c
index c2c15e4cafc..3935c4493fb 100644
--- a/drivers/net/vmxnet3/vmxnet3_ethtool.c
+++ b/drivers/net/vmxnet3/vmxnet3_ethtool.c
@@ -50,11 +50,13 @@ vmxnet3_set_rx_csum(struct net_device *netdev, u32 val)
                 adapter->rxcsum = val;
                 if (netif_running(netdev)) {
                         if (val)
-                                adapter->shared->devRead.misc.uptFeatures |=
-                                                                UPT1_F_RXCSUM;
+                                set_flag_le64(
+                                &adapter->shared->devRead.misc.uptFeatures,
+                                UPT1_F_RXCSUM);
                         else
-                                adapter->shared->devRead.misc.uptFeatures &=
-                                                                ~UPT1_F_RXCSUM;
+                                reset_flag_le64(
+                                &adapter->shared->devRead.misc.uptFeatures,
+                                UPT1_F_RXCSUM);
 
                         VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
                                                VMXNET3_CMD_UPDATE_FEATURE);
diff --git a/drivers/net/vmxnet3/vmxnet3_int.h b/drivers/net/vmxnet3/vmxnet3_int.h
index 445081686d5..34f392f46fb 100644
--- a/drivers/net/vmxnet3/vmxnet3_int.h
+++ b/drivers/net/vmxnet3/vmxnet3_int.h
@@ -330,14 +330,14 @@ struct vmxnet3_adapter {
 };
 
 #define VMXNET3_WRITE_BAR0_REG(adapter, reg, val)  \
-        writel((val), (adapter)->hw_addr0 + (reg))
+        writel(cpu_to_le32(val), (adapter)->hw_addr0 + (reg))
 #define VMXNET3_READ_BAR0_REG(adapter, reg)        \
-        readl((adapter)->hw_addr0 + (reg))
+        le32_to_cpu(readl((adapter)->hw_addr0 + (reg)))
 
 #define VMXNET3_WRITE_BAR1_REG(adapter, reg, val)  \
-        writel((val), (adapter)->hw_addr1 + (reg))
+        writel(cpu_to_le32(val), (adapter)->hw_addr1 + (reg))
 #define VMXNET3_READ_BAR1_REG(adapter, reg)        \
-        readl((adapter)->hw_addr1 + (reg))
+        le32_to_cpu(readl((adapter)->hw_addr1 + (reg)))
 
 #define VMXNET3_WAKE_QUEUE_THRESHOLD(tq)  (5)
 #define VMXNET3_RX_ALLOC_THRESHOLD(rq, ring_idx, adapter) \
@@ -353,6 +353,10 @@ struct vmxnet3_adapter {
 #define VMXNET3_MAX_ETH_HDR_SIZE    22
 #define VMXNET3_MAX_SKB_BUF_SIZE    (3*1024)
 
+void set_flag_le16(__le16 *data, u16 flag);
+void set_flag_le64(__le64 *data, u64 flag);
+void reset_flag_le64(__le64 *data, u64 flag);
+
 int
 vmxnet3_quiesce_dev(struct vmxnet3_adapter *adapter);
 
diff --git a/drivers/net/wan/dscc4.c b/drivers/net/wan/dscc4.c
index 81c8aec9df9..63a010252a3 100644
--- a/drivers/net/wan/dscc4.c
+++ b/drivers/net/wan/dscc4.c
@@ -1127,7 +1127,7 @@ done:
         init_timer(&dpriv->timer);
         dpriv->timer.expires = jiffies + 10*HZ;
         dpriv->timer.data = (unsigned long)dev;
-        dpriv->timer.function = &dscc4_timer;
+        dpriv->timer.function = dscc4_timer;
         add_timer(&dpriv->timer);
         netif_carrier_on(dev);
 
diff --git a/drivers/net/wireless/adm8211.c b/drivers/net/wireless/adm8211.c
index b80f514877d..39410016b4f 100644
--- a/drivers/net/wireless/adm8211.c
+++ b/drivers/net/wireless/adm8211.c
@@ -1538,7 +1538,7 @@ static int adm8211_start(struct ieee80211_hw *dev)
         adm8211_hw_init(dev);
         adm8211_rf_set_channel(dev, priv->channel);
 
-        retval = request_irq(priv->pdev->irq, &adm8211_interrupt,
+        retval = request_irq(priv->pdev->irq, adm8211_interrupt,
                              IRQF_SHARED, "adm8211", dev);
         if (retval) {
                 printk(KERN_ERR "%s: failed to register IRQ handler\n",
diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c
index a9bc8a97c4e..b7408370cf8 100644
--- a/drivers/net/wireless/ipw2x00/ipw2100.c
+++ b/drivers/net/wireless/ipw2x00/ipw2100.c
@@ -6029,7 +6029,7 @@ static struct net_device *ipw2100_alloc_device(struct pci_dev *pci_dev,
         struct ipw2100_priv *priv;
         struct net_device *dev;
 
-        dev = alloc_ieee80211(sizeof(struct ipw2100_priv), 0);
+        dev = alloc_ieee80211(sizeof(struct ipw2100_priv));
         if (!dev)
                 return NULL;
         priv = libipw_priv(dev);
@@ -6342,7 +6342,7 @@ static int ipw2100_pci_init_one(struct pci_dev *pci_dev,
                 sysfs_remove_group(&pci_dev->dev.kobj,
                                    &ipw2100_attribute_group);
 
-                free_ieee80211(dev, 0);
+                free_ieee80211(dev);
                 pci_set_drvdata(pci_dev, NULL);
         }
 
@@ -6400,7 +6400,7 @@ static void __devexit ipw2100_pci_remove_one(struct pci_dev *pci_dev)
                 if (dev->base_addr)
                         iounmap((void __iomem *)dev->base_addr);
 
-                free_ieee80211(dev, 0);
+                free_ieee80211(dev);
         }
 
         pci_release_regions(pci_dev);
diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c
index 39808e9378b..9b398db2d74 100644
--- a/drivers/net/wireless/ipw2x00/ipw2200.c
+++ b/drivers/net/wireless/ipw2x00/ipw2200.c
@@ -108,25 +108,6 @@ static int antenna = CFG_SYS_ANTENNA_BOTH;
 static int rtap_iface = 0;     /* def: 0 -- do not create rtap interface */
 #endif
 
-static struct ieee80211_rate ipw2200_rates[] = {
-        { .bitrate = 10 },
-        { .bitrate = 20, .flags = IEEE80211_RATE_SHORT_PREAMBLE },
-        { .bitrate = 55, .flags = IEEE80211_RATE_SHORT_PREAMBLE },
-        { .bitrate = 110, .flags = IEEE80211_RATE_SHORT_PREAMBLE },
-        { .bitrate = 60 },
-        { .bitrate = 90 },
-        { .bitrate = 120 },
-        { .bitrate = 180 },
-        { .bitrate = 240 },
-        { .bitrate = 360 },
-        { .bitrate = 480 },
-        { .bitrate = 540 }
-};
-
-#define ipw2200_a_rates         (ipw2200_rates + 4)
-#define ipw2200_num_a_rates     8
-#define ipw2200_bg_rates        (ipw2200_rates + 0)
-#define ipw2200_num_bg_rates    12
 
 #ifdef CONFIG_IPW2200_QOS
 static int qos_enable = 0;
@@ -8678,6 +8659,24 @@ static int ipw_sw_reset(struct ipw_priv *priv, int option)
  *
  */
 
+static int ipw_wx_get_name(struct net_device *dev,
+                           struct iw_request_info *info,
+                           union iwreq_data *wrqu, char *extra)
+{
+        struct ipw_priv *priv = libipw_priv(dev);
+        mutex_lock(&priv->mutex);
+        if (priv->status & STATUS_RF_KILL_MASK)
+                strcpy(wrqu->name, "radio off");
+        else if (!(priv->status & STATUS_ASSOCIATED))
+                strcpy(wrqu->name, "unassociated");
+        else
+                snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11%c",
+                         ipw_modes[priv->assoc_request.ieee_mode]);
+        IPW_DEBUG_WX("Name: %s\n", wrqu->name);
+        mutex_unlock(&priv->mutex);
+        return 0;
+}
+
 static int ipw_set_channel(struct ipw_priv *priv, u8 channel)
 {
         if (channel == 0) {
@@ -9977,7 +9976,7 @@ static int ipw_wx_sw_reset(struct net_device *dev,
 /* Rebase the WE IOCTLs to zero for the handler array */
 #define IW_IOCTL(x) [(x)-SIOCSIWCOMMIT]
 static iw_handler ipw_wx_handlers[] = {
-        IW_IOCTL(SIOCGIWNAME) = (iw_handler) cfg80211_wext_giwname,
+        IW_IOCTL(SIOCGIWNAME) = ipw_wx_get_name,
         IW_IOCTL(SIOCSIWFREQ) = ipw_wx_set_freq,
         IW_IOCTL(SIOCGIWFREQ) = ipw_wx_get_freq,
         IW_IOCTL(SIOCSIWMODE) = ipw_wx_set_mode,
@@ -11422,100 +11421,16 @@ static void ipw_bg_down(struct work_struct *work)
 /* Called by register_netdev() */
 static int ipw_net_init(struct net_device *dev)
 {
-        int i, rc = 0;
         struct ipw_priv *priv = libipw_priv(dev);
-        const struct libipw_geo *geo = libipw_get_geo(priv->ieee);
-        struct wireless_dev *wdev = &priv->ieee->wdev;
         mutex_lock(&priv->mutex);
 
         if (ipw_up(priv)) {
-                rc = -EIO;
-                goto out;
-        }
-
-        memcpy(wdev->wiphy->perm_addr, priv->mac_addr, ETH_ALEN);
-
-        /* fill-out priv->ieee->bg_band */
-        if (geo->bg_channels) {
-                struct ieee80211_supported_band *bg_band = &priv->ieee->bg_band;
-
-                bg_band->band = IEEE80211_BAND_2GHZ;
-                bg_band->n_channels = geo->bg_channels;
-                bg_band->channels =
-                        kzalloc(geo->bg_channels *
-                                sizeof(struct ieee80211_channel), GFP_KERNEL);
-                /* translate geo->bg to bg_band.channels */
-                for (i = 0; i < geo->bg_channels; i++) {
-                        bg_band->channels[i].band = IEEE80211_BAND_2GHZ;
-                        bg_band->channels[i].center_freq = geo->bg[i].freq;
-                        bg_band->channels[i].hw_value = geo->bg[i].channel;
-                        bg_band->channels[i].max_power = geo->bg[i].max_power;
-                        if (geo->bg[i].flags & LIBIPW_CH_PASSIVE_ONLY)
-                                bg_band->channels[i].flags |=
-                                        IEEE80211_CHAN_PASSIVE_SCAN;
-                        if (geo->bg[i].flags & LIBIPW_CH_NO_IBSS)
-                                bg_band->channels[i].flags |=
-                                        IEEE80211_CHAN_NO_IBSS;
-                        if (geo->bg[i].flags & LIBIPW_CH_RADAR_DETECT)
-                                bg_band->channels[i].flags |=
-                                        IEEE80211_CHAN_RADAR;
-                        /* No equivalent for LIBIPW_CH_80211H_RULES,
-                           LIBIPW_CH_UNIFORM_SPREADING, or
-                           LIBIPW_CH_B_ONLY... */
-                }
-                /* point at bitrate info */
-                bg_band->bitrates = ipw2200_bg_rates;
-                bg_band->n_bitrates = ipw2200_num_bg_rates;
-
-                wdev->wiphy->bands[IEEE80211_BAND_2GHZ] = bg_band;
-        }
-
-        /* fill-out priv->ieee->a_band */
-        if (geo->a_channels) {
-                struct ieee80211_supported_band *a_band = &priv->ieee->a_band;
-
-                a_band->band = IEEE80211_BAND_5GHZ;
-                a_band->n_channels = geo->a_channels;
-                a_band->channels =
-                        kzalloc(geo->a_channels *
-                                sizeof(struct ieee80211_channel), GFP_KERNEL);
-                /* translate geo->bg to a_band.channels */
-                for (i = 0; i < geo->a_channels; i++) {
-                        a_band->channels[i].band = IEEE80211_BAND_2GHZ;
-                        a_band->channels[i].center_freq = geo->a[i].freq;
-                        a_band->channels[i].hw_value = geo->a[i].channel;
-                        a_band->channels[i].max_power = geo->a[i].max_power;
-                        if (geo->a[i].flags & LIBIPW_CH_PASSIVE_ONLY)
-                                a_band->channels[i].flags |=
-                                        IEEE80211_CHAN_PASSIVE_SCAN;
-                        if (geo->a[i].flags & LIBIPW_CH_NO_IBSS)
-                                a_band->channels[i].flags |=
-                                        IEEE80211_CHAN_NO_IBSS;
-                        if (geo->a[i].flags & LIBIPW_CH_RADAR_DETECT)
-                                a_band->channels[i].flags |=
-                                        IEEE80211_CHAN_RADAR;
-                        /* No equivalent for LIBIPW_CH_80211H_RULES,
-                           LIBIPW_CH_UNIFORM_SPREADING, or
-                           LIBIPW_CH_B_ONLY... */
-                }
-                /* point at bitrate info */
-                a_band->bitrates = ipw2200_a_rates;
-                a_band->n_bitrates = ipw2200_num_a_rates;
-
-                wdev->wiphy->bands[IEEE80211_BAND_5GHZ] = a_band;
-        }
-
-        set_wiphy_dev(wdev->wiphy, &priv->pci_dev->dev);
-
-        /* With that information in place, we can now register the wiphy... */
-        if (wiphy_register(wdev->wiphy)) {
-                rc = -EIO;
-                goto out;
+                mutex_unlock(&priv->mutex);
+                return -EIO;
         }
 
-out:
         mutex_unlock(&priv->mutex);
-        return rc;
+        return 0;
 }
 
 /* PCI driver stuff */
@@ -11646,7 +11561,7 @@ static int ipw_prom_alloc(struct ipw_priv *priv)
         if (priv->prom_net_dev)
                 return -EPERM;
 
-        priv->prom_net_dev = alloc_ieee80211(sizeof(struct ipw_prom_priv), 1);
+        priv->prom_net_dev = alloc_ieee80211(sizeof(struct ipw_prom_priv));
         if (priv->prom_net_dev == NULL)
                 return -ENOMEM;
 
@@ -11665,7 +11580,7 @@ static int ipw_prom_alloc(struct ipw_priv *priv)
 
         rc = register_netdev(priv->prom_net_dev);
         if (rc) {
-                free_ieee80211(priv->prom_net_dev, 1);
+                free_ieee80211(priv->prom_net_dev);
                 priv->prom_net_dev = NULL;
                 return rc;
         }
@@ -11679,7 +11594,7 @@ static void ipw_prom_free(struct ipw_priv *priv)
                 return;
 
         unregister_netdev(priv->prom_net_dev);
-        free_ieee80211(priv->prom_net_dev, 1);
+        free_ieee80211(priv->prom_net_dev);
 
         priv->prom_net_dev = NULL;
 }
@@ -11707,7 +11622,7 @@ static int __devinit ipw_pci_probe(struct pci_dev *pdev,
         struct ipw_priv *priv;
         int i;
 
-        net_dev = alloc_ieee80211(sizeof(struct ipw_priv), 0);
+        net_dev = alloc_ieee80211(sizeof(struct ipw_priv));
         if (net_dev == NULL) {
                 err = -ENOMEM;
                 goto out;
@@ -11855,7 +11770,7 @@ static int __devinit ipw_pci_probe(struct pci_dev *pdev,
         pci_disable_device(pdev);
         pci_set_drvdata(pdev, NULL);
       out_free_ieee80211:
-        free_ieee80211(priv->net_dev, 0);
+        free_ieee80211(priv->net_dev);
       out:
         return err;
 }
@@ -11922,7 +11837,7 @@ static void __devexit ipw_pci_remove(struct pci_dev *pdev)
         pci_release_regions(pdev);
         pci_disable_device(pdev);
         pci_set_drvdata(pdev, NULL);
-        free_ieee80211(priv->net_dev, 0);
+        free_ieee80211(priv->net_dev);
         free_firmware();
 }
 
diff --git a/drivers/net/wireless/ipw2x00/libipw.h b/drivers/net/wireless/ipw2x00/libipw.h
index bf45391172f..1e334ff6bd5 100644
--- a/drivers/net/wireless/ipw2x00/libipw.h
+++ b/drivers/net/wireless/ipw2x00/libipw.h
@@ -31,7 +31,6 @@
 #include <linux/ieee80211.h>
 
 #include <net/lib80211.h>
-#include <net/cfg80211.h>
 
 #define LIBIPW_VERSION "git-1.1.13"
 
@@ -784,15 +783,12 @@ struct libipw_geo {
 
 struct libipw_device {
         struct net_device *dev;
-        struct wireless_dev wdev;
         struct libipw_security sec;
 
         /* Bookkeeping structures */
         struct libipw_stats ieee_stats;
 
         struct libipw_geo geo;
-        struct ieee80211_supported_band bg_band;
-        struct ieee80211_supported_band a_band;
 
         /* Probe / Beacon management */
         struct list_head network_free_list;
@@ -1018,8 +1014,8 @@ static inline int libipw_is_cck_rate(u8 rate)
 }
 
 /* ieee80211.c */
-extern void free_ieee80211(struct net_device *dev, int monitor);
-extern struct net_device *alloc_ieee80211(int sizeof_priv, int monitor);
+extern void free_ieee80211(struct net_device *dev);
+extern struct net_device *alloc_ieee80211(int sizeof_priv);
 extern int libipw_change_mtu(struct net_device *dev, int new_mtu);
 
 extern void libipw_networks_age(struct libipw_device *ieee,
diff --git a/drivers/net/wireless/ipw2x00/libipw_module.c b/drivers/net/wireless/ipw2x00/libipw_module.c
index a0e9f6aed7d..eb2b60834c1 100644
--- a/drivers/net/wireless/ipw2x00/libipw_module.c
+++ b/drivers/net/wireless/ipw2x00/libipw_module.c
@@ -62,9 +62,6 @@ MODULE_DESCRIPTION(DRV_DESCRIPTION);
 MODULE_AUTHOR(DRV_COPYRIGHT);
 MODULE_LICENSE("GPL");
 
-struct cfg80211_ops libipw_config_ops = { };
-void *libipw_wiphy_privid = &libipw_wiphy_privid;
-
 static int libipw_networks_allocate(struct libipw_device *ieee)
 {
         if (ieee->networks)
@@ -143,7 +140,7 @@ int libipw_change_mtu(struct net_device *dev, int new_mtu)
 }
 EXPORT_SYMBOL(libipw_change_mtu);
 
-struct net_device *alloc_ieee80211(int sizeof_priv, int monitor)
+struct net_device *alloc_ieee80211(int sizeof_priv)
 {
         struct libipw_device *ieee;
         struct net_device *dev;
@@ -160,31 +157,10 @@ struct net_device *alloc_ieee80211(int sizeof_priv, int monitor)
 
         ieee->dev = dev;
 
-        if (!monitor) {
-                ieee->wdev.wiphy = wiphy_new(&libipw_config_ops, 0);
-                if (!ieee->wdev.wiphy) {
-                        LIBIPW_ERROR("Unable to allocate wiphy.\n");
-                        goto failed_free_netdev;
-                }
-
-                ieee->dev->ieee80211_ptr = &ieee->wdev;
-                ieee->wdev.iftype = NL80211_IFTYPE_STATION;
-
-                /* Fill-out wiphy structure bits we know...  Not enough info
-                   here to call set_wiphy_dev or set MAC address or channel info
-                   -- have to do that in ->ndo_init... */
-                ieee->wdev.wiphy->privid = libipw_wiphy_privid;
-
-                ieee->wdev.wiphy->max_scan_ssids = 1;
-                ieee->wdev.wiphy->max_scan_ie_len = 0;
-                ieee->wdev.wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION)
-                                                | BIT(NL80211_IFTYPE_ADHOC);
-        }
-
         err = libipw_networks_allocate(ieee);
         if (err) {
                 LIBIPW_ERROR("Unable to allocate beacon storage: %d\n", err);
-                goto failed_free_wiphy;
+                goto failed_free_netdev;
         }
         libipw_networks_initialize(ieee);
 
@@ -217,31 +193,19 @@ struct net_device *alloc_ieee80211(int sizeof_priv, int monitor)
 
         return dev;
 
-failed_free_wiphy:
-        if (!monitor)
-                wiphy_free(ieee->wdev.wiphy);
 failed_free_netdev:
         free_netdev(dev);
 failed:
         return NULL;
 }
 
-void free_ieee80211(struct net_device *dev, int monitor)
+void free_ieee80211(struct net_device *dev)
 {
         struct libipw_device *ieee = netdev_priv(dev);
 
         lib80211_crypt_info_free(&ieee->crypt_info);
 
         libipw_networks_free(ieee);
-
-        /* free cfg80211 resources */
-        if (!monitor) {
-                wiphy_unregister(ieee->wdev.wiphy);
-                kfree(ieee->a_band.channels);
-                kfree(ieee->bg_band.channels);
-                wiphy_free(ieee->wdev.wiphy);
-        }
-
         free_netdev(dev);
 }
 
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945-rs.c b/drivers/net/wireless/iwlwifi/iwl-3945-rs.c
index dc81e19674f..d4b49883b30 100644
--- a/drivers/net/wireless/iwlwifi/iwl-3945-rs.c
+++ b/drivers/net/wireless/iwlwifi/iwl-3945-rs.c
@@ -355,7 +355,7 @@ static void rs_rate_init(void *priv_r, struct ieee80211_supported_band *sband,
 
         init_timer(&rs_sta->rate_scale_flush);
         rs_sta->rate_scale_flush.data = (unsigned long)rs_sta;
-        rs_sta->rate_scale_flush.function = &iwl3945_bg_rate_scale_flush;
+        rs_sta->rate_scale_flush.function = iwl3945_bg_rate_scale_flush;
 
         for (i = 0; i < IWL_RATE_COUNT_3945; i++)
                 iwl3945_clear_window(&rs_sta->win[i]);
diff --git a/drivers/net/wireless/p54/p54pci.c b/drivers/net/wireless/p54/p54pci.c
index d348c265e86..a15962a19b2 100644
--- a/drivers/net/wireless/p54/p54pci.c
+++ b/drivers/net/wireless/p54/p54pci.c
@@ -411,7 +411,7 @@ static int p54p_open(struct ieee80211_hw *dev)
         int err;
 
         init_completion(&priv->boot_comp);
-        err = request_irq(priv->pdev->irq, &p54p_interrupt,
+        err = request_irq(priv->pdev->irq, p54p_interrupt,
                           IRQF_SHARED, "p54pci", dev);
         if (err) {
                 dev_err(&priv->pdev->dev, "failed to register IRQ handler\n");
diff --git a/drivers/net/wireless/p54/p54usb.c b/drivers/net/wireless/p54/p54usb.c
index 17e199546ee..92af9b96bb7 100644
--- a/drivers/net/wireless/p54/p54usb.c
+++ b/drivers/net/wireless/p54/p54usb.c
@@ -426,12 +426,16 @@ static const char p54u_romboot_3887[] = "~~~~";
 static int p54u_firmware_reset_3887(struct ieee80211_hw *dev)
 {
         struct p54u_priv *priv = dev->priv;
-        u8 buf[4];
+        u8 *buf;
         int ret;
 
-        memcpy(&buf, p54u_romboot_3887, sizeof(buf));
+        buf = kmalloc(4, GFP_KERNEL);
+        if (!buf)
+                return -ENOMEM;
+        memcpy(buf, p54u_romboot_3887, 4);
         ret = p54u_bulk_msg(priv, P54U_PIPE_DATA,
-                            buf, sizeof(buf));
+                            buf, 4);
+        kfree(buf);
         if (ret)
                 dev_err(&priv->udev->dev, "(p54usb) unable to jump to "
                         "boot ROM (%d)!\n", ret);
diff --git a/drivers/net/wireless/rtl818x/rtl8180_dev.c b/drivers/net/wireless/rtl818x/rtl8180_dev.c
index 16429c49139..a1a3dd15c66 100644
--- a/drivers/net/wireless/rtl818x/rtl8180_dev.c
+++ b/drivers/net/wireless/rtl818x/rtl8180_dev.c
@@ -548,7 +548,7 @@ static int rtl8180_start(struct ieee80211_hw *dev)
         rtl818x_iowrite32(priv, &priv->map->TNPDA, priv->tx_ring[1].dma);
         rtl818x_iowrite32(priv, &priv->map->TLPDA, priv->tx_ring[0].dma);
 
-        ret = request_irq(priv->pdev->irq, &rtl8180_interrupt,
+        ret = request_irq(priv->pdev->irq, rtl8180_interrupt,
                           IRQF_SHARED, KBUILD_MODNAME, dev);
         if (ret) {
                 printk(KERN_ERR "%s: failed to register IRQ handler\n",
diff --git a/drivers/s390/net/Makefile b/drivers/s390/net/Makefile
index 96eddb3b1d0..6cab5a62f99 100644
--- a/drivers/s390/net/Makefile
+++ b/drivers/s390/net/Makefile
@@ -3,11 +3,11 @@
 #
 
 ctcm-y += ctcm_main.o ctcm_fsms.o ctcm_mpc.o ctcm_sysfs.o ctcm_dbug.o
-obj-$(CONFIG_CTCM) += ctcm.o fsm.o cu3088.o
+obj-$(CONFIG_CTCM) += ctcm.o fsm.o
 obj-$(CONFIG_NETIUCV) += netiucv.o fsm.o
 obj-$(CONFIG_SMSGIUCV) += smsgiucv.o
-obj-$(CONFIG_LCS) += lcs.o cu3088.o
-obj-$(CONFIG_CLAW) += claw.o cu3088.o
+obj-$(CONFIG_LCS) += lcs.o
+obj-$(CONFIG_CLAW) += claw.o
 qeth-y += qeth_core_sys.o qeth_core_main.o qeth_core_mpc.o
 obj-$(CONFIG_QETH) += qeth.o
 qeth_l2-y += qeth_l2_main.o
diff --git a/drivers/s390/net/claw.c b/drivers/s390/net/claw.c
index c63babefb69..3c77bfe0764 100644
--- a/drivers/s390/net/claw.c
+++ b/drivers/s390/net/claw.c
@@ -90,7 +90,6 @@
 #include <linux/timer.h>
 #include <linux/types.h>
 
-#include "cu3088.h"
 #include "claw.h"
 
 /*
@@ -258,6 +257,9 @@ static int claw_pm_prepare(struct ccwgroup_device *gdev)
         return -EPERM;
 }
 
+/* the root device for claw group devices */
+static struct device *claw_root_dev;
+
 /* ccwgroup table  */
 
 static struct ccwgroup_driver claw_group_driver = {
@@ -272,6 +274,47 @@ static struct ccwgroup_driver claw_group_driver = {
         .prepare     = claw_pm_prepare,
 };
 
+static struct ccw_device_id claw_ids[] = {
+        {CCW_DEVICE(0x3088, 0x61), .driver_info = claw_channel_type_claw},
+        {},
+};
+MODULE_DEVICE_TABLE(ccw, claw_ids);
+
+static struct ccw_driver claw_ccw_driver = {
+        .owner  = THIS_MODULE,
+        .name   = "claw",
+        .ids    = claw_ids,
+        .probe  = ccwgroup_probe_ccwdev,
+        .remove = ccwgroup_remove_ccwdev,
+};
+
+static ssize_t
+claw_driver_group_store(struct device_driver *ddrv, const char *buf,
+                        size_t count)
+{
+        int err;
+        err = ccwgroup_create_from_string(claw_root_dev,
+                                          claw_group_driver.driver_id,
+                                          &claw_ccw_driver, 3, buf);
+        return err ? err : count;
+}
+
+static DRIVER_ATTR(group, 0200, NULL, claw_driver_group_store);
+
+static struct attribute *claw_group_attrs[] = {
+        &driver_attr_group.attr,
+        NULL,
+};
+
+static struct attribute_group claw_group_attr_group = {
+        .attrs = claw_group_attrs,
+};
+
+static const struct attribute_group *claw_group_attr_groups[] = {
+        &claw_group_attr_group,
+        NULL,
+};
+
 /*
 *       Key functions
 */
@@ -3326,7 +3369,11 @@ claw_remove_files(struct device *dev)
 static void __exit
 claw_cleanup(void)
 {
-        unregister_cu3088_discipline(&claw_group_driver);
+        driver_remove_file(&claw_group_driver.driver,
+                           &driver_attr_group);
+        ccwgroup_driver_unregister(&claw_group_driver);
+        ccw_driver_unregister(&claw_ccw_driver);
+        root_device_unregister(claw_root_dev);
         claw_unregister_debug_facility();
         pr_info("Driver unloaded\n");
 
@@ -3348,16 +3395,31 @@ claw_init(void)
         if (ret) {
                 pr_err("Registering with the S/390 debug feature"
                         " failed with error code %d\n", ret);
-                return ret;
+                goto out_err;
         }
         CLAW_DBF_TEXT(2, setup, "init_mod");
-        ret = register_cu3088_discipline(&claw_group_driver);
-        if (ret) {
-                CLAW_DBF_TEXT(2, setup, "init_bad");
-                claw_unregister_debug_facility();
-                pr_err("Registering with the cu3088 device driver failed "
-                           "with error code %d\n", ret);
-        }
+        claw_root_dev = root_device_register("qeth");
+        ret = IS_ERR(claw_root_dev) ? PTR_ERR(claw_root_dev) : 0;
+        if (ret)
+                goto register_err;
+        ret = ccw_driver_register(&claw_ccw_driver);
+        if (ret)
+                goto ccw_err;
+        claw_group_driver.driver.groups = claw_group_attr_groups;
+        ret = ccwgroup_driver_register(&claw_group_driver);
+        if (ret)
+                goto ccwgroup_err;
+        return 0;
+
+ccwgroup_err:
+        ccw_driver_unregister(&claw_ccw_driver);
+ccw_err:
+        root_device_unregister(claw_root_dev);
+register_err:
+        CLAW_DBF_TEXT(2, setup, "init_bad");
+        claw_unregister_debug_facility();
+out_err:
+        pr_err("Initializing the claw device driver failed\n");
         return ret;
 }
 
diff --git a/drivers/s390/net/claw.h b/drivers/s390/net/claw.h
index 005072c420d..46d59a13db1 100644
--- a/drivers/s390/net/claw.h
+++ b/drivers/s390/net/claw.h
@@ -129,6 +129,18 @@ static inline int claw_dbf_passes(debug_info_t *dbf_grp, int level)
                 } \
         } while (0)
 
+/**
+ * Enum for classifying detected devices.
+ */
+enum claw_channel_types {
+        /* Device is not a channel  */
+        claw_channel_type_none,
+
+        /* Device is a CLAW channel device */
+        claw_channel_type_claw
+};
+
+
 /*******************************************************
 *  Define Control Blocks                               *
 *                                                      *
diff --git a/drivers/s390/net/ctcm_fsms.c b/drivers/s390/net/ctcm_fsms.c
index 4ded9ac2c5e..70eb7f13841 100644
--- a/drivers/s390/net/ctcm_fsms.c
+++ b/drivers/s390/net/ctcm_fsms.c
@@ -44,7 +44,6 @@
 #include <asm/idals.h>
 
 #include "fsm.h"
-#include "cu3088.h"
 
 #include "ctcm_dbug.h"
 #include "ctcm_main.h"
diff --git a/drivers/s390/net/ctcm_fsms.h b/drivers/s390/net/ctcm_fsms.h
index 2326aba9807..046d077fabb 100644
--- a/drivers/s390/net/ctcm_fsms.h
+++ b/drivers/s390/net/ctcm_fsms.h
@@ -39,7 +39,6 @@
 #include <asm/idals.h>
 
 #include "fsm.h"
-#include "cu3088.h"
 #include "ctcm_main.h"
 
 /*
diff --git a/drivers/s390/net/ctcm_main.c b/drivers/s390/net/ctcm_main.c
index db054ed1a8c..e35713dd050 100644
--- a/drivers/s390/net/ctcm_main.c
+++ b/drivers/s390/net/ctcm_main.c
@@ -51,12 +51,16 @@
 
 #include <asm/idals.h>
 
-#include "cu3088.h"
 #include "ctcm_fsms.h"
 #include "ctcm_main.h"
 
 /* Some common global variables */
 
+/**
+ * The root device for ctcm group devices
+ */
+static struct device *ctcm_root_dev;
+
 /*
  * Linked list of all detected channels.
  */
@@ -246,7 +250,7 @@ static void channel_remove(struct channel *ch)
  *
  * returns Pointer to a channel or NULL if no matching channel available.
  */
-static struct channel *channel_get(enum channel_types type,
+static struct channel *channel_get(enum ctcm_channel_types type,
                                         char *id, int direction)
 {
         struct channel *ch = channels;
@@ -1342,7 +1346,7 @@ static int ctcm_probe_device(struct ccwgroup_device *cgdev)
  *
  * returns 0 on success, !0 on error.
  */
-static int add_channel(struct ccw_device *cdev, enum channel_types type,
+static int add_channel(struct ccw_device *cdev, enum ctcm_channel_types type,
                                 struct ctcm_priv *priv)
 {
         struct channel **c = &channels;
@@ -1501,13 +1505,13 @@ free_return:	/* note that all channel pointers are 0 or valid */
 /*
  * Return type of a detected device.
  */
-static enum channel_types get_channel_type(struct ccw_device_id *id)
+static enum ctcm_channel_types get_channel_type(struct ccw_device_id *id)
 {
-        enum channel_types type;
-        type = (enum channel_types)id->driver_info;
+        enum ctcm_channel_types type;
+        type = (enum ctcm_channel_types)id->driver_info;
 
-        if (type == channel_type_ficon)
-                type = channel_type_escon;
+        if (type == ctcm_channel_type_ficon)
+                type = ctcm_channel_type_escon;
 
         return type;
 }
@@ -1525,7 +1529,7 @@ static int ctcm_new_device(struct ccwgroup_device *cgdev)
         char read_id[CTCM_ID_SIZE];
         char write_id[CTCM_ID_SIZE];
         int direction;
-        enum channel_types type;
+        enum ctcm_channel_types type;
         struct ctcm_priv *priv;
         struct net_device *dev;
         struct ccw_device *cdev0;
@@ -1720,6 +1724,11 @@ static int ctcm_pm_suspend(struct ccwgroup_device *gdev)
                 return 0;
         netif_device_detach(priv->channel[READ]->netdev);
         ctcm_close(priv->channel[READ]->netdev);
+        if (!wait_event_timeout(priv->fsm->wait_q,
+            fsm_getstate(priv->fsm) == DEV_STATE_STOPPED, CTCM_TIME_5_SEC)) {
+                netif_device_attach(priv->channel[READ]->netdev);
+                return -EBUSY;
+        }
         ccw_device_set_offline(gdev->cdev[1]);
         ccw_device_set_offline(gdev->cdev[0]);
         return 0;
@@ -1744,6 +1753,22 @@ err_out:
         return rc;
 }
 
+static struct ccw_device_id ctcm_ids[] = {
+        {CCW_DEVICE(0x3088, 0x08), .driver_info = ctcm_channel_type_parallel},
+        {CCW_DEVICE(0x3088, 0x1e), .driver_info = ctcm_channel_type_ficon},
+        {CCW_DEVICE(0x3088, 0x1f), .driver_info = ctcm_channel_type_escon},
+        {},
+};
+MODULE_DEVICE_TABLE(ccw, ctcm_ids);
+
+static struct ccw_driver ctcm_ccw_driver = {
+        .owner  = THIS_MODULE,
+        .name   = "ctcm",
+        .ids    = ctcm_ids,
+        .probe  = ccwgroup_probe_ccwdev,
+        .remove = ccwgroup_remove_ccwdev,
+};
+
 static struct ccwgroup_driver ctcm_group_driver = {
         .owner       = THIS_MODULE,
         .name        = CTC_DRIVER_NAME,
@@ -1758,6 +1783,33 @@ static struct ccwgroup_driver ctcm_group_driver = {
         .restore     = ctcm_pm_resume,
 };
 
+static ssize_t
+ctcm_driver_group_store(struct device_driver *ddrv, const char *buf,
+                        size_t count)
+{
+        int err;
+
+        err = ccwgroup_create_from_string(ctcm_root_dev,
+                                          ctcm_group_driver.driver_id,
+                                          &ctcm_ccw_driver, 2, buf);
+        return err ? err : count;
+}
+
+static DRIVER_ATTR(group, 0200, NULL, ctcm_driver_group_store);
+
+static struct attribute *ctcm_group_attrs[] = {
+        &driver_attr_group.attr,
+        NULL,
+};
+
+static struct attribute_group ctcm_group_attr_group = {
+        .attrs = ctcm_group_attrs,
+};
+
+static const struct attribute_group *ctcm_group_attr_groups[] = {
+        &ctcm_group_attr_group,
+        NULL,
+};
 
 /*
  * Module related routines
@@ -1771,7 +1823,10 @@ static struct ccwgroup_driver ctcm_group_driver = {
  */
 static void __exit ctcm_exit(void)
 {
-        unregister_cu3088_discipline(&ctcm_group_driver);
+        driver_remove_file(&ctcm_group_driver.driver, &driver_attr_group);
+        ccwgroup_driver_unregister(&ctcm_group_driver);
+        ccw_driver_unregister(&ctcm_ccw_driver);
+        root_device_unregister(ctcm_root_dev);
         ctcm_unregister_dbf_views();
         pr_info("CTCM driver unloaded\n");
 }
@@ -1797,17 +1852,31 @@ static int __init ctcm_init(void)
         channels = NULL;
 
         ret = ctcm_register_dbf_views();
-        if (ret) {
-                return ret;
-        }
-        ret = register_cu3088_discipline(&ctcm_group_driver);
-        if (ret) {
-                ctcm_unregister_dbf_views();
-                pr_err("%s / register_cu3088_discipline failed, ret = %d\n",
-                        __func__, ret);
-                return ret;
-        }
+        if (ret)
+                goto out_err;
+        ctcm_root_dev = root_device_register("ctcm");
+        ret = IS_ERR(ctcm_root_dev) ? PTR_ERR(ctcm_root_dev) : 0;
+        if (ret)
+                goto register_err;
+        ret = ccw_driver_register(&ctcm_ccw_driver);
+        if (ret)
+                goto ccw_err;
+        ctcm_group_driver.driver.groups = ctcm_group_attr_groups;
+        ret = ccwgroup_driver_register(&ctcm_group_driver);
+        if (ret)
+                goto ccwgroup_err;
         print_banner();
+        return 0;
+
+ccwgroup_err:
+        ccw_driver_unregister(&ctcm_ccw_driver);
+ccw_err:
+        root_device_unregister(ctcm_root_dev);
+register_err:
+        ctcm_unregister_dbf_views();
+out_err:
+        pr_err("%s / Initializing the ctcm device driver failed, ret = %d\n",
+                __func__, ret);
         return ret;
 }
 
diff --git a/drivers/s390/net/ctcm_main.h b/drivers/s390/net/ctcm_main.h
index d925e732b7d..d34fa14f44e 100644
--- a/drivers/s390/net/ctcm_main.h
+++ b/drivers/s390/net/ctcm_main.h
@@ -16,7 +16,6 @@
 #include <linux/netdevice.h>
 
 #include "fsm.h"
-#include "cu3088.h"
 #include "ctcm_dbug.h"
 #include "ctcm_mpc.h"
 
@@ -66,6 +65,23 @@
                         ctcmpc_dumpit(buf, len); \
         } while (0)
 
+/**
+ * Enum for classifying detected devices
+ */
+enum ctcm_channel_types {
+        /* Device is not a channel  */
+        ctcm_channel_type_none,
+
+        /* Device is a CTC/A */
+        ctcm_channel_type_parallel,
+
+        /* Device is a FICON channel */
+        ctcm_channel_type_ficon,
+
+        /* Device is a ESCON channel */
+        ctcm_channel_type_escon
+};
+
 /*
  * CCW commands, used in this driver.
  */
@@ -121,7 +137,7 @@ struct channel {
          * Type of this channel.
          * CTC/A or Escon for valid channels.
          */
-        enum channel_types type;
+        enum ctcm_channel_types type;
         /*
          * Misc. flags. See CHANNEL_FLAGS_... below
          */
diff --git a/drivers/s390/net/ctcm_mpc.c b/drivers/s390/net/ctcm_mpc.c
index 781e18be7e8..5978b390153 100644
--- a/drivers/s390/net/ctcm_mpc.c
+++ b/drivers/s390/net/ctcm_mpc.c
@@ -53,7 +53,6 @@
 #include <linux/moduleparam.h>
 #include <asm/idals.h>
 
-#include "cu3088.h"
 #include "ctcm_mpc.h"
 #include "ctcm_main.h"
 #include "ctcm_fsms.h"
diff --git a/drivers/s390/net/ctcm_sysfs.c b/drivers/s390/net/ctcm_sysfs.c
index 8452bb052d6..738ad26c74a 100644
--- a/drivers/s390/net/ctcm_sysfs.c
+++ b/drivers/s390/net/ctcm_sysfs.c
@@ -158,6 +158,15 @@ static ssize_t ctcm_proto_store(struct device *dev,
         return count;
 }
 
+const char *ctcm_type[] = {
+        "not a channel",
+        "CTC/A",
+        "FICON channel",
+        "ESCON channel",
+        "unknown channel type",
+        "unsupported channel type",
+};
+
 static ssize_t ctcm_type_show(struct device *dev,
                                 struct device_attribute *attr, char *buf)
 {
@@ -168,7 +177,7 @@ static ssize_t ctcm_type_show(struct device *dev,
                 return -ENODEV;
 
         return sprintf(buf, "%s\n",
-                        cu3088_type[cgdev->cdev[0]->id.driver_info]);
+                        ctcm_type[cgdev->cdev[0]->id.driver_info]);
 }
 
 static DEVICE_ATTR(buffer, 0644, ctcm_buffer_show, ctcm_buffer_write);
diff --git a/drivers/s390/net/cu3088.c b/drivers/s390/net/cu3088.c
deleted file mode 100644
index 48383459e99..00000000000
--- a/drivers/s390/net/cu3088.c
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * CTC / LCS ccw_device driver
- *
- * Copyright (C) 2002 IBM Deutschland Entwicklung GmbH, IBM Corporation
- * Author(s): Arnd Bergmann <arndb@de.ibm.com>
- *            Cornelia Huck <cornelia.huck@de.ibm.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/err.h>
-
-#include <asm/ccwdev.h>
-#include <asm/ccwgroup.h>
-
-#include "cu3088.h"
-
-const char *cu3088_type[] = {
-        "not a channel",
-        "CTC/A",
-        "ESCON channel",
-        "FICON channel",
-        "OSA LCS card",
-        "CLAW channel device",
-        "unknown channel type",
-        "unsupported channel type",
-};
-
-/* static definitions */
-
-static struct ccw_device_id cu3088_ids[] = {
-        { CCW_DEVICE(0x3088, 0x08), .driver_info = channel_type_parallel },
-        { CCW_DEVICE(0x3088, 0x1f), .driver_info = channel_type_escon },
-        { CCW_DEVICE(0x3088, 0x1e), .driver_info = channel_type_ficon },
-        { CCW_DEVICE(0x3088, 0x60), .driver_info = channel_type_osa2 },
-        { CCW_DEVICE(0x3088, 0x61), .driver_info = channel_type_claw },
-        { /* end of list */ }
-};
-
-static struct ccw_driver cu3088_driver;
-
-static struct device *cu3088_root_dev;
-
-static ssize_t
-group_write(struct device_driver *drv, const char *buf, size_t count)
-{
-        int ret;
-        struct ccwgroup_driver *cdrv;
-
-        cdrv = to_ccwgroupdrv(drv);
-        if (!cdrv)
-                return -EINVAL;
-        ret = ccwgroup_create_from_string(cu3088_root_dev, cdrv->driver_id,
-                                          &cu3088_driver, 2, buf);
-
-        return (ret == 0) ? count : ret;
-}
-
-static DRIVER_ATTR(group, 0200, NULL, group_write);
-
-/* Register-unregister for ctc&lcs */
-int
-register_cu3088_discipline(struct ccwgroup_driver *dcp)
-{
-        int rc;
-
-        if (!dcp)
-                return -EINVAL;
-
-        /* Register discipline.*/
-        rc = ccwgroup_driver_register(dcp);
-        if (rc)
-                return rc;
-
-        rc = driver_create_file(&dcp->driver, &driver_attr_group);
-        if (rc)
-                ccwgroup_driver_unregister(dcp);
-
-        return rc;
-
-}
-
-void
-unregister_cu3088_discipline(struct ccwgroup_driver *dcp)
-{
-        if (!dcp)
-                return;
-
-        driver_remove_file(&dcp->driver, &driver_attr_group);
-        ccwgroup_driver_unregister(dcp);
-}
-
-static struct ccw_driver cu3088_driver = {
-        .owner       = THIS_MODULE,
-        .ids         = cu3088_ids,
-        .name        = "cu3088",
-        .probe       = ccwgroup_probe_ccwdev,
-        .remove      = ccwgroup_remove_ccwdev,
-};
-
-/* module setup */
-static int __init
-cu3088_init (void)
-{
-        int rc;
-
-        cu3088_root_dev = root_device_register("cu3088");
-        if (IS_ERR(cu3088_root_dev))
-                return PTR_ERR(cu3088_root_dev);
-        rc = ccw_driver_register(&cu3088_driver);
-        if (rc)
-                root_device_unregister(cu3088_root_dev);
-
-        return rc;
-}
-
-static void __exit
-cu3088_exit (void)
-{
-        ccw_driver_unregister(&cu3088_driver);
-        root_device_unregister(cu3088_root_dev);
-}
-
-MODULE_DEVICE_TABLE(ccw,cu3088_ids);
-MODULE_AUTHOR("Arnd Bergmann <arndb@de.ibm.com>");
-MODULE_LICENSE("GPL");
-
-module_init(cu3088_init);
-module_exit(cu3088_exit);
-
-EXPORT_SYMBOL_GPL(cu3088_type);
-EXPORT_SYMBOL_GPL(register_cu3088_discipline);
-EXPORT_SYMBOL_GPL(unregister_cu3088_discipline);
diff --git a/drivers/s390/net/cu3088.h b/drivers/s390/net/cu3088.h
deleted file mode 100644
index d8558a7105a..00000000000
--- a/drivers/s390/net/cu3088.h
+++ /dev/null
@@ -1,41 +0,0 @@
-#ifndef _CU3088_H
-#define _CU3088_H
-
-/**
- * Enum for classifying detected devices.
- */
-enum channel_types {
-        /* Device is not a channel  */
-        channel_type_none,
-
-        /* Device is a CTC/A */
-        channel_type_parallel,
-
-        /* Device is a ESCON channel */
-        channel_type_escon,
-
-        /* Device is a FICON channel */
-        channel_type_ficon,
-
-        /* Device is a OSA2 card */
-        channel_type_osa2,
-
-        /* Device is a CLAW channel device */
-        channel_type_claw,
-
-        /* Device is a channel, but we don't know
-         * anything about it */
-        channel_type_unknown,
-
-        /* Device is an unsupported model */
-        channel_type_unsupported,
-
-        /* number of type entries */
-        num_channel_types
-};
-
-extern const char *cu3088_type[num_channel_types];
-extern int register_cu3088_discipline(struct ccwgroup_driver *);
-extern void unregister_cu3088_discipline(struct ccwgroup_driver *);
-
-#endif
diff --git a/drivers/s390/net/fsm.c b/drivers/s390/net/fsm.c
index 2c1db8036b7..cae48cbc5e9 100644
--- a/drivers/s390/net/fsm.c
+++ b/drivers/s390/net/fsm.c
@@ -27,6 +27,7 @@ init_fsm(char *name, const char **state_names, const char **event_names, int nr_
                 return NULL;
         }
         strlcpy(this->name, name, sizeof(this->name));
+        init_waitqueue_head(&this->wait_q);
 
         f = kzalloc(sizeof(fsm), order);
         if (f == NULL) {
diff --git a/drivers/s390/net/fsm.h b/drivers/s390/net/fsm.h
index af679c10f1b..1e8b235d95b 100644
--- a/drivers/s390/net/fsm.h
+++ b/drivers/s390/net/fsm.h
@@ -66,6 +66,7 @@ typedef struct fsm_instance_t {
         char name[16];
         void *userdata;
         int userint;
+        wait_queue_head_t wait_q;
 #if FSM_DEBUG_HISTORY
         int         history_index;
         int         history_size;
@@ -197,6 +198,7 @@ fsm_newstate(fsm_instance *fi, int newstate)
         printk(KERN_DEBUG "fsm(%s): New state %s\n", fi->name,
                 fi->f->state_names[newstate]);
 #endif
+        wake_up(&fi->wait_q);
 }
 
 /**
diff --git a/drivers/s390/net/lcs.c b/drivers/s390/net/lcs.c
index 5e46415d3e1..f6cc46dc050 100644
--- a/drivers/s390/net/lcs.c
+++ b/drivers/s390/net/lcs.c
@@ -47,7 +47,6 @@
 #include <asm/ccwgroup.h>
 
 #include "lcs.h"
-#include "cu3088.h"
 
 
 #if !defined(CONFIG_NET_ETHERNET) && \
@@ -60,7 +59,11 @@
  */
 
 static char version[] __initdata = "LCS driver";
-static char debug_buffer[255];
+
+/**
+  * the root device for lcs group devices
+  */
+static struct device *lcs_root_dev;
 
 /**
  * Some prototypes.
@@ -76,6 +79,7 @@ static int lcs_recovery(void *ptr);
 /**
  * Debug Facility Stuff
  */
+static char debug_buffer[255];
 static debug_info_t *lcs_dbf_setup;
 static debug_info_t *lcs_dbf_trace;
 
@@ -1968,6 +1972,15 @@ lcs_portno_store (struct device *dev, struct device_attribute *attr, const char
 
 static DEVICE_ATTR(portno, 0644, lcs_portno_show, lcs_portno_store);
 
+const char *lcs_type[] = {
+        "not a channel",
+        "2216 parallel",
+        "2216 channel",
+        "OSA LCS card",
+        "unknown channel type",
+        "unsupported channel type",
+};
+
 static ssize_t
 lcs_type_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
@@ -1977,7 +1990,7 @@ lcs_type_show(struct device *dev, struct device_attribute *attr, char *buf)
         if (!cgdev)
                 return -ENODEV;
 
-        return sprintf(buf, "%s\n", cu3088_type[cgdev->cdev[0]->id.driver_info]);
+        return sprintf(buf, "%s\n", lcs_type[cgdev->cdev[0]->id.driver_info]);
 }
 
 static DEVICE_ATTR(type, 0444, lcs_type_show, NULL);
@@ -2370,6 +2383,22 @@ static int lcs_restore(struct ccwgroup_device *gdev)
         return lcs_pm_resume(card);
 }
 
+static struct ccw_device_id lcs_ids[] = {
+        {CCW_DEVICE(0x3088, 0x08), .driver_info = lcs_channel_type_parallel},
+        {CCW_DEVICE(0x3088, 0x1f), .driver_info = lcs_channel_type_2216},
+        {CCW_DEVICE(0x3088, 0x60), .driver_info = lcs_channel_type_osa2},
+        {},
+};
+MODULE_DEVICE_TABLE(ccw, lcs_ids);
+
+static struct ccw_driver lcs_ccw_driver = {
+        .owner  = THIS_MODULE,
+        .name   = "lcs",
+        .ids    = lcs_ids,
+        .probe  = ccwgroup_probe_ccwdev,
+        .remove = ccwgroup_remove_ccwdev,
+};
+
 /**
  * LCS ccwgroup driver registration
  */
@@ -2389,6 +2418,33 @@ static struct ccwgroup_driver lcs_group_driver = {
         .restore     = lcs_restore,
 };
 
+static ssize_t
+lcs_driver_group_store(struct device_driver *ddrv, const char *buf,
+                       size_t count)
+{
+        int err;
+        err = ccwgroup_create_from_string(lcs_root_dev,
+                                          lcs_group_driver.driver_id,
+                                          &lcs_ccw_driver, 2, buf);
+        return err ? err : count;
+}
+
+static DRIVER_ATTR(group, 0200, NULL, lcs_driver_group_store);
+
+static struct attribute *lcs_group_attrs[] = {
+        &driver_attr_group.attr,
+        NULL,
+};
+
+static struct attribute_group lcs_group_attr_group = {
+        .attrs = lcs_group_attrs,
+};
+
+static const struct attribute_group *lcs_group_attr_groups[] = {
+        &lcs_group_attr_group,
+        NULL,
+};
+
 /**
  *  LCS Module/Kernel initialization function
  */
@@ -2400,17 +2456,30 @@ __init lcs_init_module(void)
         pr_info("Loading %s\n", version);
         rc = lcs_register_debug_facility();
         LCS_DBF_TEXT(0, setup, "lcsinit");
-        if (rc) {
-                pr_err("Initialization failed\n");
-                return rc;
-        }
-
-        rc = register_cu3088_discipline(&lcs_group_driver);
-        if (rc) {
-                pr_err("Initialization failed\n");
-                return rc;
-        }
+        if (rc)
+                goto out_err;
+        lcs_root_dev = root_device_register("lcs");
+        rc = IS_ERR(lcs_root_dev) ? PTR_ERR(lcs_root_dev) : 0;
+        if (rc)
+                goto register_err;
+        rc = ccw_driver_register(&lcs_ccw_driver);
+        if (rc)
+                goto ccw_err;
+        lcs_group_driver.driver.groups = lcs_group_attr_groups;
+        rc = ccwgroup_driver_register(&lcs_group_driver);
+        if (rc)
+                goto ccwgroup_err;
         return 0;
+
+ccwgroup_err:
+        ccw_driver_unregister(&lcs_ccw_driver);
+ccw_err:
+        root_device_unregister(lcs_root_dev);
+register_err:
+        lcs_unregister_debug_facility();
+out_err:
+        pr_err("Initializing the lcs device driver failed\n");
+        return rc;
 }
 
 
@@ -2422,7 +2491,11 @@ __exit lcs_cleanup_module(void)
 {
         pr_info("Terminating lcs module.\n");
         LCS_DBF_TEXT(0, trace, "cleanup");
-        unregister_cu3088_discipline(&lcs_group_driver);
+        driver_remove_file(&lcs_group_driver.driver,
+                           &driver_attr_group);
+        ccwgroup_driver_unregister(&lcs_group_driver);
+        ccw_driver_unregister(&lcs_ccw_driver);
+        root_device_unregister(lcs_root_dev);
         lcs_unregister_debug_facility();
 }
 
diff --git a/drivers/s390/net/lcs.h b/drivers/s390/net/lcs.h
index 6d668642af2..8c03392ac83 100644
--- a/drivers/s390/net/lcs.h
+++ b/drivers/s390/net/lcs.h
@@ -36,6 +36,24 @@ static inline int lcs_dbf_passes(debug_info_t *dbf_grp, int level)
 #define CARD_FROM_DEV(cdev) \
         (struct lcs_card *) dev_get_drvdata( \
                 &((struct ccwgroup_device *)dev_get_drvdata(&cdev->dev))->dev);
+
+/**
+ * Enum for classifying detected devices.
+ */
+enum lcs_channel_types {
+        /* Device is not a channel  */
+        lcs_channel_type_none,
+
+        /* Device is a 2216 channel */
+        lcs_channel_type_parallel,
+
+        /* Device is a 2216 channel */
+        lcs_channel_type_2216,
+
+        /* Device is a OSA2 card */
+        lcs_channel_type_osa2
+};
+
 /**
  * CCW commands used in this driver
  */
diff --git a/drivers/s390/net/netiucv.c b/drivers/s390/net/netiucv.c
index c84eadd3602..395c04c2b00 100644
--- a/drivers/s390/net/netiucv.c
+++ b/drivers/s390/net/netiucv.c
@@ -741,13 +741,13 @@ static void conn_action_txdone(fsm_instance *fi, int event, void *arg)
         if (single_flag) {
                 if ((skb = skb_dequeue(&conn->commit_queue))) {
                         atomic_dec(&skb->users);
-                        dev_kfree_skb_any(skb);
                         if (privptr) {
                                 privptr->stats.tx_packets++;
                                 privptr->stats.tx_bytes +=
                                         (skb->len - NETIUCV_HDRLEN
-                                                  - NETIUCV_HDRLEN);
+                                                  - NETIUCV_HDRLEN);
                         }
+                        dev_kfree_skb_any(skb);
                 }
         }
         conn->tx_buff->data = conn->tx_buff->head;
diff --git a/drivers/s390/net/qeth_core.h b/drivers/s390/net/qeth_core.h
index e8f72d715eb..b232693378c 100644
--- a/drivers/s390/net/qeth_core.h
+++ b/drivers/s390/net/qeth_core.h
@@ -122,7 +122,6 @@ struct qeth_perf_stats {
         __u64 outbound_do_qdio_start_time;
         unsigned int outbound_do_qdio_cnt;
         unsigned int outbound_do_qdio_time;
-        /* eddp data */
         unsigned int large_send_bytes;
         unsigned int large_send_cnt;
         unsigned int sg_skbs_sent;
@@ -135,6 +134,7 @@ struct qeth_perf_stats {
         unsigned int sg_frags_rx;
         unsigned int sg_alloc_page_rx;
         unsigned int tx_csum;
+        unsigned int tx_lin;
 };
 
 /* Routing stuff */
@@ -648,6 +648,7 @@ struct qeth_card_options {
         enum qeth_large_send_types large_send;
         int performance_stats;
         int rx_sg_cb;
+        enum qeth_ipa_isolation_modes isolation;
 };
 
 /*
@@ -776,7 +777,6 @@ static inline void qeth_put_buffer_pool_entry(struct qeth_card *card,
         list_add_tail(&entry->list, &card->qdio.in_buf_pool.entry_list);
 }
 
-struct qeth_eddp_context;
 extern struct ccwgroup_driver qeth_l2_ccwgroup_driver;
 extern struct ccwgroup_driver qeth_l3_ccwgroup_driver;
 const char *qeth_get_cardname_short(struct qeth_card *);
@@ -836,7 +836,6 @@ void qeth_prepare_ipa_cmd(struct qeth_card *, struct qeth_cmd_buffer *, char);
 struct qeth_cmd_buffer *qeth_wait_for_buffer(struct qeth_channel *);
 int qeth_mdio_read(struct net_device *, int, int);
 int qeth_snmp_command(struct qeth_card *, char __user *);
-int qeth_set_large_send(struct qeth_card *, enum qeth_large_send_types);
 struct qeth_cmd_buffer *qeth_get_adapter_cmd(struct qeth_card *, __u32, __u32);
 int qeth_default_setadapterparms_cb(struct qeth_card *, struct qeth_reply *,
                                         unsigned long);
@@ -856,6 +855,7 @@ void qeth_core_get_strings(struct net_device *, u32, u8 *);
 void qeth_core_get_drvinfo(struct net_device *, struct ethtool_drvinfo *);
 void qeth_dbf_longtext(enum qeth_dbf_names dbf_nix, int level, char *text, ...);
 int qeth_core_ethtool_get_settings(struct net_device *, struct ethtool_cmd *);
+int qeth_set_access_ctrl_online(struct qeth_card *card);
 
 /* exports for OSN */
 int qeth_osn_assist(struct net_device *, void *, int);
diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c
index edee4dc6430..d34804d5ece 100644
--- a/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
@@ -270,41 +270,6 @@ int qeth_realloc_buffer_pool(struct qeth_card *card, int bufcnt)
         return qeth_alloc_buffer_pool(card);
 }
 
-int qeth_set_large_send(struct qeth_card *card,
-                enum qeth_large_send_types type)
-{
-        int rc = 0;
-
-        if (card->dev == NULL) {
-                card->options.large_send = type;
-                return 0;
-        }
-        if (card->state == CARD_STATE_UP)
-                netif_tx_disable(card->dev);
-        card->options.large_send = type;
-        switch (card->options.large_send) {
-        case QETH_LARGE_SEND_TSO:
-                if (qeth_is_supported(card, IPA_OUTBOUND_TSO)) {
-                        card->dev->features |= NETIF_F_TSO | NETIF_F_SG |
-                                                NETIF_F_HW_CSUM;
-                } else {
-                        card->dev->features &= ~(NETIF_F_TSO | NETIF_F_SG |
-                                                NETIF_F_HW_CSUM);
-                        card->options.large_send = QETH_LARGE_SEND_NO;
-                        rc = -EOPNOTSUPP;
-                }
-                break;
-        default: /* includes QETH_LARGE_SEND_NO */
-                card->dev->features &= ~(NETIF_F_TSO | NETIF_F_SG |
-                                        NETIF_F_HW_CSUM);
-                break;
-        }
-        if (card->state == CARD_STATE_UP)
-                netif_wake_queue(card->dev);
-        return rc;
-}
-EXPORT_SYMBOL_GPL(qeth_set_large_send);
-
 static int qeth_issue_next_read(struct qeth_card *card)
 {
         int rc;
@@ -1079,6 +1044,7 @@ static void qeth_set_intial_options(struct qeth_card *card)
         card->options.add_hhlen = DEFAULT_ADD_HHLEN;
         card->options.performance_stats = 0;
         card->options.rx_sg_cb = QETH_RX_SG_CB;
+        card->options.isolation = ISOLATION_MODE_NONE;
 }
 
 static int qeth_do_start_thread(struct qeth_card *card, unsigned long thread)
@@ -3389,6 +3355,156 @@ int qeth_setadpparms_change_macaddr(struct qeth_card *card)
 }
 EXPORT_SYMBOL_GPL(qeth_setadpparms_change_macaddr);
 
+static int qeth_setadpparms_set_access_ctrl_cb(struct qeth_card *card,
+                struct qeth_reply *reply, unsigned long data)
+{
+        struct qeth_ipa_cmd *cmd;
+        struct qeth_set_access_ctrl *access_ctrl_req;
+        int rc;
+
+        QETH_DBF_TEXT(TRACE, 4, "setaccb");
+
+        cmd = (struct qeth_ipa_cmd *) data;
+        access_ctrl_req = &cmd->data.setadapterparms.data.set_access_ctrl;
+        QETH_DBF_TEXT_(SETUP, 2, "setaccb");
+        QETH_DBF_TEXT_(SETUP, 2, "%s", card->gdev->dev.kobj.name);
+        QETH_DBF_TEXT_(SETUP, 2, "rc=%d",
+                cmd->data.setadapterparms.hdr.return_code);
+        switch (cmd->data.setadapterparms.hdr.return_code) {
+        case SET_ACCESS_CTRL_RC_SUCCESS:
+        case SET_ACCESS_CTRL_RC_ALREADY_NOT_ISOLATED:
+        case SET_ACCESS_CTRL_RC_ALREADY_ISOLATED:
+        {
+                card->options.isolation = access_ctrl_req->subcmd_code;
+                if (card->options.isolation == ISOLATION_MODE_NONE) {
+                        dev_info(&card->gdev->dev,
+                            "QDIO data connection isolation is deactivated\n");
+                } else {
+                        dev_info(&card->gdev->dev,
+                            "QDIO data connection isolation is activated\n");
+                }
+                QETH_DBF_MESSAGE(3, "OK:SET_ACCESS_CTRL(%s, %d)==%d\n",
+                        card->gdev->dev.kobj.name,
+                        access_ctrl_req->subcmd_code,
+                        cmd->data.setadapterparms.hdr.return_code);
+                rc = 0;
+                break;
+        }
+        case SET_ACCESS_CTRL_RC_NOT_SUPPORTED:
+        {
+                QETH_DBF_MESSAGE(3, "ERR:SET_ACCESS_CTRL(%s,%d)==%d\n",
+                        card->gdev->dev.kobj.name,
+                        access_ctrl_req->subcmd_code,
+                        cmd->data.setadapterparms.hdr.return_code);
+                dev_err(&card->gdev->dev, "Adapter does not "
+                        "support QDIO data connection isolation\n");
+
+                /* ensure isolation mode is "none" */
+                card->options.isolation = ISOLATION_MODE_NONE;
+                rc = -EOPNOTSUPP;
+                break;
+        }
+        case SET_ACCESS_CTRL_RC_NONE_SHARED_ADAPTER:
+        {
+                QETH_DBF_MESSAGE(3, "ERR:SET_ACCESS_MODE(%s,%d)==%d\n",
+                        card->gdev->dev.kobj.name,
+                        access_ctrl_req->subcmd_code,
+                        cmd->data.setadapterparms.hdr.return_code);
+                dev_err(&card->gdev->dev,
+                        "Adapter is dedicated. "
+                        "QDIO data connection isolation not supported\n");
+
+                /* ensure isolation mode is "none" */
+                card->options.isolation = ISOLATION_MODE_NONE;
+                rc = -EOPNOTSUPP;
+                break;
+        }
+        case SET_ACCESS_CTRL_RC_ACTIVE_CHECKSUM_OFF:
+        {
+                QETH_DBF_MESSAGE(3, "ERR:SET_ACCESS_MODE(%s,%d)==%d\n",
+                        card->gdev->dev.kobj.name,
+                        access_ctrl_req->subcmd_code,
+                        cmd->data.setadapterparms.hdr.return_code);
+                dev_err(&card->gdev->dev,
+                        "TSO does not permit QDIO data connection isolation\n");
+
+                /* ensure isolation mode is "none" */
+                card->options.isolation = ISOLATION_MODE_NONE;
+                rc = -EPERM;
+                break;
+        }
+        default:
+        {
+                /* this should never happen */
+                QETH_DBF_MESSAGE(3, "ERR:SET_ACCESS_MODE(%s,%d)==%d"
+                        "==UNKNOWN\n",
+                        card->gdev->dev.kobj.name,
+                        access_ctrl_req->subcmd_code,
+                        cmd->data.setadapterparms.hdr.return_code);
+
+                /* ensure isolation mode is "none" */
+                card->options.isolation = ISOLATION_MODE_NONE;
+                rc = 0;
+                break;
+        }
+        }
+        qeth_default_setadapterparms_cb(card, reply, (unsigned long) cmd);
+        return rc;
+}
+
+static int qeth_setadpparms_set_access_ctrl(struct qeth_card *card,
+                enum qeth_ipa_isolation_modes isolation)
+{
+        int rc;
+        struct qeth_cmd_buffer *iob;
+        struct qeth_ipa_cmd *cmd;
+        struct qeth_set_access_ctrl *access_ctrl_req;
+
+        QETH_DBF_TEXT(TRACE, 4, "setacctl");
+
+        QETH_DBF_TEXT_(SETUP, 2, "setacctl");
+        QETH_DBF_TEXT_(SETUP, 2, "%s", card->gdev->dev.kobj.name);
+
+        iob = qeth_get_adapter_cmd(card, IPA_SETADP_SET_ACCESS_CONTROL,
+                                   sizeof(struct qeth_ipacmd_setadpparms_hdr) +
+                                   sizeof(struct qeth_set_access_ctrl));
+        cmd = (struct qeth_ipa_cmd *)(iob->data+IPA_PDU_HEADER_SIZE);
+        access_ctrl_req = &cmd->data.setadapterparms.data.set_access_ctrl;
+        access_ctrl_req->subcmd_code = isolation;
+
+        rc = qeth_send_ipa_cmd(card, iob, qeth_setadpparms_set_access_ctrl_cb,
+                               NULL);
+        QETH_DBF_TEXT_(SETUP, 2, "rc=%d", rc);
+        return rc;
+}
+
+int qeth_set_access_ctrl_online(struct qeth_card *card)
+{
+        int rc = 0;
+
+        QETH_DBF_TEXT(TRACE, 4, "setactlo");
+
+        if (card->info.type == QETH_CARD_TYPE_OSAE &&
+            qeth_adp_supported(card, IPA_SETADP_SET_ACCESS_CONTROL)) {
+                rc = qeth_setadpparms_set_access_ctrl(card,
+                        card->options.isolation);
+                if (rc) {
+                        QETH_DBF_MESSAGE(3,
+                                "IPA(SET_ACCESS_CTRL,%s,%d) sent failed",
+                                card->gdev->dev.kobj.name,
+                                rc);
+                }
+        } else if (card->options.isolation != ISOLATION_MODE_NONE) {
+                card->options.isolation = ISOLATION_MODE_NONE;
+
+                dev_err(&card->gdev->dev, "Adapter does not "
+                        "support QDIO data connection isolation\n");
+                rc = -EOPNOTSUPP;
+        }
+        return rc;
+}
+EXPORT_SYMBOL_GPL(qeth_set_access_ctrl_online);
+
 void qeth_tx_timeout(struct net_device *dev)
 {
         struct qeth_card *card;
@@ -3732,30 +3848,36 @@ static int qeth_core_driver_group(const char *buf, struct device *root_dev,
 int qeth_core_hardsetup_card(struct qeth_card *card)
 {
         struct qdio_ssqd_desc *ssqd;
-        int retries = 3;
+        int retries = 0;
         int mpno = 0;
         int rc;
 
         QETH_DBF_TEXT(SETUP, 2, "hrdsetup");
         atomic_set(&card->force_alloc_skb, 0);
 retry:
-        if (retries < 3) {
+        if (retries)
                 QETH_DBF_MESSAGE(2, "%s Retrying to do IDX activates.\n",
                         dev_name(&card->gdev->dev));
-                ccw_device_set_offline(CARD_DDEV(card));
-                ccw_device_set_offline(CARD_WDEV(card));
-                ccw_device_set_offline(CARD_RDEV(card));
-                ccw_device_set_online(CARD_RDEV(card));
-                ccw_device_set_online(CARD_WDEV(card));
-                ccw_device_set_online(CARD_DDEV(card));
-        }
+        ccw_device_set_offline(CARD_DDEV(card));
+        ccw_device_set_offline(CARD_WDEV(card));
+        ccw_device_set_offline(CARD_RDEV(card));
+        rc = ccw_device_set_online(CARD_RDEV(card));
+        if (rc)
+                goto retriable;
+        rc = ccw_device_set_online(CARD_WDEV(card));
+        if (rc)
+                goto retriable;
+        rc = ccw_device_set_online(CARD_DDEV(card));
+        if (rc)
+                goto retriable;
         rc = qeth_qdio_clear_card(card, card->info.type != QETH_CARD_TYPE_IQD);
+retriable:
         if (rc == -ERESTARTSYS) {
                 QETH_DBF_TEXT(SETUP, 2, "break1");
                 return rc;
         } else if (rc) {
                 QETH_DBF_TEXT_(SETUP, 2, "1err%d", rc);
-                if (--retries < 0)
+                if (++retries > 3)
                         goto out;
                 else
                         goto retry;
@@ -4303,6 +4425,7 @@ static struct {
         {"tx do_QDIO time"},
         {"tx do_QDIO count"},
         {"tx csum"},
+        {"tx lin"},
 };
 
 int qeth_core_get_sset_count(struct net_device *dev, int stringset)
@@ -4360,6 +4483,7 @@ void qeth_core_get_ethtool_stats(struct net_device *dev,
         data[31] = card->perf_stats.outbound_do_qdio_time;
         data[32] = card->perf_stats.outbound_do_qdio_cnt;
         data[33] = card->perf_stats.tx_csum;
+        data[34] = card->perf_stats.tx_lin;
 }
 EXPORT_SYMBOL_GPL(qeth_core_get_ethtool_stats);
 
diff --git a/drivers/s390/net/qeth_core_mpc.h b/drivers/s390/net/qeth_core_mpc.h
index eecb2ee62e8..52c03438dbe 100644
--- a/drivers/s390/net/qeth_core_mpc.h
+++ b/drivers/s390/net/qeth_core_mpc.h
@@ -234,18 +234,19 @@ enum qeth_ipa_setdelip_flags {
 
 /* SETADAPTER IPA Command: ****************************************************/
 enum qeth_ipa_setadp_cmd {
-        IPA_SETADP_QUERY_COMMANDS_SUPPORTED     = 0x0001,
-        IPA_SETADP_ALTER_MAC_ADDRESS            = 0x0002,
-        IPA_SETADP_ADD_DELETE_GROUP_ADDRESS     = 0x0004,
-        IPA_SETADP_ADD_DELETE_FUNCTIONAL_ADDR   = 0x0008,
-        IPA_SETADP_SET_ADDRESSING_MODE          = 0x0010,
-        IPA_SETADP_SET_CONFIG_PARMS             = 0x0020,
-        IPA_SETADP_SET_CONFIG_PARMS_EXTENDED    = 0x0040,
-        IPA_SETADP_SET_BROADCAST_MODE           = 0x0080,
-        IPA_SETADP_SEND_OSA_MESSAGE             = 0x0100,
-        IPA_SETADP_SET_SNMP_CONTROL             = 0x0200,
-        IPA_SETADP_QUERY_CARD_INFO              = 0x0400,
-        IPA_SETADP_SET_PROMISC_MODE             = 0x0800,
+        IPA_SETADP_QUERY_COMMANDS_SUPPORTED     = 0x00000001L,
+        IPA_SETADP_ALTER_MAC_ADDRESS            = 0x00000002L,
+        IPA_SETADP_ADD_DELETE_GROUP_ADDRESS     = 0x00000004L,
+        IPA_SETADP_ADD_DELETE_FUNCTIONAL_ADDR   = 0x00000008L,
+        IPA_SETADP_SET_ADDRESSING_MODE          = 0x00000010L,
+        IPA_SETADP_SET_CONFIG_PARMS             = 0x00000020L,
+        IPA_SETADP_SET_CONFIG_PARMS_EXTENDED    = 0x00000040L,
+        IPA_SETADP_SET_BROADCAST_MODE           = 0x00000080L,
+        IPA_SETADP_SEND_OSA_MESSAGE             = 0x00000100L,
+        IPA_SETADP_SET_SNMP_CONTROL             = 0x00000200L,
+        IPA_SETADP_QUERY_CARD_INFO              = 0x00000400L,
+        IPA_SETADP_SET_PROMISC_MODE             = 0x00000800L,
+        IPA_SETADP_SET_ACCESS_CONTROL           = 0x00010000L,
 };
 enum qeth_ipa_mac_ops {
         CHANGE_ADDR_READ_MAC            = 0,
@@ -264,6 +265,20 @@ enum qeth_ipa_promisc_modes {
         SET_PROMISC_MODE_OFF            = 0,
         SET_PROMISC_MODE_ON             = 1,
 };
+enum qeth_ipa_isolation_modes {
+        ISOLATION_MODE_NONE             = 0x00000000L,
+        ISOLATION_MODE_FWD              = 0x00000001L,
+        ISOLATION_MODE_DROP             = 0x00000002L,
+};
+enum qeth_ipa_set_access_mode_rc {
+        SET_ACCESS_CTRL_RC_SUCCESS              = 0x0000,
+        SET_ACCESS_CTRL_RC_NOT_SUPPORTED        = 0x0004,
+        SET_ACCESS_CTRL_RC_ALREADY_NOT_ISOLATED = 0x0008,
+        SET_ACCESS_CTRL_RC_ALREADY_ISOLATED     = 0x0010,
+        SET_ACCESS_CTRL_RC_NONE_SHARED_ADAPTER  = 0x0014,
+        SET_ACCESS_CTRL_RC_ACTIVE_CHECKSUM_OFF  = 0x0018,
+};
+
 
 /* (SET)DELIP(M) IPA stuff ***************************************************/
 struct qeth_ipacmd_setdelip4 {
@@ -376,6 +391,11 @@ struct qeth_snmp_ureq {
         struct qeth_snmp_cmd cmd;
 } __attribute__((packed));
 
+/* SET_ACCESS_CONTROL: same format for request and reply */
+struct qeth_set_access_ctrl {
+        __u32 subcmd_code;
+} __attribute__((packed));
+
 struct qeth_ipacmd_setadpparms_hdr {
         __u32 supp_hw_cmds;
         __u32 reserved1;
@@ -394,6 +414,7 @@ struct qeth_ipacmd_setadpparms {
                 struct qeth_query_cmds_supp query_cmds_supp;
                 struct qeth_change_addr change_addr;
                 struct qeth_snmp_cmd snmp;
+                struct qeth_set_access_ctrl set_access_ctrl;
                 __u32 mode;
         } data;
 } __attribute__ ((packed));
diff --git a/drivers/s390/net/qeth_core_sys.c b/drivers/s390/net/qeth_core_sys.c
index 33505c2a0e3..9ff2b36fdc4 100644
--- a/drivers/s390/net/qeth_core_sys.c
+++ b/drivers/s390/net/qeth_core_sys.c
@@ -416,7 +416,11 @@ static ssize_t qeth_dev_layer2_store(struct device *dev,
 static DEVICE_ATTR(layer2, 0644, qeth_dev_layer2_show,
                    qeth_dev_layer2_store);
 
-static ssize_t qeth_dev_large_send_show(struct device *dev,
+#define ATTR_QETH_ISOLATION_NONE        ("none")
+#define ATTR_QETH_ISOLATION_FWD         ("forward")
+#define ATTR_QETH_ISOLATION_DROP        ("drop")
+
+static ssize_t qeth_dev_isolation_show(struct device *dev,
                                 struct device_attribute *attr, char *buf)
 {
         struct qeth_card *card = dev_get_drvdata(dev);
@@ -424,44 +428,69 @@ static ssize_t qeth_dev_large_send_show(struct device *dev,
         if (!card)
                 return -EINVAL;
 
-        switch (card->options.large_send) {
-        case QETH_LARGE_SEND_NO:
-                return sprintf(buf, "%s\n", "no");
-        case QETH_LARGE_SEND_TSO:
-                return sprintf(buf, "%s\n", "TSO");
+        switch (card->options.isolation) {
+        case ISOLATION_MODE_NONE:
+                return snprintf(buf, 6, "%s\n", ATTR_QETH_ISOLATION_NONE);
+        case ISOLATION_MODE_FWD:
+                return snprintf(buf, 9, "%s\n", ATTR_QETH_ISOLATION_FWD);
+        case ISOLATION_MODE_DROP:
+                return snprintf(buf, 6, "%s\n", ATTR_QETH_ISOLATION_DROP);
         default:
-                return sprintf(buf, "%s\n", "N/A");
+                return snprintf(buf, 5, "%s\n", "N/A");
         }
 }
 
-static ssize_t qeth_dev_large_send_store(struct device *dev,
+static ssize_t qeth_dev_isolation_store(struct device *dev,
                 struct device_attribute *attr, const char *buf, size_t count)
 {
         struct qeth_card *card = dev_get_drvdata(dev);
-        enum qeth_large_send_types type;
+        enum qeth_ipa_isolation_modes isolation;
         int rc = 0;
-        char *tmp;
+        char *tmp, *curtoken;
+        curtoken = (char *) buf;
 
-        if (!card)
-                return -EINVAL;
-        tmp = strsep((char **) &buf, "\n");
-        if (!strcmp(tmp, "no")) {
-                type = QETH_LARGE_SEND_NO;
-        } else if (!strcmp(tmp, "TSO")) {
-                type = QETH_LARGE_SEND_TSO;
+        if (!card) {
+                rc = -EINVAL;
+                goto out;
+        }
+
+        /* check for unknown, too, in case we do not yet know who we are */
+        if (card->info.type != QETH_CARD_TYPE_OSAE &&
+            card->info.type != QETH_CARD_TYPE_UNKNOWN) {
+                rc = -EOPNOTSUPP;
+                dev_err(&card->gdev->dev, "Adapter does not "
+                        "support QDIO data connection isolation\n");
+                goto out;
+        }
+
+        /* parse input into isolation mode */
+        tmp = strsep(&curtoken, "\n");
+        if (!strcmp(tmp, ATTR_QETH_ISOLATION_NONE)) {
+                isolation = ISOLATION_MODE_NONE;
+        } else if (!strcmp(tmp, ATTR_QETH_ISOLATION_FWD)) {
+                isolation = ISOLATION_MODE_FWD;
+        } else if (!strcmp(tmp, ATTR_QETH_ISOLATION_DROP)) {
+                isolation = ISOLATION_MODE_DROP;
         } else {
-                return -EINVAL;
+                rc = -EINVAL;
+                goto out;
         }
-        if (card->options.large_send == type)
-                return count;
-        rc = qeth_set_large_send(card, type);
-        if (rc)
-                return rc;
-        return count;
+        rc = count;
+
+        /* defer IP assist if device is offline (until discipline->set_online)*/
+        card->options.isolation = isolation;
+        if (card->state == CARD_STATE_SOFTSETUP ||
+            card->state == CARD_STATE_UP) {
+                int ipa_rc = qeth_set_access_ctrl_online(card);
+                if (ipa_rc != 0)
+                        rc = ipa_rc;
+        }
+out:
+        return rc;
 }
 
-static DEVICE_ATTR(large_send, 0644, qeth_dev_large_send_show,
-                   qeth_dev_large_send_store);
+static DEVICE_ATTR(isolation, 0644, qeth_dev_isolation_show,
+                   qeth_dev_isolation_store);
 
 static ssize_t qeth_dev_blkt_show(char *buf, struct qeth_card *card, int value)
 {
@@ -582,7 +611,7 @@ static struct attribute *qeth_device_attrs[] = {
         &dev_attr_recover.attr,
         &dev_attr_performance_stats.attr,
         &dev_attr_layer2.attr,
-        &dev_attr_large_send.attr,
+        &dev_attr_isolation.attr,
         NULL,
 };
 
diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c
index b61d5c723c5..0b763396d5d 100644
--- a/drivers/s390/net/qeth_l2_main.c
+++ b/drivers/s390/net/qeth_l2_main.c
@@ -940,30 +940,17 @@ static int __qeth_l2_set_online(struct ccwgroup_device *gdev, int recovery_mode)
 
         qeth_set_allowed_threads(card, QETH_RECOVER_THREAD, 1);
         recover_flag = card->state;
-        rc = ccw_device_set_online(CARD_RDEV(card));
-        if (rc) {
-                QETH_DBF_TEXT_(SETUP, 2, "1err%d", rc);
-                return -EIO;
-        }
-        rc = ccw_device_set_online(CARD_WDEV(card));
-        if (rc) {
-                QETH_DBF_TEXT_(SETUP, 2, "1err%d", rc);
-                return -EIO;
-        }
-        rc = ccw_device_set_online(CARD_DDEV(card));
-        if (rc) {
-                QETH_DBF_TEXT_(SETUP, 2, "1err%d", rc);
-                return -EIO;
-        }
-
         rc = qeth_core_hardsetup_card(card);
         if (rc) {
                 QETH_DBF_TEXT_(SETUP, 2, "2err%d", rc);
+                rc = -ENODEV;
                 goto out_remove;
         }
 
-        if (!card->dev && qeth_l2_setup_netdev(card))
+        if (!card->dev && qeth_l2_setup_netdev(card)) {
+                rc = -ENODEV;
                 goto out_remove;
+        }
 
         if (card->info.type != QETH_CARD_TYPE_OSN)
                 qeth_l2_send_setmac(card, &card->dev->dev_addr[0]);
@@ -983,12 +970,14 @@ static int __qeth_l2_set_online(struct ccwgroup_device *gdev, int recovery_mode)
                         card->lan_online = 0;
                         return 0;
                 }
+                rc = -ENODEV;
                 goto out_remove;
         } else
                 card->lan_online = 1;
 
         if (card->info.type != QETH_CARD_TYPE_OSN) {
-                qeth_set_large_send(card, card->options.large_send);
+                /* configure isolation level */
+                qeth_set_access_ctrl_online(card);
                 qeth_l2_process_vlans(card, 0);
         }
 
@@ -997,6 +986,7 @@ static int __qeth_l2_set_online(struct ccwgroup_device *gdev, int recovery_mode)
         rc = qeth_init_qdio_queues(card);
         if (rc) {
                 QETH_DBF_TEXT_(SETUP, 2, "6err%d", rc);
+                rc = -ENODEV;
                 goto out_remove;
         }
         card->state = CARD_STATE_SOFTSETUP;
@@ -1018,6 +1008,7 @@ static int __qeth_l2_set_online(struct ccwgroup_device *gdev, int recovery_mode)
         /* let user_space know that device is online */
         kobject_uevent(&gdev->dev.kobj, KOBJ_CHANGE);
         return 0;
+
 out_remove:
         card->use_hard_stop = 1;
         qeth_l2_stop_card(card, 0);
@@ -1028,7 +1019,7 @@ out_remove:
                 card->state = CARD_STATE_RECOVER;
         else
                 card->state = CARD_STATE_DOWN;
-        return -ENODEV;
+        return rc;
 }
 
 static int qeth_l2_set_online(struct ccwgroup_device *gdev)
diff --git a/drivers/s390/net/qeth_l3.h b/drivers/s390/net/qeth_l3.h
index 9f143c83bba..321988fa9f7 100644
--- a/drivers/s390/net/qeth_l3.h
+++ b/drivers/s390/net/qeth_l3.h
@@ -60,5 +60,7 @@ void qeth_l3_del_vipa(struct qeth_card *, enum qeth_prot_versions, const u8 *);
 int qeth_l3_add_rxip(struct qeth_card *, enum qeth_prot_versions, const u8 *);
 void qeth_l3_del_rxip(struct qeth_card *card, enum qeth_prot_versions,
                         const u8 *);
+int qeth_l3_set_large_send(struct qeth_card *, enum qeth_large_send_types);
+int qeth_l3_set_rx_csum(struct qeth_card *, enum qeth_checksum_types);
 
 #endif /* __QETH_L3_H__ */
diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c
index 4ca28c16ca8..fd1b6ed3721 100644
--- a/drivers/s390/net/qeth_l3_main.c
+++ b/drivers/s390/net/qeth_l3_main.c
@@ -41,6 +41,32 @@ static int qeth_l3_deregister_addr_entry(struct qeth_card *,
 static int __qeth_l3_set_online(struct ccwgroup_device *, int);
 static int __qeth_l3_set_offline(struct ccwgroup_device *, int);
 
+int qeth_l3_set_large_send(struct qeth_card *card,
+                enum qeth_large_send_types type)
+{
+        int rc = 0;
+
+        card->options.large_send = type;
+        if (card->dev == NULL)
+                return 0;
+
+        if (card->options.large_send == QETH_LARGE_SEND_TSO) {
+                if (qeth_is_supported(card, IPA_OUTBOUND_TSO)) {
+                        card->dev->features |= NETIF_F_TSO | NETIF_F_SG |
+                                        NETIF_F_HW_CSUM;
+                } else {
+                        card->dev->features &= ~(NETIF_F_TSO | NETIF_F_SG |
+                                        NETIF_F_HW_CSUM);
+                        card->options.large_send = QETH_LARGE_SEND_NO;
+                        rc = -EOPNOTSUPP;
+                }
+        } else {
+                card->dev->features &= ~(NETIF_F_TSO | NETIF_F_SG |
+                                        NETIF_F_HW_CSUM);
+                card->options.large_send = QETH_LARGE_SEND_NO;
+        }
+        return rc;
+}
 
 static int qeth_l3_isxdigit(char *buf)
 {
@@ -1439,6 +1465,35 @@ static int qeth_l3_send_checksum_command(struct qeth_card *card)
         return 0;
 }
 
+int qeth_l3_set_rx_csum(struct qeth_card *card,
+        enum qeth_checksum_types csum_type)
+{
+        int rc = 0;
+
+        if (card->options.checksum_type == HW_CHECKSUMMING) {
+                if ((csum_type != HW_CHECKSUMMING) &&
+                        (card->state != CARD_STATE_DOWN)) {
+                        rc = qeth_l3_send_simple_setassparms(card,
+                                IPA_INBOUND_CHECKSUM, IPA_CMD_ASS_STOP, 0);
+                        if (rc)
+                                return -EIO;
+                }
+        } else {
+                if (csum_type == HW_CHECKSUMMING) {
+                        if (card->state != CARD_STATE_DOWN) {
+                                if (!qeth_is_supported(card,
+                                    IPA_INBOUND_CHECKSUM))
+                                        return -EPERM;
+                                rc = qeth_l3_send_checksum_command(card);
+                                if (rc)
+                                        return -EIO;
+                        }
+                }
+        }
+        card->options.checksum_type = csum_type;
+        return rc;
+}
+
 static int qeth_l3_start_ipa_checksum(struct qeth_card *card)
 {
         int rc = 0;
@@ -1506,6 +1561,8 @@ static int qeth_l3_start_ipa_tso(struct qeth_card *card)
 static int qeth_l3_start_ipassists(struct qeth_card *card)
 {
         QETH_DBF_TEXT(TRACE, 3, "strtipas");
+
+        qeth_set_access_ctrl_online(card);      /* go on*/
         qeth_l3_start_ipa_arp_processing(card); /* go on*/
         qeth_l3_start_ipa_ip_fragmentation(card);       /* go on*/
         qeth_l3_start_ipa_source_mac(card);     /* go on*/
@@ -2684,6 +2741,24 @@ static void qeth_tx_csum(struct sk_buff *skb)
         *(__sum16 *)(skb->data + offset) = csum_fold(csum);
 }
 
+static inline int qeth_l3_tso_elements(struct sk_buff *skb)
+{
+        unsigned long tcpd = (unsigned long)tcp_hdr(skb) +
+                tcp_hdr(skb)->doff * 4;
+        int tcpd_len = skb->len - (tcpd - (unsigned long)skb->data);
+        int elements = PFN_UP(tcpd + tcpd_len) - PFN_DOWN(tcpd);
+        elements += skb_shinfo(skb)->nr_frags;
+        return elements;
+}
+
+static inline int qeth_l3_tso_check(struct sk_buff *skb)
+{
+        int len = ((unsigned long)tcp_hdr(skb) + tcp_hdr(skb)->doff * 4) -
+                (unsigned long)skb->data;
+        return (((unsigned long)skb->data & PAGE_MASK) !=
+                (((unsigned long)skb->data + len) & PAGE_MASK));
+}
+
 static int qeth_l3_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
         int rc;
@@ -2777,16 +2852,21 @@ static int qeth_l3_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
         /* fix hardware limitation: as long as we do not have sbal
          * chaining we can not send long frag lists
          */
-        if ((large_send == QETH_LARGE_SEND_TSO) &&
-            ((skb_shinfo(new_skb)->nr_frags + 2) > 16)) {
-                if (skb_linearize(new_skb))
-                        goto tx_drop;
+        if (large_send == QETH_LARGE_SEND_TSO) {
+                if (qeth_l3_tso_elements(new_skb) + 1 > 16) {
+                        if (skb_linearize(new_skb))
+                                goto tx_drop;
+                        if (card->options.performance_stats)
+                                card->perf_stats.tx_lin++;
+                }
         }
 
         if ((large_send == QETH_LARGE_SEND_TSO) &&
             (cast_type == RTN_UNSPEC)) {
                 hdr = (struct qeth_hdr *)skb_push(new_skb,
                                                 sizeof(struct qeth_hdr_tso));
+                if (qeth_l3_tso_check(new_skb))
+                        QETH_DBF_MESSAGE(2, "tso skb misaligned\n");
                 memset(hdr, 0, sizeof(struct qeth_hdr_tso));
                 qeth_l3_fill_header(card, hdr, new_skb, ipv, cast_type);
                 qeth_tso_fill_header(card, hdr, new_skb);
@@ -2903,46 +2983,28 @@ static u32 qeth_l3_ethtool_get_rx_csum(struct net_device *dev)
 static int qeth_l3_ethtool_set_rx_csum(struct net_device *dev, u32 data)
 {
         struct qeth_card *card = dev->ml_priv;
-        enum qeth_card_states old_state;
         enum qeth_checksum_types csum_type;
 
-        if ((card->state != CARD_STATE_UP) &&
-            (card->state != CARD_STATE_DOWN))
-                return -EPERM;
-
         if (data)
                 csum_type = HW_CHECKSUMMING;
         else
                 csum_type = SW_CHECKSUMMING;
 
-        if (card->options.checksum_type != csum_type) {
-                old_state = card->state;
-                if (card->state == CARD_STATE_UP)
-                        __qeth_l3_set_offline(card->gdev, 1);
-                card->options.checksum_type = csum_type;
-                if (old_state == CARD_STATE_UP)
-                        __qeth_l3_set_online(card->gdev, 1);
-        }
-        return 0;
+        return qeth_l3_set_rx_csum(card, csum_type);
 }
 
 static int qeth_l3_ethtool_set_tso(struct net_device *dev, u32 data)
 {
         struct qeth_card *card = dev->ml_priv;
+        int rc = 0;
 
         if (data) {
-                if (card->options.large_send == QETH_LARGE_SEND_NO) {
-                        if (card->info.type == QETH_CARD_TYPE_IQD)
-                                return -EPERM;
-                        else
-                                card->options.large_send = QETH_LARGE_SEND_TSO;
-                        dev->features |= NETIF_F_TSO;
-                }
+                rc = qeth_l3_set_large_send(card, QETH_LARGE_SEND_TSO);
         } else {
                 dev->features &= ~NETIF_F_TSO;
                 card->options.large_send = QETH_LARGE_SEND_NO;
         }
-        return 0;
+        return rc;
 }
 
 static const struct ethtool_ops qeth_l3_ethtool_ops = {
@@ -3058,6 +3120,7 @@ static int qeth_l3_setup_netdev(struct qeth_card *card)
                                 NETIF_F_HW_VLAN_RX |
                                 NETIF_F_HW_VLAN_FILTER;
         card->dev->priv_flags &= ~IFF_XMIT_DST_RELEASE;
+        card->dev->gso_max_size = 15 * PAGE_SIZE;
 
         SET_NETDEV_DEV(card->dev, &card->gdev->dev);
         return register_netdev(card->dev);
@@ -3154,32 +3217,19 @@ static int __qeth_l3_set_online(struct ccwgroup_device *gdev, int recovery_mode)
         qeth_set_allowed_threads(card, QETH_RECOVER_THREAD, 1);
 
         recover_flag = card->state;
-        rc = ccw_device_set_online(CARD_RDEV(card));
-        if (rc) {
-                QETH_DBF_TEXT_(SETUP, 2, "1err%d", rc);
-                return -EIO;
-        }
-        rc = ccw_device_set_online(CARD_WDEV(card));
-        if (rc) {
-                QETH_DBF_TEXT_(SETUP, 2, "1err%d", rc);
-                return -EIO;
-        }
-        rc = ccw_device_set_online(CARD_DDEV(card));
-        if (rc) {
-                QETH_DBF_TEXT_(SETUP, 2, "1err%d", rc);
-                return -EIO;
-        }
-
         rc = qeth_core_hardsetup_card(card);
         if (rc) {
                 QETH_DBF_TEXT_(SETUP, 2, "2err%d", rc);
+                rc = -ENODEV;
                 goto out_remove;
         }
 
         qeth_l3_query_ipassists(card, QETH_PROT_IPV4);
 
-        if (!card->dev && qeth_l3_setup_netdev(card))
+        if (!card->dev && qeth_l3_setup_netdev(card)) {
+                rc = -ENODEV;
                 goto out_remove;
+        }
 
         card->state = CARD_STATE_HARDSETUP;
         qeth_print_status_message(card);
@@ -3196,10 +3246,11 @@ static int __qeth_l3_set_online(struct ccwgroup_device *gdev, int recovery_mode)
                         card->lan_online = 0;
                         return 0;
                 }
+                rc = -ENODEV;
                 goto out_remove;
         } else
                 card->lan_online = 1;
-        qeth_set_large_send(card, card->options.large_send);
+        qeth_l3_set_large_send(card, card->options.large_send);
 
         rc = qeth_l3_setadapter_parms(card);
         if (rc)
@@ -3218,6 +3269,7 @@ static int __qeth_l3_set_online(struct ccwgroup_device *gdev, int recovery_mode)
         rc = qeth_init_qdio_queues(card);
         if (rc) {
                 QETH_DBF_TEXT_(SETUP, 2, "6err%d", rc);
+                rc = -ENODEV;
                 goto out_remove;
         }
         card->state = CARD_STATE_SOFTSETUP;
@@ -3248,7 +3300,7 @@ out_remove:
                 card->state = CARD_STATE_RECOVER;
         else
                 card->state = CARD_STATE_DOWN;
-        return -ENODEV;
+        return rc;
 }
 
 static int qeth_l3_set_online(struct ccwgroup_device *gdev)
diff --git a/drivers/s390/net/qeth_l3_sys.c b/drivers/s390/net/qeth_l3_sys.c
index c144b9924d5..3360b0941aa 100644
--- a/drivers/s390/net/qeth_l3_sys.c
+++ b/drivers/s390/net/qeth_l3_sys.c
@@ -293,31 +293,79 @@ static ssize_t qeth_l3_dev_checksum_store(struct device *dev,
                 struct device_attribute *attr, const char *buf, size_t count)
 {
         struct qeth_card *card = dev_get_drvdata(dev);
+        enum qeth_checksum_types csum_type;
         char *tmp;
+        int rc;
 
         if (!card)
                 return -EINVAL;
 
-        if ((card->state != CARD_STATE_DOWN) &&
-            (card->state != CARD_STATE_RECOVER))
-                return -EPERM;
-
         tmp = strsep((char **) &buf, "\n");
         if (!strcmp(tmp, "sw_checksumming"))
-                card->options.checksum_type = SW_CHECKSUMMING;
+                csum_type = SW_CHECKSUMMING;
         else if (!strcmp(tmp, "hw_checksumming"))
-                card->options.checksum_type = HW_CHECKSUMMING;
+                csum_type = HW_CHECKSUMMING;
         else if (!strcmp(tmp, "no_checksumming"))
-                card->options.checksum_type = NO_CHECKSUMMING;
-        else {
+                csum_type = NO_CHECKSUMMING;
+        else
                 return -EINVAL;
-        }
+
+        rc = qeth_l3_set_rx_csum(card, csum_type);
+        if (rc)
+                return rc;
         return count;
 }
 
 static DEVICE_ATTR(checksumming, 0644, qeth_l3_dev_checksum_show,
                 qeth_l3_dev_checksum_store);
 
+static ssize_t qeth_l3_dev_large_send_show(struct device *dev,
+                                struct device_attribute *attr, char *buf)
+{
+        struct qeth_card *card = dev_get_drvdata(dev);
+
+        if (!card)
+                return -EINVAL;
+
+        switch (card->options.large_send) {
+        case QETH_LARGE_SEND_NO:
+                return sprintf(buf, "%s\n", "no");
+        case QETH_LARGE_SEND_TSO:
+                return sprintf(buf, "%s\n", "TSO");
+        default:
+                return sprintf(buf, "%s\n", "N/A");
+        }
+}
+
+static ssize_t qeth_l3_dev_large_send_store(struct device *dev,
+                struct device_attribute *attr, const char *buf, size_t count)
+{
+        struct qeth_card *card = dev_get_drvdata(dev);
+        enum qeth_large_send_types type;
+        int rc = 0;
+        char *tmp;
+
+        if (!card)
+                return -EINVAL;
+        tmp = strsep((char **) &buf, "\n");
+        if (!strcmp(tmp, "no"))
+                type = QETH_LARGE_SEND_NO;
+        else if (!strcmp(tmp, "TSO"))
+                type = QETH_LARGE_SEND_TSO;
+        else
+                return -EINVAL;
+
+        if (card->options.large_send == type)
+                return count;
+        rc = qeth_l3_set_large_send(card, type);
+        if (rc)
+                return rc;
+        return count;
+}
+
+static DEVICE_ATTR(large_send, 0644, qeth_l3_dev_large_send_show,
+                   qeth_l3_dev_large_send_store);
+
 static struct attribute *qeth_l3_device_attrs[] = {
         &dev_attr_route4.attr,
         &dev_attr_route6.attr,
@@ -325,6 +373,7 @@ static struct attribute *qeth_l3_device_attrs[] = {
         &dev_attr_broadcast_mode.attr,
         &dev_attr_canonical_macaddr.attr,
         &dev_attr_checksumming.attr,
+        &dev_attr_large_send.attr,
         NULL,
 };