From patchwork Thu Dec 2 06:07:31 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Changli Gao X-Patchwork-Id: 73939 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 EEB191007D2 for ; Thu, 2 Dec 2010 17:08:01 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756893Ab0LBGHz (ORCPT ); Thu, 2 Dec 2010 01:07:55 -0500 Received: from mail-gx0-f174.google.com ([209.85.161.174]:54764 "EHLO mail-gx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753614Ab0LBGHz (ORCPT ); Thu, 2 Dec 2010 01:07:55 -0500 Received: by gxk1 with SMTP id 1so957425gxk.19 for ; Wed, 01 Dec 2010 22:07:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer; bh=REiKfY6orYfzS58rR56pS4IaTFHiph7H3EM52Ds/llk=; b=SS71XDIGsvB/tAhRggcU5SRfmrGQbKWw/YEZpkFNwdd23NmqOxwW1jjvny3MOwuR53 qXqmPK1As7PjxjTHgHg3xAk/94vA9T5REiNyWnfx8wCSF3gUro+IxgYoU093qQUkq8+6 FvDHPVCKkf142Sb03sdk1qHBHG7zw9oZd9fC8= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=o1XUfEje71zTGLK6wi4hCVVJPuCIetG4wCwcJaSFeacQKZx3lZoENBRI/pccLLB9ac Uc1YXM7AGXiVM2UDCYgG7VL2cBV3igIxEMeHfYA0M9VojiC0oKk0b1ZR4EzglrBBdLIV FSkdhMg6f+9caHus0mlibOXS0msfXEr8ICGcc= Received: by 10.91.199.38 with SMTP id b38mr692638agq.39.1291270074536; Wed, 01 Dec 2010 22:07:54 -0800 (PST) Received: from localhost.localdomain ([221.239.34.230]) by mx.google.com with ESMTPS id n67sm95857yha.26.2010.12.01.22.07.47 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 01 Dec 2010 22:07:52 -0800 (PST) From: Changli Gao To: "David S. Miller" Cc: netdev@vger.kernel.org, Changli Gao Subject: [PATCH] net: arp: use assignment Date: Thu, 2 Dec 2010 14:07:31 +0800 Message-Id: <1291270051-27109-1-git-send-email-xiaosuo@gmail.com> X-Mailer: git-send-email 1.7.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Only when dont_send is 0, arp_filter() is consulted, so we can simply assign the return value of arp_filter() to dont_send instead. Signed-off-by: Changli Gao --- net/ipv4/arp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c index 7833f17..10af759 100644 --- a/net/ipv4/arp.c +++ b/net/ipv4/arp.c @@ -883,7 +883,7 @@ static int arp_process(struct sk_buff *skb) dont_send = arp_ignore(in_dev, sip, tip); if (!dont_send && IN_DEV_ARPFILTER(in_dev)) - dont_send |= arp_filter(sip, tip, dev); + dont_send = arp_filter(sip, tip, dev); if (!dont_send) { n = neigh_event_ns(&arp_tbl, sha, &sip, dev); if (n) {