From patchwork Wed Jul 18 19:09:48 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: stephen hemminger X-Patchwork-Id: 171813 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 BA6182C00B7 for ; Thu, 19 Jul 2012 05:09:59 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755668Ab2GRTJ4 (ORCPT ); Wed, 18 Jul 2012 15:09:56 -0400 Received: from mail.vyatta.com ([76.74.103.46]:51533 "EHLO mail.vyatta.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755327Ab2GRTJz (ORCPT ); Wed, 18 Jul 2012 15:09:55 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by mail.vyatta.com (Postfix) with ESMTP id A41EF14105BC; Wed, 18 Jul 2012 12:09:53 -0700 (PDT) X-Virus-Scanned: amavisd-new at tahiti.vyatta.com Received: from mail.vyatta.com ([127.0.0.1]) by localhost (mail.vyatta.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id g70bD6ZEfzpj; Wed, 18 Jul 2012 12:09:49 -0700 (PDT) Received: from s6510.linuxnetplumber.net (unknown [67.23.204.5]) by mail.vyatta.com (Postfix) with ESMTPSA id 071D414101DD; Wed, 18 Jul 2012 12:09:48 -0700 (PDT) Date: Wed, 18 Jul 2012 12:09:48 -0700 From: Stephen Hemminger To: David Miller , Arnaldo Carvalho de Melo Cc: netdev@vger.kernel.org Subject: [PATCH net-next] ipx: move peII functions Message-ID: <20120718120948.67611bdd@s6510.linuxnetplumber.net> Organization: Vyatta X-Mailer: Claws Mail 3.8.1 (GTK+ 2.24.10; x86_64-pc-linux-gnu) Mime-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The Ethernet II wrapper is only used by IPX protocol, may have once been used by Appletalk but not currently. Therefore it makes sense to move it to the IPX dust bin and drop the exports. Build tested only. Signed-off-by: Stephen Hemminger --- net/ethernet/Makefile | 2 -- net/ethernet/pe2.c | 37 ------------------------------------- net/ipx/Makefile | 2 +- net/ipx/pe2.c | 35 +++++++++++++++++++++++++++++++++++ 4 files changed, 36 insertions(+), 40 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 --- a/net/ethernet/Makefile 2012-07-16 12:08:12.163683266 -0700 +++ b/net/ethernet/Makefile 2012-07-17 09:25:49.009927882 -0700 @@ -3,5 +3,3 @@ # obj-y += eth.o -obj-$(subst m,y,$(CONFIG_IPX)) += pe2.o -obj-$(subst m,y,$(CONFIG_ATALK)) += pe2.o --- a/net/ethernet/pe2.c 2012-07-16 12:08:12.163683266 -0700 +++ /dev/null 1970-01-01 00:00:00.000000000 +0000 @@ -1,37 +0,0 @@ -#include -#include -#include -#include -#include -#include - -#include - -static int pEII_request(struct datalink_proto *dl, - struct sk_buff *skb, unsigned char *dest_node) -{ - struct net_device *dev = skb->dev; - - skb->protocol = htons(ETH_P_IPX); - dev_hard_header(skb, dev, ETH_P_IPX, dest_node, NULL, skb->len); - return dev_queue_xmit(skb); -} - -struct datalink_proto *make_EII_client(void) -{ - struct datalink_proto *proto = kmalloc(sizeof(*proto), GFP_ATOMIC); - - if (proto) { - proto->header_length = 0; - proto->request = pEII_request; - } - - return proto; -} -EXPORT_SYMBOL(make_EII_client); - -void destroy_EII_client(struct datalink_proto *dl) -{ - kfree(dl); -} -EXPORT_SYMBOL(destroy_EII_client); --- a/net/ipx/Makefile 2012-07-16 12:08:12.219683209 -0700 +++ b/net/ipx/Makefile 2012-07-17 09:27:36.218231168 -0700 @@ -4,5 +4,5 @@ obj-$(CONFIG_IPX) += ipx.o -ipx-y := af_ipx.o ipx_route.o ipx_proc.o +ipx-y := af_ipx.o ipx_route.o ipx_proc.o pe2.o ipx-$(CONFIG_SYSCTL) += sysctl_net_ipx.o --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ b/net/ipx/pe2.c 2012-07-17 09:28:21.478359247 -0700 @@ -0,0 +1,35 @@ +#include +#include +#include +#include +#include +#include + +#include + +static int pEII_request(struct datalink_proto *dl, + struct sk_buff *skb, unsigned char *dest_node) +{ + struct net_device *dev = skb->dev; + + skb->protocol = htons(ETH_P_IPX); + dev_hard_header(skb, dev, ETH_P_IPX, dest_node, NULL, skb->len); + return dev_queue_xmit(skb); +} + +struct datalink_proto *make_EII_client(void) +{ + struct datalink_proto *proto = kmalloc(sizeof(*proto), GFP_ATOMIC); + + if (proto) { + proto->header_length = 0; + proto->request = pEII_request; + } + + return proto; +} + +void destroy_EII_client(struct datalink_proto *dl) +{ + kfree(dl); +}