From patchwork Tue Mar 26 18:29:30 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pravin B Shelar X-Patchwork-Id: 231510 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 5319E2C0079 for ; Wed, 27 Mar 2013 05:29:41 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760080Ab3CZS3h (ORCPT ); Tue, 26 Mar 2013 14:29:37 -0400 Received: from na3sys009aog122.obsmtp.com ([74.125.149.147]:35445 "HELO na3sys009aog122.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1754057Ab3CZS3g (ORCPT ); Tue, 26 Mar 2013 14:29:36 -0400 Received: from mail-pd0-f198.google.com ([209.85.192.198]) (using TLSv1) by na3sys009aob122.postini.com ([74.125.148.12]) with SMTP ID DSNKUVHpD4cDb4QM2ZTBSFkHoLK6twtsseH7@postini.com; Tue, 26 Mar 2013 11:29:36 PDT Received: by mail-pd0-f198.google.com with SMTP id 4so6798115pdd.5 for ; Tue, 26 Mar 2013 11:29:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-received:from:to:cc:subject:date:message-id:x-mailer :x-gm-message-state; bh=KjxhxEvwbSCWhn9WpMtc+faJqgVfu+0hKEdrEgYpkmU=; b=X2lNBHShJF8BLnoS993UEZElvejeq/2lZV0yJUZX02BJHyxSbUHiMDFpII1uZUfkNV tN/2Z/dxGHuWDn5YQnCPd0D625AsDGbeBZnaslBECQ0mjnqWcQdUeS51189Ed1vSvzQ4 44/nJwFM2tEQLcicqpqrkrxtNslfoPk4X//ilyfxpXZu2hzjgdMKSmaBrfF0iLUUK7f2 KvuXzwNHBRoinaVfGWW2WB2+gCa5CJuQjEEyIIlmjk2ltDnvlcL9pFDfIkGRTyVFc8Z7 EEhdLfGHB1RAiKre+SkYcSacenh3BzCfycY+oXNqz+3D1vMEupOgas2KHmQd9AGVyG09 W5qw== X-Received: by 10.68.211.8 with SMTP id my8mr24744764pbc.7.1364322575221; Tue, 26 Mar 2013 11:29:35 -0700 (PDT) X-Received: by 10.68.211.8 with SMTP id my8mr24744753pbc.7.1364322575120; Tue, 26 Mar 2013 11:29:35 -0700 (PDT) Received: from localhost ([75.98.92.113]) by mx.google.com with ESMTPS id i10sm18387863pbd.1.2013.03.26.11.29.33 (version=TLSv1.1 cipher=RC4-SHA bits=128/128); Tue, 26 Mar 2013 11:29:34 -0700 (PDT) From: Pravin B Shelar To: netdev@vger.kernel.org Cc: davem@davemloft.net, jesse@nicira.com, Pravin B Shelar , Stephen Hemminger Subject: [PATCH net-next] VXLAN: Fix sparse warnings. Date: Tue, 26 Mar 2013 11:29:30 -0700 Message-Id: <1364322570-27179-1-git-send-email-pshelar@nicira.com> X-Mailer: git-send-email 1.8.2.135.g7b592fa X-Gm-Message-State: ALoCoQl4vwixo4i0Uz8YwOjzkNdfBPFPmnJstTM3cmC14qLvrn+D7VI6hH3pM53oBzeyvcVZsJyMMzPdA24F91SDAqQHrIguzc7yzI3Bu8JdXka7qDX3y/9tbLaegqHwZoAtwrwO4YsEAFr0VgcAJHD1TUBYzY5EHUr0h1tJVrN8VnJabsp6O3E= Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Fixes following warning:- drivers/net/vxlan.c:471:35: warning: symbol 'dev' shadows an earlier one drivers/net/vxlan.c:433:26: originally declared here drivers/net/vxlan.c:794:34: warning: symbol 'vxlan' shadows an earlier one drivers/net/vxlan.c:757:26: originally declared here CC: Stephen Hemminger Signed-off-by: Pravin B Shelar --- drivers/net/vxlan.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c index 7624ab1..62a4438 100644 --- a/drivers/net/vxlan.c +++ b/drivers/net/vxlan.c @@ -468,15 +468,15 @@ static int vxlan_fdb_add(struct ndmsg *ndm, struct nlattr *tb[], vni = vxlan->vni; if (tb[NDA_IFINDEX]) { - struct net_device *dev; + struct net_device *tdev; if (nla_len(tb[NDA_IFINDEX]) != sizeof(u32)) return -EINVAL; ifindex = nla_get_u32(tb[NDA_IFINDEX]); - dev = dev_get_by_index(net, ifindex); - if (!dev) + tdev = dev_get_by_index(net, ifindex); + if (!tdev) return -EADDRNOTAVAIL; - dev_put(dev); + dev_put(tdev); } else ifindex = 0; @@ -792,7 +792,6 @@ static int arp_reduce(struct net_device *dev, struct sk_buff *skb) n = neigh_lookup(&arp_tbl, &tip, dev); if (n) { - struct vxlan_dev *vxlan = netdev_priv(dev); struct vxlan_fdb *f; struct sk_buff *reply;