Skip to contentSkip to conversation

Fix net/irda build breakage

PATCH In review Parag Warudkar 3 participants 5 messages Jan 9, 2009 – Jan 11, 2009 Network drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

drivers/net/irda/donauboe.c +4 -4
index 687c2d5..5acb8b2 100644
@@ -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);
maintainer
#1 lore raw

From: Parag Warudkar <[email protected]>
Date: Fri, 9 Jan 2009 18:30:58 -0500 (EST)

Quoted 9 lines

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

Quoted 3 lines

Fix this.

Already fixed in the net-2.6 GIT tree, but thanks.

#2 lore raw
Quoted 12 lines · David Miller

From: Parag Warudkar <[email protected]>
Date: Fri, 9 Jan 2009 18:30:58 -0500 (EST)

Quoted 9 lines

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

Quoted 5 lines
Quoted 3 lines

Fix this.

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.

Ingo

#3 lore raw
Quoted 5 lines · Ingo Molnar
Quoted 1 line

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

-------------->

Quoted 1 line

From a5532d29c1ade8b4576f449d4e40678490b96594 Mon Sep 17 00:00:00 2001

From: Parag Warudkar <[email protected]>
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.

---
 drivers/net/irda/donauboe.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
drivers/net/irda/donauboe.c +4 -4
index 687c2d5..6f3e7f7 100644
@@ -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);
maintainer
#4 lore raw
In reply to Ingo Molnar

From: Ingo Molnar <[email protected]>
Date: Sat, 10 Jan 2009 11:58:27 +0100

Quoted 7 lines · David Miller
Quoted 2 lines

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.

Sure, here ya go:

irda: fix incomplete conversation to internal stats

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

---
 drivers/net/irda/au1k_ir.c  |    2 +-
 drivers/net/irda/donauboe.c |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)
drivers/net/irda/au1k_ir.c +1 -1
index 75a1d0a..9411640 100644
@@ -594,7 +594,7 @@ static int au1k_irda_rx(struct net_device *dev)
 			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);
drivers/net/irda/donauboe.c +4 -4
index 687c2d5..6f3e7f7 100644
@@ -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);
Signature · 1 line
1.6.1.15.g159c88