From patchwork Thu Feb 14 15:00:05 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Claudiu Manoil X-Patchwork-Id: 220460 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 90ADA2C007B for ; Fri, 15 Feb 2013 02:00:35 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932377Ab3BNPAZ (ORCPT ); Thu, 14 Feb 2013 10:00:25 -0500 Received: from ch1ehsobe004.messaging.microsoft.com ([216.32.181.184]:48459 "EHLO ch1outboundpool.messaging.microsoft.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754474Ab3BNPAT (ORCPT ); Thu, 14 Feb 2013 10:00:19 -0500 Received: from mail28-ch1-R.bigfish.com (10.43.68.242) by CH1EHSOBE018.bigfish.com (10.43.70.68) with Microsoft SMTP Server id 14.1.225.23; Thu, 14 Feb 2013 15:00:18 +0000 Received: from mail28-ch1 (localhost [127.0.0.1]) by mail28-ch1-R.bigfish.com (Postfix) with ESMTP id 81ED42201B5; Thu, 14 Feb 2013 15:00:18 +0000 (UTC) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-SpamScore: 0 X-BigFish: VS0(zzzz1f42h1ee6h1de0h1202h1e76h1d1ah1d2ahzz8275bhz2dh2a8h668h839hd24he5bhf0ah107ah11b5h121eh1288h12a5h12a9h12bdh12e5h137ah139eh13b6h1441h14afh1504h1537h162dh1631h1758h1898h18e1h1946h19b5h1155h) Received: from mail28-ch1 (localhost.localdomain [127.0.0.1]) by mail28-ch1 (MessageSwitch) id 1360854015275142_13449; Thu, 14 Feb 2013 15:00:15 +0000 (UTC) Received: from CH1EHSMHS035.bigfish.com (snatpool2.int.messaging.microsoft.com [10.43.68.238]) by mail28-ch1.bigfish.com (Postfix) with ESMTP id 36DB81A006A; Thu, 14 Feb 2013 15:00:15 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by CH1EHSMHS035.bigfish.com (10.43.70.35) with Microsoft SMTP Server (TLS) id 14.1.225.23; Thu, 14 Feb 2013 15:00:13 +0000 Received: from az84smr01.freescale.net (10.64.34.197) by 039-SN1MMR1-001.039d.mgd.msft.net (10.84.1.13) with Microsoft SMTP Server (TLS) id 14.2.328.11; Thu, 14 Feb 2013 15:00:12 +0000 Received: from zro04cle141.ea.freescale.net (udp157456uds.ea.freescale.net [140.101.223.141]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id r1EF0Bin025345; Thu, 14 Feb 2013 08:00:12 -0700 Received: by zro04cle141.ea.freescale.net (Postfix, from userid 23113) id 438EF40077; Thu, 14 Feb 2013 17:00:08 +0200 (EET) From: Claudiu Manoil To: CC: Paul Gortmaker , "David S. Miller" Subject: [PATCH net-next 5/7] gianfar: gfar_process_frame returns void Date: Thu, 14 Feb 2013 17:00:05 +0200 Message-ID: <1360854007-11094-6-git-send-email-claudiu.manoil@freescale.com> X-Mailer: git-send-email 1.6.6 In-Reply-To: <1360854007-11094-5-git-send-email-claudiu.manoil@freescale.com> References: <1360854007-11094-1-git-send-email-claudiu.manoil@freescale.com> <1360854007-11094-2-git-send-email-claudiu.manoil@freescale.com> <1360854007-11094-3-git-send-email-claudiu.manoil@freescale.com> <1360854007-11094-4-git-send-email-claudiu.manoil@freescale.com> <1360854007-11094-5-git-send-email-claudiu.manoil@freescale.com> MIME-Version: 1.0 X-OriginatorOrg: freescale.net Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org No return code is expected from gfar_process_frame(), hence change it to return void. Signed-off-by: Claudiu Manoil --- drivers/net/ethernet/freescale/gianfar.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/freescale/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c index af0f4d6..d70f74c 100644 --- a/drivers/net/ethernet/freescale/gianfar.c +++ b/drivers/net/ethernet/freescale/gianfar.c @@ -133,8 +133,8 @@ static void gfar_netpoll(struct net_device *dev); #endif int gfar_clean_rx_ring(struct gfar_priv_rx_q *rx_queue, int rx_work_limit); static int gfar_clean_tx_ring(struct gfar_priv_tx_q *tx_queue); -static int gfar_process_frame(struct net_device *dev, struct sk_buff *skb, - int amount_pull, struct napi_struct *napi); +static void gfar_process_frame(struct net_device *dev, struct sk_buff *skb, + int amount_pull, struct napi_struct *napi); void gfar_halt(struct net_device *dev); static void gfar_halt_nodisable(struct net_device *dev); void gfar_start(struct net_device *dev); @@ -2692,8 +2692,8 @@ static inline void gfar_rx_checksum(struct sk_buff *skb, struct rxfcb *fcb) /* gfar_process_frame() -- handle one incoming packet if skb isn't NULL. */ -static int gfar_process_frame(struct net_device *dev, struct sk_buff *skb, - int amount_pull, struct napi_struct *napi) +static void gfar_process_frame(struct net_device *dev, struct sk_buff *skb, + int amount_pull, struct napi_struct *napi) { struct gfar_private *priv = netdev_priv(dev); struct rxfcb *fcb = NULL; @@ -2742,8 +2742,6 @@ static int gfar_process_frame(struct net_device *dev, struct sk_buff *skb, if (unlikely(GRO_DROP == ret)) atomic64_inc(&priv->extra_stats.kernel_dropped); - - return 0; } /* gfar_clean_rx_ring() -- Processes each frame in the rx ring