From patchwork Mon Mar 16 04:07:16 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Feldman X-Patchwork-Id: 450373 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 7D7B51400A0 for ; Mon, 16 Mar 2015 15:06:43 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=gmail.com header.i=@gmail.com header.b=csWX7Hg0; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751445AbbCPEGj (ORCPT ); Mon, 16 Mar 2015 00:06:39 -0400 Received: from mail-pd0-f181.google.com ([209.85.192.181]:33475 "EHLO mail-pd0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750867AbbCPEGc (ORCPT ); Mon, 16 Mar 2015 00:06:32 -0400 Received: by pdnc3 with SMTP id c3so46103392pdn.0 for ; Sun, 15 Mar 2015 21:06:31 -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=csWX7Hg0IiNvOrinzqqIlGWxFw0vGS7waBGMwQI8Att/Q2eboMt6y30OBJOcr3l6vG 3oSaFr6tBwsmPYjsVlwrBAnTK9BXtUGlzlZwTs78JateozRKMc3ElixJthXslLbEhCeP 9Y0y6+ljGCvscgVx1P4gX8PGhLgJkt2mWgHyWHdQIw++SW1p3ocRvRtY3ME3vGmwm5Jv c/z8sJka3A60CgXlJMey8hycZWf44sF/yTb4TfGykj7UI6hUx5YHBJNGuc7oSQYOt3Jo ILjVQDyXaCyhsMsMhfkb7+t9qu7pWAV0be3ig81S6bt6WAdhInHMQ60MOZEG4YzrsBzj 2CQw== X-Received: by 10.70.96.204 with SMTP id du12mr123806609pdb.151.1426478791570; Sun, 15 Mar 2015 21:06:31 -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 f12sm14656426pat.43.2015.03.15.21.06.29 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 15 Mar 2015 21:06:30 -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 v3 3/3] netdev: remove ndo ops for switchdev Date: Sun, 15 Mar 2015 21:07:16 -0700 Message-Id: <1426478836-60788-4-git-send-email-sfeldma@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1426478836-60788-1-git-send-email-sfeldma@gmail.com> References: <1426478836-60788-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 }; /**