From patchwork Sun Jul 17 19:30:07 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Miller X-Patchwork-Id: 105087 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 43A76B6F84 for ; Mon, 18 Jul 2011 05:30:25 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756229Ab1GQTaP (ORCPT ); Sun, 17 Jul 2011 15:30:15 -0400 Received: from shards.monkeyblade.net ([198.137.202.13]:38795 "EHLO shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754797Ab1GQTaI (ORCPT ); Sun, 17 Jul 2011 15:30:08 -0400 Received: from localhost (74-93-104-98-Washington.hfc.comcastbusiness.net [74.93.104.98]) (authenticated bits=0) by shards.monkeyblade.net (8.14.4/8.14.4) with ESMTP id p6HJU79s028580 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Sun, 17 Jul 2011 12:30:07 -0700 Date: Sun, 17 Jul 2011 12:30:07 -0700 (PDT) Message-Id: <20110717.123007.1736899942069308447.davem@davemloft.net> To: netdev@vger.kernel.org Subject: [PATCH 1/5] net: Create and use new helper, neigh_output(). From: David Miller X-Mailer: Mew version 6.3 on Emacs 23.2 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.6 (shards.monkeyblade.net [198.137.202.13]); Sun, 17 Jul 2011 12:30:08 -0700 (PDT) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: David S. Miller --- include/net/neighbour.h | 9 +++++++++ net/ipv4/ip_output.c | 10 +++------- net/ipv6/ip6_output.c | 10 +++------- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/include/net/neighbour.h b/include/net/neighbour.h index bd8f9f0..337da24 100644 --- a/include/net/neighbour.h +++ b/include/net/neighbour.h @@ -344,6 +344,15 @@ static inline int neigh_hh_output(struct hh_cache *hh, struct sk_buff *skb) return hh->hh_output(skb); } +static inline int neigh_output(struct neighbour *n, struct sk_buff *skb) +{ + struct hh_cache *hh = &n->hh; + if (hh->hh_len) + return neigh_hh_output(hh, skb); + else + return n->output(skb); +} + static inline struct neighbour * __neigh_lookup(struct neigh_table *tbl, const void *pkey, struct net_device *dev, int creat) { diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c index 1ac674a..db296a9 100644 --- a/net/ipv4/ip_output.c +++ b/net/ipv4/ip_output.c @@ -205,13 +205,9 @@ static inline int ip_finish_output2(struct sk_buff *skb) } neigh = dst->neighbour; - if (neigh) { - struct hh_cache *hh = &neigh->hh; - if (hh->hh_len) - return neigh_hh_output(hh, skb); - else - return neigh->output(skb); - } + if (neigh) + return neigh_output(neigh, skb); + if (net_ratelimit()) printk(KERN_DEBUG "ip_finish_output2: No header cache and no neighbour!\n"); kfree_skb(skb); diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index 36362e9..eb50bb0 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c @@ -136,13 +136,9 @@ static int ip6_finish_output2(struct sk_buff *skb) } neigh = dst->neighbour; - if (neigh) { - struct hh_cache *hh = &neigh->hh; - if (hh->hh_len) - return neigh_hh_output(hh, skb); - else - return neigh->output(skb); - } + if (neigh) + return neigh_output(neigh, skb); + IP6_INC_STATS_BH(dev_net(dst->dev), ip6_dst_idev(dst), IPSTATS_MIB_OUTNOROUTES); kfree_skb(skb);