diff options
author | Ben Hutchings <ben@decadent.org.uk> | 2011-11-25 09:32:52 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-11-26 14:48:14 -0500 |
commit | cf50dcc24f82a6dc2bce523eec2a979eb1b106e2 (patch) | |
tree | 579bd064fc0ee8475ca5c8e5d5f6295b82247c3a /net/dsa/dsa_priv.h | |
parent | 6dec4ac4ee1ad894dc0e9647cd3e180f93fc353c (diff) |
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>
Diffstat (limited to 'net/dsa/dsa_priv.h')
-rw-r--r-- | net/dsa/dsa_priv.h | 33 |
1 files changed, 0 insertions, 33 deletions
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 { | |||
48 | struct net_device *ports[DSA_MAX_PORTS]; | 48 | struct net_device *ports[DSA_MAX_PORTS]; |
49 | }; | 49 | }; |
50 | 50 | ||
51 | struct dsa_switch_tree { | ||
52 | /* | ||
53 | * Configuration data for the platform device that owns | ||
54 | * this dsa switch tree instance. | ||
55 | */ | ||
56 | struct dsa_platform_data *pd; | ||
57 | |||
58 | /* | ||
59 | * Reference to network device to use, and which tagging | ||
60 | * protocol to use. | ||
61 | */ | ||
62 | struct net_device *master_netdev; | ||
63 | __be16 tag_protocol; | ||
64 | |||
65 | /* | ||
66 | * The switch and port to which the CPU is attached. | ||
67 | */ | ||
68 | s8 cpu_switch; | ||
69 | s8 cpu_port; | ||
70 | |||
71 | /* | ||
72 | * Link state polling. | ||
73 | */ | ||
74 | int link_poll_needed; | ||
75 | struct work_struct link_poll_work; | ||
76 | struct timer_list link_poll_timer; | ||
77 | |||
78 | /* | ||
79 | * Data for the individual switch chips. | ||
80 | */ | ||
81 | struct dsa_switch *ds[DSA_MAX_SWITCHES]; | ||
82 | }; | ||
83 | |||
84 | static inline bool dsa_is_cpu_port(struct dsa_switch *ds, int p) | 51 | static inline bool dsa_is_cpu_port(struct dsa_switch *ds, int p) |
85 | { | 52 | { |
86 | return !!(ds->index == ds->dst->cpu_switch && p == ds->dst->cpu_port); | 53 | return !!(ds->index == ds->dst->cpu_switch && p == ds->dst->cpu_port); |