From patchwork Thu Jun 10 17:34:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Oltean X-Patchwork-Id: 459045 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CF827C47094 for ; Thu, 10 Jun 2021 17:35:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B9770613D0 for ; Thu, 10 Jun 2021 17:35:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230411AbhFJRhC (ORCPT ); Thu, 10 Jun 2021 13:37:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59134 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230407AbhFJRhB (ORCPT ); Thu, 10 Jun 2021 13:37:01 -0400 Received: from mail-ed1-x533.google.com (mail-ed1-x533.google.com [IPv6:2a00:1450:4864:20::533]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C6D80C061760 for ; Thu, 10 Jun 2021 10:35:04 -0700 (PDT) Received: by mail-ed1-x533.google.com with SMTP id cb9so34042830edb.1 for ; Thu, 10 Jun 2021 10:35:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=pPFtNdBfRE3W0V85CFXuPYglVMWW28G+16rA3Kbzhw0=; b=D3oPwX7wuoA0V2tluHcQFWuEPMQdyaSG/kkjhy5isYdEFJDWcB0OmTND7QY+Bh5QH5 mdj7V1OonBGNNKS0RE+Qb+CQvxAAtA6UUNMx1oymMX76LdxVIrPKwkJ2zYBb/OZRNxi2 pRTM5JoyPTMLrQBaOKI6cQqEDq6LN2s/JIvTexkAMXwcLjX/l3bj4uZGMKFSzg3OMi39 DSlYbHWhGGwWHjO+7YgAQcp3BDH/RWrbC90COAVKAgprXqWCjQ3AfzkovpoAaF3DX/co GXSumaPw5TXGBoY7XbWBysLRFroS2XDysyTDQfVOMQbXMMvV/JeBvLuFGc1hGbCYpQ56 ceeQ== 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:mime-version:content-transfer-encoding; bh=pPFtNdBfRE3W0V85CFXuPYglVMWW28G+16rA3Kbzhw0=; b=V71WwSUbO4HiRkW/Civu4V1FyMuOt3Ip+iR41DUVxXCw51/7t0IF8sLOO+3UOHqjs1 DzPo34bVwu6qZCczLkvyUPetXJp5iM2eppEAlqHlXsJT176xhX0aMryFvUSsoKFSjDFx iKBT0DBtwPbrhmlVCXFzQnerWx6mnBZSnGgdUysbscaQ2q5tLYiZVWq8p/bEXERzvkEz UU2GX6D6ASRsz+ep/tPsn3xD6wvMG0CYSYG5L4Y7QHElflBER80KGehuy0D+i+zyiPMZ mHsJlfAuZdDtzWotGIYlo90LNO7VsiU8jZIt1B3rfZQwbmWbYfQ3DeZv24S4IuMt2ISO jGAQ== X-Gm-Message-State: AOAM531SPoZuLPRAqyLuc3P9PekWOE/4mmetFcfYuaspUoJTpCz/kxlL SP/YahdG7CEM1TgyukDVIPU= X-Google-Smtp-Source: ABdhPJzVEuCVVT5sQoE+uvTiM/pktdFOv23oivdDxYQ6yfgtEMgdWV09R03RH8bmbub09VrVKayr4A== X-Received: by 2002:a50:cb8a:: with SMTP id k10mr585701edi.267.1623346503311; Thu, 10 Jun 2021 10:35:03 -0700 (PDT) Received: from localhost.localdomain ([188.26.52.84]) by smtp.gmail.com with ESMTPSA id g17sm1789595edp.14.2021.06.10.10.35.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Jun 2021 10:35:02 -0700 (PDT) From: Vladimir Oltean To: Jakub Kicinski , "David S. Miller" , netdev@vger.kernel.org Cc: Florian Fainelli , Andrew Lunn , Vivien Didelot , Richard Cochran , Vladimir Oltean Subject: [PATCH net-next 05/10] net: dsa: tag_8021q: remove shim declarations Date: Thu, 10 Jun 2021 20:34:20 +0300 Message-Id: <20210610173425.1791379-6-olteanv@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210610173425.1791379-1-olteanv@gmail.com> References: <20210610173425.1791379-1-olteanv@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Vladimir Oltean All users of tag_8021q select it in Kconfig, so shim functions are not needed because it is not possible for it to be disabled and its callers enabled. Signed-off-by: Vladimir Oltean --- include/linux/dsa/8021q.h | 76 --------------------------------------- 1 file changed, 76 deletions(-) diff --git a/include/linux/dsa/8021q.h b/include/linux/dsa/8021q.h index b12b05f1c8b4..cbf2c9b1ee4f 100644 --- a/include/linux/dsa/8021q.h +++ b/include/linux/dsa/8021q.h @@ -37,8 +37,6 @@ struct dsa_8021q_context { #define DSA_8021Q_N_SUBVLAN 8 -#if IS_ENABLED(CONFIG_NET_DSA_TAG_8021Q) - int dsa_8021q_setup(struct dsa_8021q_context *ctx, bool enabled); int dsa_8021q_crosschip_bridge_join(struct dsa_8021q_context *ctx, int port, @@ -70,78 +68,4 @@ bool vid_is_dsa_8021q_txvlan(u16 vid); bool vid_is_dsa_8021q(u16 vid); -#else - -int dsa_8021q_setup(struct dsa_8021q_context *ctx, bool enabled) -{ - return 0; -} - -int dsa_8021q_crosschip_bridge_join(struct dsa_8021q_context *ctx, int port, - struct dsa_8021q_context *other_ctx, - int other_port) -{ - return 0; -} - -int dsa_8021q_crosschip_bridge_leave(struct dsa_8021q_context *ctx, int port, - struct dsa_8021q_context *other_ctx, - int other_port) -{ - return 0; -} - -struct sk_buff *dsa_8021q_xmit(struct sk_buff *skb, struct net_device *netdev, - u16 tpid, u16 tci) -{ - return NULL; -} - -u16 dsa_8021q_tx_vid(struct dsa_switch *ds, int port) -{ - return 0; -} - -u16 dsa_8021q_rx_vid(struct dsa_switch *ds, int port) -{ - return 0; -} - -u16 dsa_8021q_rx_vid_subvlan(struct dsa_switch *ds, int port, u16 subvlan) -{ - return 0; -} - -int dsa_8021q_rx_switch_id(u16 vid) -{ - return 0; -} - -int dsa_8021q_rx_source_port(u16 vid) -{ - return 0; -} - -u16 dsa_8021q_rx_subvlan(u16 vid) -{ - return 0; -} - -bool vid_is_dsa_8021q_rxvlan(u16 vid) -{ - return false; -} - -bool vid_is_dsa_8021q_txvlan(u16 vid) -{ - return false; -} - -bool vid_is_dsa_8021q(u16 vid) -{ - return false; -} - -#endif /* IS_ENABLED(CONFIG_NET_DSA_TAG_8021Q) */ - #endif /* _NET_DSA_8021Q_H */