From patchwork Mon Jan 26 17:01:46 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Greear X-Patchwork-Id: 20299 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.176.167]) by ozlabs.org (Postfix) with ESMTP id A86DBDE12A for ; Tue, 27 Jan 2009 04:02:53 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751470AbZAZRBz (ORCPT ); Mon, 26 Jan 2009 12:01:55 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753932AbZAZRBz (ORCPT ); Mon, 26 Jan 2009 12:01:55 -0500 Received: from mail.candelatech.com ([208.74.158.172]:34680 "EHLO ns3.lanforge.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751584AbZAZRBy (ORCPT ); Mon, 26 Jan 2009 12:01:54 -0500 Received: from [71.112.51.220] (pool-71-112-51-220.sttlwa.dsl-w.verizon.net [71.112.51.220]) (authenticated bits=0) by ns3.lanforge.com (8.14.2/8.14.2) with ESMTP id n0QH1knD004248 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 26 Jan 2009 09:01:47 -0800 Message-ID: <497DEC7A.1040405@candelatech.com> Date: Mon, 26 Jan 2009 09:01:46 -0800 From: Ben Greear Organization: Candela Technologies User-Agent: Thunderbird 2.0.0.19 (X11/20090105) MIME-Version: 1.0 To: Patrick McHardy , NetDev Subject: VLAN patch: Export symbols as non GPL symbols. Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In previous kernels, any kernel module could get access to the 'real-device' and the VLAN-ID for a particular VLAN. In more recent kernels, the code was restructured such that this is hard to do without accessing private .h files for any module that cannot use GPL-only symbols. Attached is a patch to once again allow non-GPL modules the ability to access the real-device and VLAN id for VLANs. This patch is against 2.6.29-rc2. Signed-Off-By: Ben Greear Thanks, Ben Acked-by: Patrick McHardy diff --git a/net/8021q/vlan_core.c b/net/8021q/vlan_core.c index 6c13239..e9db889 100644 --- a/net/8021q/vlan_core.c +++ b/net/8021q/vlan_core.c @@ -62,13 +62,13 @@ struct net_device *vlan_dev_real_dev(const struct net_device *dev) { return vlan_dev_info(dev)->real_dev; } -EXPORT_SYMBOL_GPL(vlan_dev_real_dev); +EXPORT_SYMBOL(vlan_dev_real_dev); u16 vlan_dev_vlan_id(const struct net_device *dev) { return vlan_dev_info(dev)->vlan_id; } -EXPORT_SYMBOL_GPL(vlan_dev_vlan_id); +EXPORT_SYMBOL(vlan_dev_vlan_id); static int vlan_gro_common(struct napi_struct *napi, struct vlan_group *grp, unsigned int vlan_tci, struct sk_buff *skb)