From patchwork Tue Oct 10 07:30:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 823732 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=resnulli-us.20150623.gappssmtp.com header.i=@resnulli-us.20150623.gappssmtp.com header.b="vcxFXN7d"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yB80T68tcz9s83 for ; Tue, 10 Oct 2017 18:30:33 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755487AbdJJHaZ (ORCPT ); Tue, 10 Oct 2017 03:30:25 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:46531 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755361AbdJJHaW (ORCPT ); Tue, 10 Oct 2017 03:30:22 -0400 Received: by mail-wm0-f68.google.com with SMTP id m72so2347297wmc.1 for ; Tue, 10 Oct 2017 00:30:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=resnulli-us.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Dzb+9PTar/tz1rlCkiiPvtYcrx+0+DH6Af/3w46K274=; b=vcxFXN7deByNCD19t+wnKA0lgNsdvWk4lppa2+5QUPb+KcnNl8I4oBf5F8DhQ3AmtA E9GUZ1yv6X8b4nxkbfo5E/0OYJInj96dUExHdt6fOKtzDnB6rsEWNA8Vi6M2JJgmwUwe B5gwjLRAB9xxV5uRE9H2jNQ9FjEptCY8X47UOY/yvb+pFPm3ACdtw2W+YxN5eCrQsKLl gKyWkVHBCQLazktTYOfQzOQCgSOezNWhEMJh8SnVtMvxe5/F/icVPRLMMaG7Wv7qNXaw DMj/7YYV9Q2muBZ4zrBq30G4JpdWl1iKX7jiYgyPfHf3WRpwdQSehGasOvYNrBtOfNeo Lstw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Dzb+9PTar/tz1rlCkiiPvtYcrx+0+DH6Af/3w46K274=; b=LdBqNXh8est0WSvvnCNPX68tsm37IrwuKlB6Dz+CVmBWhsg6bcpi8hxsZY699gddrI nkCB34QZ2HbrFTWjokEi3BN1N6Cju7DaZp41GBWPCLA2F2abbwgA5XLaqqMSZJ6WL29m DE5CgRZL2NYHMdrjdcVjAwbtIWhwWh1enlLvONg17YfzdcmCtTxDuKhEGmryZmjVE2JJ CcYhUYQQ7Od4wRNkltZ7sfieiTt3ss/MqvtbZRaSctpdQzm2aGQyTUlLXB4w8fAIjHm+ WOq1KvQT7U/HCAwpI4XyPB80ORC/h37lR/b/t4AJCQ71/DD4SYuVBvF+mOWr4D+Rmqr2 hF5w== X-Gm-Message-State: AMCzsaUaCLqUIqqLtZ5jPQOKIeE+Cb2RSs62AhZlxjDfP19L8K8sJucM H6I1Vd+KGFcIMeMtZiYFDRXKx13A X-Google-Smtp-Source: AOwi7QBUgsvOiO/Nzay5sSKmViL7m1fJjrCzWtfwxbjHavsQkJOZwp8VHrRvx7vJI4pv/4dH2okUew== X-Received: by 10.28.105.76 with SMTP id e73mr3368048wmc.116.1507620621318; Tue, 10 Oct 2017 00:30:21 -0700 (PDT) Received: from localhost (ip-89-177-136-69.net.upcbroadband.cz. [89.177.136.69]) by smtp.gmail.com with ESMTPSA id f188sm5199495wme.21.2017.10.10.00.30.20 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Oct 2017 00:30:21 -0700 (PDT) From: Jiri Pirko To: netdev@vger.kernel.org Cc: davem@davemloft.net, jhs@mojatatu.com, xiyou.wangcong@gmail.com, saeedm@mellanox.com, matanb@mellanox.com, leonro@mellanox.com, mlxsw@mellanox.com Subject: [patch net-next 4/4] net: sched: remove unused tcf_exts_get_dev helper and cls_flower->egress_dev Date: Tue, 10 Oct 2017 09:30:16 +0200 Message-Id: <20171010073016.3682-5-jiri@resnulli.us> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20171010073016.3682-1-jiri@resnulli.us> References: <20171010073016.3682-1-jiri@resnulli.us> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jiri Pirko The helper and the struct field ares no longer used by any code, so remove them. Signed-off-by: Jiri Pirko --- include/net/pkt_cls.h | 3 --- net/sched/cls_api.c | 22 ---------------------- 2 files changed, 25 deletions(-) diff --git a/include/net/pkt_cls.h b/include/net/pkt_cls.h index c0bdf5c..f526374 100644 --- a/include/net/pkt_cls.h +++ b/include/net/pkt_cls.h @@ -204,8 +204,6 @@ void tcf_exts_destroy(struct tcf_exts *exts); void tcf_exts_change(struct tcf_exts *dst, struct tcf_exts *src); int tcf_exts_dump(struct sk_buff *skb, struct tcf_exts *exts); int tcf_exts_dump_stats(struct sk_buff *skb, struct tcf_exts *exts); -int tcf_exts_get_dev(struct net_device *dev, struct tcf_exts *exts, - struct net_device **hw_dev); /** * struct tcf_pkt_info - packet information @@ -517,7 +515,6 @@ struct tc_cls_flower_offload { struct fl_flow_key *mask; struct fl_flow_key *key; struct tcf_exts *exts; - bool egress_dev; }; enum tc_matchall_command { diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c index 51994a2..2977b8a 100644 --- a/net/sched/cls_api.c +++ b/net/sched/cls_api.c @@ -1004,28 +1004,6 @@ int tcf_exts_dump_stats(struct sk_buff *skb, struct tcf_exts *exts) } EXPORT_SYMBOL(tcf_exts_dump_stats); -int tcf_exts_get_dev(struct net_device *dev, struct tcf_exts *exts, - struct net_device **hw_dev) -{ -#ifdef CONFIG_NET_CLS_ACT - const struct tc_action *a; - LIST_HEAD(actions); - - if (!tcf_exts_has_actions(exts)) - return -EINVAL; - - tcf_exts_to_list(exts, &actions); - list_for_each_entry(a, &actions, list) { - if (a->ops->get_dev) - *hw_dev = a->ops->get_dev(a); - } - if (*hw_dev) - return 0; -#endif - return -EOPNOTSUPP; -} -EXPORT_SYMBOL(tcf_exts_get_dev); - static int tc_exts_setup_cb_egdev_call(struct tcf_exts *exts, enum tc_setup_type type, void *type_data, bool err_stop)