From patchwork Mon Mar 16 01:45:21 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Feldman X-Patchwork-Id: 450363 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 6904C14010F for ; Mon, 16 Mar 2015 12:44:26 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=gmail.com header.i=@gmail.com header.b=b1plC2cV; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752720AbbCPBoW (ORCPT ); Sun, 15 Mar 2015 21:44:22 -0400 Received: from mail-pa0-f43.google.com ([209.85.220.43]:33706 "EHLO mail-pa0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752690AbbCPBoT (ORCPT ); Sun, 15 Mar 2015 21:44:19 -0400 Received: by pagr17 with SMTP id r17so49066595pag.0 for ; Sun, 15 Mar 2015 18:44:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=BAB5PYfX6b/IwxnX/19cQvUDtY7i6cW8lTr0JOc/cpk=; b=b1plC2cV/Rcc2L/jfFJwh3ZqlSIBK856qlALHyZmcKL9EcWL4mcYObBgABTWFr7bng /wn8OjTQrcZ52I5iQ8/adxtrbmoq9VvOberiWBz9mRJbKeiOKoEsZJqU0oO37HyvRwqV D51Kmhi5awutufaLfVXdF1b/zk9v/lvr/PByigBD/KmLrnRFZHqv5dhCP9N3m6OMULVt 4brBZNBZ6jf3Y2lRJK1jwOBDUYesFgiOcRW+Lzo4IRNOyi4fT7xA+17MCgD3DmzmFnBJ MAaEO13c4wCrPnoVvpQB/hVDl9G6eT8cPwjJx65duQ2unTX3BwXKs6ISC+zAc+yFoVFK lU1w== X-Received: by 10.66.142.100 with SMTP id rv4mr132789405pab.84.1426470258734; Sun, 15 Mar 2015 18:44:18 -0700 (PDT) Received: from rocker1.home (static-50-53-122-54.bvtn.or.frontiernet.net. [50.53.122.54]) by mx.google.com with ESMTPSA id di10sm14272599pad.41.2015.03.15.18.44.17 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 15 Mar 2015 18:44:18 -0700 (PDT) From: sfeldma@gmail.com To: netdev@vger.kernel.org Cc: jiri@resnulli.us, roopa@cumulusnetworks.com, simon.horman@netronome.com Subject: [PATCH net-next v2 3/3] netdev: remove ndo ops for switchdev Date: Sun, 15 Mar 2015 18:45:21 -0700 Message-Id: <1426470321-48669-4-git-send-email-sfeldma@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1426470321-48669-1-git-send-email-sfeldma@gmail.com> References: <1426470321-48669-1-git-send-email-sfeldma@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Scott Feldman Signed-off-by: Scott Feldman --- include/linux/netdevice.h | 38 -------------------------------------- 1 file changed, 38 deletions(-) diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 9e8a2a9..dd1d069 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -768,8 +768,6 @@ struct netdev_phys_item_id { typedef u16 (*select_queue_fallback_t)(struct net_device *dev, struct sk_buff *skb); -struct fib_info; - /* * This structure defines the management hooks for network devices. * The following hooks can be defined; unless noted otherwise, they are @@ -1024,23 +1022,6 @@ struct fib_info; * be otherwise expressed by feature flags. The check is called with * the set of features that the stack has calculated and it returns * those the driver believes to be appropriate. - * - * int (*ndo_switch_parent_id_get)(struct net_device *dev, - * struct netdev_phys_item_id *psid); - * Called to get an ID of the switch chip this port is part of. - * If driver implements this, it indicates that it represents a port - * of a switch chip. - * int (*ndo_switch_port_stp_update)(struct net_device *dev, u8 state); - * Called to notify switch device port of bridge port STP - * state change. - * int (*ndo_sw_parent_fib_ipv4_add)(struct net_device *dev, __be32 dst, - * int dst_len, struct fib_info *fi, - * u8 tos, u8 type, u32 nlflags, u32 tb_id); - * Called to add/modify IPv4 route to switch device. - * int (*ndo_sw_parent_fib_ipv4_del)(struct net_device *dev, __be32 dst, - * int dst_len, struct fib_info *fi, - * u8 tos, u8 type, u32 tb_id); - * Called to delete IPv4 route from switch device. */ struct net_device_ops { int (*ndo_init)(struct net_device *dev); @@ -1197,25 +1178,6 @@ struct net_device_ops { netdev_features_t (*ndo_features_check) (struct sk_buff *skb, struct net_device *dev, netdev_features_t features); -#ifdef CONFIG_NET_SWITCHDEV - int (*ndo_switch_parent_id_get)(struct net_device *dev, - struct netdev_phys_item_id *psid); - int (*ndo_switch_port_stp_update)(struct net_device *dev, - u8 state); - int (*ndo_switch_fib_ipv4_add)(struct net_device *dev, - __be32 dst, - int dst_len, - struct fib_info *fi, - u8 tos, u8 type, - u32 nlflags, - u32 tb_id); - int (*ndo_switch_fib_ipv4_del)(struct net_device *dev, - __be32 dst, - int dst_len, - struct fib_info *fi, - u8 tos, u8 type, - u32 tb_id); -#endif }; /**