+ irda-fix-incomplete-conversation-to-internal-stats.patch added to -mm tree

+ irda-fix-incomplete-conversation-to-internal-stats.patch added to -mm tree

[akpm]

The patch titled
     irda: fix incomplete conversation to internal stats
has been added to the -mm tree.  Its filename is
     irda-fix-incomplete-conversation-to-internal-stats.patch

Before you just go and hit "reply", please:
   a) Consider who else should be cc'ed
   b) Prefer to cc a suitable mailing list as well
   c) Ideally: find the original patch on the mailing list and do a
      reply-to-all to that, adding suitable additional cc's

*** Remember to use Documentation/SubmitChecklist when testing your code ***

See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this

The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

------------------------------------------------------
Subject: irda: fix incomplete conversation to internal stats
From: Alexander Beregalov <a.beregalov@gmail.com>

Fix for commit af0490810c (irda: convert to internal stats)

Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/net/irda/au1k_ir.c  |    2 +-
 drivers/net/irda/donauboe.c |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff -puN drivers/net/irda/au1k_ir.c~irda-fix-incomplete-conversation-to-internal-stats drivers/net/irda/au1k_ir.c
--- a/drivers/net/irda/au1k_ir.c~irda-fix-incomplete-conversation-to-internal-stats
+++ a/drivers/net/irda/au1k_ir.c
@@ -594,7 +594,7 @@ static int au1k_irda_rx(struct net_devic
 			update_rx_stats(dev, flags, count);
 			skb=alloc_skb(count+1,GFP_ATOMIC);
 			if (skb == NULL) {
-				aup->stats.rx_dropped++;
+				aup->netdev->stats.rx_dropped++;
 				continue;
 			}
 			skb_reserve(skb, 1);
diff -puN drivers/net/irda/donauboe.c~irda-fix-incomplete-conversation-to-internal-stats drivers/net/irda/donauboe.c
--- a/drivers/net/irda/donauboe.c~irda-fix-incomplete-conversation-to-internal-stats
+++ a/drivers/net/irda/donauboe.c
@@ -1194,13 +1194,13 @@ toshoboe_interrupt (int irq, void *dev_i
               txp = txpc;
               txpc++;
               txpc %= TX_SLOTS;
-              self->stats.tx_packets++;
+              self->netdev->stats.tx_packets++;
               if (self->ring->tx[txpc].control & OBOE_CTL_TX_HW_OWNS)
                   self->ring->tx[txp].control &= ~OBOE_CTL_TX_RTCENTX;
             }
-          self->stats.tx_packets--;
+          self->netdev->stats.tx_packets--;
 #else
-          self->stats.tx_packets++;
+          self->netdev->stats.tx_packets++;
 #endif
           toshoboe_start_DMA(self, OBOE_CONFIG0H_ENTX);
         }
@@ -1280,7 +1280,7 @@ dumpbufs(self->rx_bufs[self->rxs],len,'<
                       skb_put (skb, len);
                       skb_copy_to_linear_data(skb, self->rx_bufs[self->rxs],
 					      len);
-                      self->stats.rx_packets++;
+                      self->netdev->stats.rx_packets++;
                       skb->dev = self->netdev;
                       skb_reset_mac_header(skb);
                       skb->protocol = htons (ETH_P_IRDA);
_

Patches currently in -mm which might be from a.beregalov@gmail.com are

origin.patch
irda-fix-incomplete-conversation-to-internal-stats.patch

Re: + irda-fix-incomplete-conversation-to-internal-stats.patch added to -mm tree

[David Miller]

From: akpm@linux-foundation.org
Date: Fri, 09 Jan 2009 16:23:09 -0800

> Subject: irda: fix incomplete conversation to internal stats
> From: Alexander Beregalov <a.beregalov@gmail.com>
> 
> Fix for commit af0490810c (irda: convert to internal stats)
> 
> Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

Andrew, this is already in the net-2.6 GIT tree, so you can safely
toss this.

commit 35a2f9993e1bef0d09c3d737aef784caaa888b48
Author: Alexander Beregalov <a.beregalov@gmail.com>
Date:   Thu Jan 8 16:42:08 2009 -0800

    irda: fix incomplete conversation to internal stats
    
    Fix for commit af0490810c (irda: convert to internal stats)
    
    Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

Re: + irda-fix-incomplete-conversation-to-internal-stats.patch added to -mm tree

[Andrew Morton]

On Fri, 09 Jan 2009 17:12:01 -0800 (PST) David Miller <davem@davemloft.net> wrote:

> From: akpm@linux-foundation.org
> Date: Fri, 09 Jan 2009 16:23:09 -0800
> 
> > Subject: irda: fix incomplete conversation to internal stats
> > From: Alexander Beregalov <a.beregalov@gmail.com>
> > 
> > Fix for commit af0490810c (irda: convert to internal stats)
> > 
> > Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
> > Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
> 
> Andrew, this is already in the net-2.6 GIT tree, so you can safely
> toss this.

I added it so I could compile my stuff.

> commit 35a2f9993e1bef0d09c3d737aef784caaa888b48
> Author: Alexander Beregalov <a.beregalov@gmail.com>
> Date:   Thu Jan 8 16:42:08 2009 -0800
> 
>     irda: fix incomplete conversation to internal stats
>     
>     Fix for commit af0490810c (irda: convert to internal stats)
>     
>     Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
>     Signed-off-by: David S. Miller <davem@davemloft.net>

Re: + irda-fix-incomplete-conversation-to-internal-stats.patch added to -mm tree

[Randy Dunlap]

Andrew Morton wrote:
> On Fri, 09 Jan 2009 17:12:01 -0800 (PST) David Miller <davem@davemloft.net> wrote:
> 
>> From: akpm@linux-foundation.org
>> Date: Fri, 09 Jan 2009 16:23:09 -0800
>>
>>> Subject: irda: fix incomplete conversation to internal stats
>>> From: Alexander Beregalov <a.beregalov@gmail.com>
>>>
>>> Fix for commit af0490810c (irda: convert to internal stats)
>>>
>>> Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
>>> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
>> Andrew, this is already in the net-2.6 GIT tree, so you can safely
>> toss this.
> 
> I added it so I could compile my stuff.

to be clear, it's broken in mainline, linux-next, and -mm
until some patch is merged.

>> commit 35a2f9993e1bef0d09c3d737aef784caaa888b48
>> Author: Alexander Beregalov <a.beregalov@gmail.com>
>> Date:   Thu Jan 8 16:42:08 2009 -0800
>>
>>     irda: fix incomplete conversation to internal stats
>>     
>>     Fix for commit af0490810c (irda: convert to internal stats)
>>     
>>     Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
>>     Signed-off-by: David S. Miller <davem@davemloft.net>


-- 
~Randy