linux-kernel - Re: [PATCH] Fix net/irda build breakage

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20090110110157.GA13322@elte.hu>
Date:	Sat, 10 Jan 2009 12:01:57 +0100
From:	Ingo Molnar <mingo@...e.hu>
To:	David Miller <davem@...emloft.net>
Cc:	parag.lkml@...il.com, shemminger@...tta.com,
	linux-kernel@...r.kernel.org
Subject: Re: [PATCH] Fix net/irda build breakage


* Ingo Molnar <mingo@...e.hu> wrote:

> > Already fixed in the net-2.6 GIT tree, but thanks.
> 
> mind sending the patch here to lkml too so that people can pick it up? 
> Current -git is broken with x86 allyesconfig and Parag's patch above is 
> whitespace damaged.

below is the undamaged one - in case someone here on lkml needs the fix.

	Ingo

-------------->
>From a5532d29c1ade8b4576f449d4e40678490b96594 Mon Sep 17 00:00:00 2001
From: Parag Warudkar <parag.lkml@...il.com>
Date: Fri, 9 Jan 2009 18:30:58 -0500
Subject: [PATCH] Fix net/irda build breakage

commit af0490810cfa159b4894ddecfc5eb2e4432fb976 breaks build for net/irda -

drivers/net/irda/donauboe.c: In function 'toshoboe_interrupt':
drivers/net/irda/donauboe.c:1197: error: 'struct toshoboe_cb' has no member named 'stats'
drivers/net/irda/donauboe.c:1201: error: 'struct toshoboe_cb' has no member named 'stats'
drivers/net/irda/donauboe.c:1283: error: 'struct toshoboe_cb' has no member named 'stats'
make[3]: *** [drivers/net/irda/donauboe.o] Error 1
make[2]: *** [drivers/net/irda] Error 2

Fix this.

Signed-off-by: Parag Warudkar <parag.lkml@...il.com>
Cc: davem@...emloft.net
Cc: shemminger@...tta.com
Signed-off-by: Ingo Molnar <mingo@...e.hu>
---
 drivers/net/irda/donauboe.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/irda/donauboe.c b/drivers/net/irda/donauboe.c
index 687c2d5..6f3e7f7 100644
--- a/drivers/net/irda/donauboe.c
+++ b/drivers/net/irda/donauboe.c
@@ -1194,13 +1194,13 @@ toshoboe_interrupt (int irq, void *dev_id)
               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);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/