From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751161Ab1AOGvy (ORCPT ); Sat, 15 Jan 2011 01:51:54 -0500 Received: from mail-ww0-f44.google.com ([74.125.82.44]:57301 "EHLO mail-ww0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750770Ab1AOGvx (ORCPT ); Sat, 15 Jan 2011 01:51:53 -0500 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:from:to:cc:in-reply-to:references:content-type:date :message-id:mime-version:x-mailer:content-transfer-encoding; b=qJpJ3rGpOC9310g9qnbBdCqh7ck5t+mvQFxKQfbCK22K10CvxpK7/ltUAElvbtIDaq ceTiJi2XfhMB2L1NPNgPzXTXzhfwbm5B/WstED+9mOsHw63VieFMZgE34sNWgLD1mFV/ zcolLMolOaICVs4KqdvCcM5dLCpkGMeea0Yxg= Subject: Re: [PATCH] staging: fix build failure in bcm driver From: Eric Dumazet To: Andres Salomon Cc: linux-kernel@vger.kernel.org, Greg Kroah-Hartman , Stephen Hemminger , Dan Carpenter , Arnd Bergmann , devel@driverdev.osuosl.org, "David S.Miller" In-Reply-To: <20110114172439.65d6d557@queued.net> References: <20110114172439.65d6d557@queued.net> Content-Type: text/plain; charset="UTF-8" Date: Sat, 15 Jan 2011 07:51:45 +0100 Message-ID: <1295074306.3977.11.camel@edumazet-laptop> Mime-Version: 1.0 X-Mailer: Evolution 2.30.3 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Le vendredi 14 janvier 2011 à 17:24 -0800, Andres Salomon a écrit : > While building, I hit the following: > > CC [M] drivers/staging/bcm/Qos.o > drivers/staging/bcm/Qos.c: In function ‘PruneQueue’: > drivers/staging/bcm/Qos.c:367: error: ‘struct netdev_queue’ has no member named ‘tx_dropped’ > drivers/staging/bcm/Qos.c: In function ‘flush_all_queues’: > drivers/staging/bcm/Qos.c:416: error: ‘struct netdev_queue’ has no member named ‘tx_dropped’ > make[5]: *** [drivers/staging/bcm/Qos.o] Error 1 > make[4]: *** [drivers/staging/bcm] Error 2 > make[3]: *** [drivers/staging] Error 2 > > As well as: > > CC [M] drivers/staging/bcm/Transmit.o > drivers/staging/bcm/Transmit.c: In function ‘SetupNextSend’: > drivers/staging/bcm/Transmit.c:163: error: ‘struct netdev_queue’ has no member named ‘tx_bytes’ > drivers/staging/bcm/Transmit.c:164: error: ‘struct netdev_queue’ has no member named ‘tx_packets’ > make[2]: *** [drivers/staging/bcm/Transmit.o] Error 1 > > > tx_dropped/tx_bytes_tx_packets were removed in commit 1ac9ad13. This patch > converts bcm to use net_device_stats instead of netdev_queue. > > Signed-off-by: Andres Salomon Acked-by: Eric Dumazet BTW, chunks included in this patch have horrible codingstyle. Is this driver planned for inclusion sometime ? > --- > drivers/staging/bcm/Qos.c | 7 +++---- > drivers/staging/bcm/Transmit.c | 6 +++--- > 2 files changed, 6 insertions(+), 7 deletions(-) > > diff --git a/drivers/staging/bcm/Qos.c b/drivers/staging/bcm/Qos.c > index 8ce4536..feade94 100644 > --- a/drivers/staging/bcm/Qos.c > +++ b/drivers/staging/bcm/Qos.c > @@ -359,12 +359,11 @@ static VOID PruneQueue(PMINI_ADAPTER Adapter, INT iIndex) > > if(PacketToDrop) > { > - struct netdev_queue *txq = netdev_get_tx_queue(Adapter->dev, iIndex); > if (netif_msg_tx_err(Adapter)) > pr_info(PFX "%s: tx queue %d overlimit\n", > Adapter->dev->name, iIndex); > > - txq->tx_dropped++; > + netstats->tx_dropped++; > > DEQUEUEPACKET(Adapter->PackInfo[iIndex].FirstTxQueue, > Adapter->PackInfo[iIndex].LastTxQueue); > @@ -404,7 +403,7 @@ VOID flush_all_queues(PMINI_ADAPTER Adapter) > // down(&Adapter->data_packet_queue_lock); > for(iQIndex=LowPriority; iQIndex { > - struct netdev_queue *txq = netdev_get_tx_queue(Adapter->dev, iQIndex); > + struct net_device_stats *netstats = &Adapter->dev->stats; > > spin_lock_bh(&Adapter->PackInfo[iQIndex].SFQueueLock); > while(Adapter->PackInfo[iQIndex].FirstTxQueue) > @@ -413,7 +412,7 @@ VOID flush_all_queues(PMINI_ADAPTER Adapter) > if(PacketToDrop) > { > uiTotalPacketLength = PacketToDrop->len; > - txq->tx_dropped++; > + netstats->tx_dropped++; > } > else > uiTotalPacketLength = 0; > diff --git a/drivers/staging/bcm/Transmit.c b/drivers/staging/bcm/Transmit.c > index 0f70009..d5e4a74 100644 > --- a/drivers/staging/bcm/Transmit.c > +++ b/drivers/staging/bcm/Transmit.c > @@ -157,11 +157,11 @@ INT SetupNextSend(PMINI_ADAPTER Adapter, struct sk_buff *Packet, USHORT Vcid) > } > else > { > - struct netdev_queue *txq = netdev_get_tx_queue(Adapter->dev, QueueIndex); > + struct net_device_stats *netstats = &Adapter->dev->stats; > Adapter->PackInfo[QueueIndex].uiTotalTxBytes += Leader.PLength; > > - txq->tx_bytes += Leader.PLength; > - ++txq->tx_packets; > + netstats->tx_bytes += Leader.PLength; > + ++netstats->tx_packets; > > Adapter->PackInfo[QueueIndex].uiCurrentTokenCount -= Leader.PLength << 3; > Adapter->PackInfo[QueueIndex].uiSentBytes += (Packet->len);