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.c | |
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.c')
-rw-r--r-- | net/dsa/dsa.c | 23 |
1 files changed, 0 insertions, 23 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) | |||
199 | } | 199 | } |
200 | 200 | ||
201 | 201 | ||
202 | /* hooks for ethertype-less tagging formats *********************************/ | ||
203 | /* | ||
204 | * The original DSA tag format and some other tag formats have no | ||
205 | * ethertype, which means that we need to add a little hack to the | ||
206 | * networking receive path to make sure that received frames get | ||
207 | * the right ->protocol assigned to them when one of those tag | ||
208 | * formats is in use. | ||
209 | */ | ||
210 | bool dsa_uses_dsa_tags(void *dsa_ptr) | ||
211 | { | ||
212 | struct dsa_switch_tree *dst = dsa_ptr; | ||
213 | |||
214 | return !!(dst->tag_protocol == htons(ETH_P_DSA)); | ||
215 | } | ||
216 | |||
217 | bool dsa_uses_trailer_tags(void *dsa_ptr) | ||
218 | { | ||
219 | struct dsa_switch_tree *dst = dsa_ptr; | ||
220 | |||
221 | return !!(dst->tag_protocol == htons(ETH_P_TRAILER)); | ||
222 | } | ||
223 | |||
224 | |||
225 | /* link polling *************************************************************/ | 202 | /* link polling *************************************************************/ |
226 | static void dsa_link_poll_work(struct work_struct *ugly) | 203 | static void dsa_link_poll_work(struct work_struct *ugly) |
227 | { | 204 | { |