From patchwork Sat Jul 20 12:09:28 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rami Rosen X-Patchwork-Id: 260425 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 AB82D2C009D for ; Sat, 20 Jul 2013 19:09:54 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752252Ab3GTJJr (ORCPT ); Sat, 20 Jul 2013 05:09:47 -0400 Received: from mail-ee0-f48.google.com ([74.125.83.48]:55970 "EHLO mail-ee0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751308Ab3GTJJp (ORCPT ); Sat, 20 Jul 2013 05:09:45 -0400 Received: by mail-ee0-f48.google.com with SMTP id b47so2801582eek.35 for ; Sat, 20 Jul 2013 02:09:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=tHGT9Be4qeZzaeTOhSztY03qoi1A8x67TyWDvbazsqQ=; b=nQhF1ncl1836wuBpqDc5jTpc8h2d+zW8UJs+Q10gxrAhIw+GQid77U0qE/YHruF1wx 79XSV31s/2eVDBqekJOSCsUovMjZ+U+y9JW/o3R1HOlvcWMafxdBMLdCHAx7O76shQZR YFUNgsInWiEOvUUboRxnFgkAQQYKJwOyElWTB/VrmrMAG/2f1wTIA+p0sc+L9U3gV21E qtCATRRPAl6bqQ0hvoH7aofOxJDL+iJbiE0Lx83CPz3smL/rXXBAEFkBWrA9c6rck7Ch Cc1c5yudr3qKqUXBOY0Qoj6mjaJJ9nhPMUyIwtt2hrfo0sBYzuf7eNNPByjqOh2bkTMK TpZQ== X-Received: by 10.14.47.196 with SMTP id t44mr19627764eeb.18.1374311383005; Sat, 20 Jul 2013 02:09:43 -0700 (PDT) Received: from localhost.localdomain (bzq-79-180-4-188.red.bezeqint.net. [79.180.4.188]) by mx.google.com with ESMTPSA id r54sm33778419eev.8.2013.07.20.02.09.40 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sat, 20 Jul 2013 02:09:41 -0700 (PDT) From: Rami Rosen To: davem@davemloft.net Cc: nicolas.dichtel@6wind.com, netdev@vger.kernel.org, Rami Rosen Subject: [PATCH v3 net-next] ipmr: change the prototype of ip_mr_forward(). Date: Sat, 20 Jul 2013 15:09:28 +0300 Message-Id: <1374322168-5115-1-git-send-email-ramirose@gmail.com> X-Mailer: git-send-email 1.8.1.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch changes the prototpye of the ip_mr_forward() method to return void instead of int. The ip_mr_forward() method always returns 0; moreover, the return value of this method is not checked anywhere. Signed-off-by: Rami Rosen Acked-by: Nicolas Dichtel --- net/ipv4/ipmr.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c index 132a096..bacc0bc 100644 --- a/net/ipv4/ipmr.c +++ b/net/ipv4/ipmr.c @@ -127,9 +127,9 @@ static struct kmem_cache *mrt_cachep __read_mostly; static struct mr_table *ipmr_new_table(struct net *net, u32 id); static void ipmr_free_table(struct mr_table *mrt); -static int ip_mr_forward(struct net *net, struct mr_table *mrt, - struct sk_buff *skb, struct mfc_cache *cache, - int local); +static void ip_mr_forward(struct net *net, struct mr_table *mrt, + struct sk_buff *skb, struct mfc_cache *cache, + int local); static int ipmr_cache_report(struct mr_table *mrt, struct sk_buff *pkt, vifi_t vifi, int assert); static int __ipmr_fill_mroute(struct mr_table *mrt, struct sk_buff *skb, @@ -1795,9 +1795,9 @@ static int ipmr_find_vif(struct mr_table *mrt, struct net_device *dev) /* "local" means that we should preserve one skb (for local delivery) */ -static int ip_mr_forward(struct net *net, struct mr_table *mrt, - struct sk_buff *skb, struct mfc_cache *cache, - int local) +static void ip_mr_forward(struct net *net, struct mr_table *mrt, + struct sk_buff *skb, struct mfc_cache *cache, + int local) { int psend = -1; int vif, ct; @@ -1903,14 +1903,13 @@ last_forward: ipmr_queue_xmit(net, mrt, skb2, cache, psend); } else { ipmr_queue_xmit(net, mrt, skb, cache, psend); - return 0; + return; } } dont_forward: if (!local) kfree_skb(skb); - return 0; } static struct mr_table *ipmr_rt_fib_lookup(struct net *net, struct sk_buff *skb)