dsa: Change dsa_uses_{dsa, trailer}_tags() into inline functions

eth_type_trans() will use these functions if DSA is enabled, which
blocks building DSA as a module.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 0 insertions, 56 deletions

diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c
index 0dc1589343c3..66f5c0460cd3 100644
--- a/net/dsa/dsa.c
+++ b/net/dsa/dsa.c
@@ -199,29 +199,6 @@ static void dsa_switch_destroy(struct dsa_switch *ds)
 }
 
 
-/* hooks for ethertype-less tagging formats *********************************/
-/*
- * The original DSA tag format and some other tag formats have no
- * ethertype, which means that we need to add a little hack to the
- * networking receive path to make sure that received frames get
- * the right ->protocol assigned to them when one of those tag
- * formats is in use.
- */
-bool dsa_uses_dsa_tags(void *dsa_ptr)
-{
-        struct dsa_switch_tree *dst = dsa_ptr;
-
-        return !!(dst->tag_protocol == htons(ETH_P_DSA));
-}
-
-bool dsa_uses_trailer_tags(void *dsa_ptr)
-{
-        struct dsa_switch_tree *dst = dsa_ptr;
-
-        return !!(dst->tag_protocol == htons(ETH_P_TRAILER));
-}
-
-
 /* link polling *************************************************************/
 static void dsa_link_poll_work(struct work_struct *ugly)
 {
diff --git a/net/dsa/dsa_priv.h b/net/dsa/dsa_priv.h
index 4b0ea0540442..a45186cb6daf 100644
--- a/net/dsa/dsa_priv.h
+++ b/net/dsa/dsa_priv.h
@@ -48,39 +48,6 @@ struct dsa_switch {
         struct net_device       *ports[DSA_MAX_PORTS];
 };
 
-struct dsa_switch_tree {
-        /*
-         * Configuration data for the platform device that owns
-         * this dsa switch tree instance.
-         */
-        struct dsa_platform_data        *pd;
-
-        /*
-         * Reference to network device to use, and which tagging
-         * protocol to use.
-         */
-        struct net_device       *master_netdev;
-        __be16                  tag_protocol;
-
-        /*
-         * The switch and port to which the CPU is attached.
-         */
-        s8                      cpu_switch;
-        s8                      cpu_port;
-
-        /*
-         * Link state polling.
-         */
-        int                     link_poll_needed;
-        struct work_struct      link_poll_work;
-        struct timer_list       link_poll_timer;
-
-        /*
-         * Data for the individual switch chips.
-         */
-        struct dsa_switch       *ds[DSA_MAX_SWITCHES];
-};
-
 static inline bool dsa_is_cpu_port(struct dsa_switch *ds, int p)
 {
         return !!(ds->index == ds->dst->cpu_switch && p == ds->dst->cpu_port);