From patchwork Tue Aug 6 07:32:51 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?J=CE=B5an_Sacren?= X-Patchwork-Id: 264886 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 138462C0085 for ; Tue, 6 Aug 2013 17:35:14 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755431Ab3HFHfH (ORCPT ); Tue, 6 Aug 2013 03:35:07 -0400 Received: from mail-pa0-f46.google.com ([209.85.220.46]:47444 "EHLO mail-pa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754953Ab3HFHfF (ORCPT ); Tue, 6 Aug 2013 03:35:05 -0400 Received: by mail-pa0-f46.google.com with SMTP id fa1so368242pad.33 for ; Tue, 06 Aug 2013 00:35:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:x-mailer:in-reply-to:references; bh=Gz7lFcXr9imNAdlh6NsDWoq3jgeKaZzzXbQ8rTD03O0=; b=idxcuu0WnnbzjVVUGDfGLvGJ+E4vQjzz6JixzyeO8Z/5bz/QEPaIISVP7XU1d8WBHx FXoxBRADysUKdirNTWKAy/LTxQRCC+e1aeSuoi57qR8M0/ClUNdNKLaCq9kqueg8iW7z mE6C/SXliHfele8gs+l1ZHlTbdgaU4NDmKWYTUcMq8n5c7e0h3sHVcwj84EHED8Jh2e9 cI4yqKYTz3ih00P0170RZMt3SV4i62RHMXLeXVBeZevDHSVJgHdgyAK6MsJRf5jsc5JT a7FrLmFxg1Iud+YxRsUZ9G1ZwCYhUScB5nTQaz3Xrjbf38KhEcf5Dog/yfyHcgmaE3yq +www== X-Received: by 10.68.216.33 with SMTP id on1mr16924001pbc.107.1375774504590; Tue, 06 Aug 2013 00:35:04 -0700 (PDT) Received: from localhost ([76.8.208.182]) by mx.google.com with ESMTPSA id 4sm277437pbw.32.2013.08.06.00.35.02 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 06 Aug 2013 00:35:03 -0700 (PDT) From: Jean Sacren To: netdev@vger.kernel.org Subject: [PATCH net-next 3/3] net: core: fix wrong linkage for ptype_base and ptype_all symbols Date: Tue, 6 Aug 2013 01:32:51 -0600 Message-Id: <1375774371-831-3-git-send-email-sakiwit@gmail.com> X-Mailer: git-send-email 1.8.1.5 In-Reply-To: <1375774371-831-1-git-send-email-sakiwit@gmail.com> References: <1375774371-831-1-git-send-email-sakiwit@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In commit 900ff8c6 ("net: move procfs code to net/core/net-procfs.c"), it changed the correct linkage of ptype_base and ptype_all symbols to the wrong one in net/core/dev.c, yet failed to change to the correct linkage of those two in net/core/net-procfs.c. Fix the wrong linkage by setting static specifier to both sets of the symbols so that they could have coherent internal linkage by themselves to avoid interference with each other. Signed-off-by: Jean Sacren --- net/core/dev.c | 4 ++-- net/core/net-procfs.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) -- 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/core/dev.c b/net/core/dev.c index dfd9f5d..d85e5e1 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -142,8 +142,8 @@ static DEFINE_SPINLOCK(ptype_lock); static DEFINE_SPINLOCK(offload_lock); -struct list_head ptype_base[PTYPE_HASH_SIZE] __read_mostly; -struct list_head ptype_all __read_mostly; /* Taps */ +static struct list_head ptype_base[PTYPE_HASH_SIZE] __read_mostly; +static struct list_head ptype_all __read_mostly; /* Taps */ static struct list_head offload_base __read_mostly; /* diff --git a/net/core/net-procfs.c b/net/core/net-procfs.c index 2bf8329..e57cd63 100644 --- a/net/core/net-procfs.c +++ b/net/core/net-procfs.c @@ -9,8 +9,8 @@ #define get_offset(x) ((x) & ((1 << BUCKET_SPACE) - 1)) #define set_bucket_offset(b, o) ((b) << BUCKET_SPACE | (o)) -extern struct list_head ptype_all __read_mostly; -extern struct list_head ptype_base[PTYPE_HASH_SIZE] __read_mostly; +static struct list_head ptype_all __read_mostly; +static struct list_head ptype_base[PTYPE_HASH_SIZE] __read_mostly; static inline struct net_device *dev_from_same_bucket(struct seq_file *seq, loff_t *pos) {