diff options
Diffstat (limited to 'net/dsa')
-rw-r--r-- | net/dsa/dsa.c | 23 | ||||
-rw-r--r-- | net/dsa/dsa_priv.h | 33 |
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) | |||
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 | { |
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); |