From patchwork Fri Jul 11 16:21:12 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arvid Brodin X-Patchwork-Id: 369203 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 C8560140078 for ; Sat, 12 Jul 2014 02:20:51 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754558AbaGKQUr (ORCPT ); Fri, 11 Jul 2014 12:20:47 -0400 Received: from spam1.webland.se ([91.207.112.90]:52658 "EHLO spam1.webland.se" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751492AbaGKQUq (ORCPT ); Fri, 11 Jul 2014 12:20:46 -0400 X-Greylist: delayed 521 seconds by postgrey-1.27 at vger.kernel.org; Fri, 11 Jul 2014 12:20:45 EDT Message-ID: <53C00EF8.1040403@alten.se> Date: Fri, 11 Jul 2014 18:21:12 +0200 From: Arvid Brodin User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.1.1 MIME-Version: 1.0 To: David Miller CC: Dan Carpenter , , "netdev@vger.kernel.org" Subject: [PATCH net-next] net/hsr: Remove left-over never-true conditional code. References: <20140710210037.GA14669@mwanda> In-Reply-To: <20140710210037.GA14669@mwanda> Received-SPF: none Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org MacAddressB is an array (unsigned char MacAddressB[ETH_ALEN]) and is allocated as a part of *node_dst (which is a struct hsr_node). So the condition is always false. Detected by Dan Carpenter. Signed-off-by: Arvid Brodin --- net/hsr/hsr_framereg.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/net/hsr/hsr_framereg.c b/net/hsr/hsr_framereg.c index c709c13..bace124 100644 --- a/net/hsr/hsr_framereg.c +++ b/net/hsr/hsr_framereg.c @@ -290,10 +290,6 @@ void hsr_addr_subst_dest(struct hsr_node *node_src, struct sk_buff *skb, } if (port->type != node_dst->AddrB_port) return; - if (!node_dst->MacAddressB) { - WARN_ONCE(1, "%s: No MacAddressB\n", __func__); - return; - } ether_addr_copy(eth_hdr(skb)->h_dest, node_dst->MacAddressB); }