.. | .. |
---|
| 1 | +// SPDX-License-Identifier: GPL-2.0 |
---|
1 | 2 | /* Copyright 2011-2014 Autronica Fire and Security AS |
---|
2 | | - * |
---|
3 | | - * This program is free software; you can redistribute it and/or modify it |
---|
4 | | - * under the terms of the GNU General Public License as published by the Free |
---|
5 | | - * Software Foundation; either version 2 of the License, or (at your option) |
---|
6 | | - * any later version. |
---|
7 | 3 | * |
---|
8 | 4 | * Author(s): |
---|
9 | 5 | * 2011-2014 Arvid Brodin, arvid.brodin@alten.se |
---|
10 | | - * |
---|
11 | 6 | * This file contains device methods for creating, using and destroying |
---|
12 | | - * virtual HSR devices. |
---|
| 7 | + * virtual HSR or PRP devices. |
---|
13 | 8 | */ |
---|
14 | 9 | |
---|
15 | 10 | #include <linux/netdevice.h> |
---|
.. | .. |
---|
22 | 17 | #include "hsr_framereg.h" |
---|
23 | 18 | #include "hsr_main.h" |
---|
24 | 19 | #include "hsr_forward.h" |
---|
25 | | - |
---|
26 | 20 | |
---|
27 | 21 | static bool is_admin_up(struct net_device *dev) |
---|
28 | 22 | { |
---|
.. | .. |
---|
62 | 56 | static bool hsr_check_carrier(struct hsr_port *master) |
---|
63 | 57 | { |
---|
64 | 58 | struct hsr_port *port; |
---|
65 | | - bool has_carrier; |
---|
66 | 59 | |
---|
67 | | - has_carrier = false; |
---|
| 60 | + ASSERT_RTNL(); |
---|
68 | 61 | |
---|
69 | | - rcu_read_lock(); |
---|
70 | | - hsr_for_each_port(master->hsr, port) |
---|
71 | | - if ((port->type != HSR_PT_MASTER) && is_slave_up(port->dev)) { |
---|
72 | | - has_carrier = true; |
---|
73 | | - break; |
---|
| 62 | + hsr_for_each_port(master->hsr, port) { |
---|
| 63 | + if (port->type != HSR_PT_MASTER && is_slave_up(port->dev)) { |
---|
| 64 | + netif_carrier_on(master->dev); |
---|
| 65 | + return true; |
---|
74 | 66 | } |
---|
75 | | - rcu_read_unlock(); |
---|
| 67 | + } |
---|
76 | 68 | |
---|
77 | | - if (has_carrier) |
---|
78 | | - netif_carrier_on(master->dev); |
---|
79 | | - else |
---|
80 | | - netif_carrier_off(master->dev); |
---|
| 69 | + netif_carrier_off(master->dev); |
---|
81 | 70 | |
---|
82 | | - return has_carrier; |
---|
| 71 | + return false; |
---|
83 | 72 | } |
---|
84 | | - |
---|
85 | 73 | |
---|
86 | 74 | static void hsr_check_announce(struct net_device *hsr_dev, |
---|
87 | 75 | unsigned char old_operstate) |
---|
.. | .. |
---|
90 | 78 | |
---|
91 | 79 | hsr = netdev_priv(hsr_dev); |
---|
92 | 80 | |
---|
93 | | - if ((hsr_dev->operstate == IF_OPER_UP) |
---|
94 | | - && (old_operstate != IF_OPER_UP)) { |
---|
| 81 | + if (hsr_dev->operstate == IF_OPER_UP && old_operstate != IF_OPER_UP) { |
---|
95 | 82 | /* Went up */ |
---|
96 | 83 | hsr->announce_count = 0; |
---|
97 | 84 | mod_timer(&hsr->announce_timer, |
---|
98 | 85 | jiffies + msecs_to_jiffies(HSR_ANNOUNCE_INTERVAL)); |
---|
99 | 86 | } |
---|
100 | 87 | |
---|
101 | | - if ((hsr_dev->operstate != IF_OPER_UP) && (old_operstate == IF_OPER_UP)) |
---|
| 88 | + if (hsr_dev->operstate != IF_OPER_UP && old_operstate == IF_OPER_UP) |
---|
102 | 89 | /* Went down */ |
---|
103 | 90 | del_timer(&hsr->announce_timer); |
---|
104 | 91 | } |
---|
.. | .. |
---|
125 | 112 | struct hsr_port *port; |
---|
126 | 113 | |
---|
127 | 114 | mtu_max = ETH_DATA_LEN; |
---|
128 | | - rcu_read_lock(); |
---|
129 | 115 | hsr_for_each_port(hsr, port) |
---|
130 | 116 | if (port->type != HSR_PT_MASTER) |
---|
131 | 117 | mtu_max = min(port->dev->mtu, mtu_max); |
---|
132 | | - rcu_read_unlock(); |
---|
133 | 118 | |
---|
134 | 119 | if (mtu_max < HSR_HLEN) |
---|
135 | 120 | return 0; |
---|
136 | 121 | return mtu_max - HSR_HLEN; |
---|
137 | 122 | } |
---|
138 | 123 | |
---|
139 | | - |
---|
140 | 124 | static int hsr_dev_change_mtu(struct net_device *dev, int new_mtu) |
---|
141 | 125 | { |
---|
142 | 126 | struct hsr_priv *hsr; |
---|
143 | | - struct hsr_port *master; |
---|
144 | 127 | |
---|
145 | 128 | hsr = netdev_priv(dev); |
---|
146 | | - master = hsr_port_get_hsr(hsr, HSR_PT_MASTER); |
---|
147 | 129 | |
---|
148 | 130 | if (new_mtu > hsr_get_max_mtu(hsr)) { |
---|
149 | | - netdev_info(master->dev, "A HSR master's MTU cannot be greater than the smallest MTU of its slaves minus the HSR Tag length (%d octets).\n", |
---|
| 131 | + netdev_info(dev, "A HSR master's MTU cannot be greater than the smallest MTU of its slaves minus the HSR Tag length (%d octets).\n", |
---|
150 | 132 | HSR_HLEN); |
---|
151 | 133 | return -EINVAL; |
---|
152 | 134 | } |
---|
.. | .. |
---|
165 | 147 | hsr = netdev_priv(dev); |
---|
166 | 148 | designation = '\0'; |
---|
167 | 149 | |
---|
168 | | - rcu_read_lock(); |
---|
169 | 150 | hsr_for_each_port(hsr, port) { |
---|
170 | 151 | if (port->type == HSR_PT_MASTER) |
---|
171 | 152 | continue; |
---|
.. | .. |
---|
183 | 164 | netdev_warn(dev, "Slave %c (%s) is not up; please bring it up to get a fully working HSR network\n", |
---|
184 | 165 | designation, port->dev->name); |
---|
185 | 166 | } |
---|
186 | | - rcu_read_unlock(); |
---|
187 | 167 | |
---|
188 | 168 | if (designation == '\0') |
---|
189 | 169 | netdev_warn(dev, "No slave devices configured\n"); |
---|
.. | .. |
---|
191 | 171 | return 0; |
---|
192 | 172 | } |
---|
193 | 173 | |
---|
194 | | - |
---|
195 | 174 | static int hsr_dev_close(struct net_device *dev) |
---|
196 | 175 | { |
---|
197 | 176 | /* Nothing to do here. */ |
---|
198 | 177 | return 0; |
---|
199 | 178 | } |
---|
200 | | - |
---|
201 | 179 | |
---|
202 | 180 | static netdev_features_t hsr_features_recompute(struct hsr_priv *hsr, |
---|
203 | 181 | netdev_features_t features) |
---|
.. | .. |
---|
231 | 209 | return hsr_features_recompute(hsr, features); |
---|
232 | 210 | } |
---|
233 | 211 | |
---|
234 | | - |
---|
235 | | -static int hsr_dev_xmit(struct sk_buff *skb, struct net_device *dev) |
---|
| 212 | +static netdev_tx_t hsr_dev_xmit(struct sk_buff *skb, struct net_device *dev) |
---|
236 | 213 | { |
---|
237 | 214 | struct hsr_priv *hsr = netdev_priv(dev); |
---|
238 | 215 | struct hsr_port *master; |
---|
239 | 216 | |
---|
240 | 217 | master = hsr_port_get_hsr(hsr, HSR_PT_MASTER); |
---|
241 | | - skb->dev = master->dev; |
---|
242 | | - hsr_forward_skb(skb, master); |
---|
243 | | - |
---|
| 218 | + if (master) { |
---|
| 219 | + skb->dev = master->dev; |
---|
| 220 | + skb_reset_mac_header(skb); |
---|
| 221 | + skb_reset_mac_len(skb); |
---|
| 222 | + spin_lock_bh(&hsr->seqnr_lock); |
---|
| 223 | + hsr_forward_skb(skb, master); |
---|
| 224 | + spin_unlock_bh(&hsr->seqnr_lock); |
---|
| 225 | + } else { |
---|
| 226 | + atomic_long_inc(&dev->tx_dropped); |
---|
| 227 | + dev_kfree_skb_any(skb); |
---|
| 228 | + } |
---|
244 | 229 | return NETDEV_TX_OK; |
---|
245 | 230 | } |
---|
246 | | - |
---|
247 | 231 | |
---|
248 | 232 | static const struct header_ops hsr_header_ops = { |
---|
249 | 233 | .create = eth_header, |
---|
250 | 234 | .parse = eth_header_parse, |
---|
251 | 235 | }; |
---|
252 | 236 | |
---|
253 | | -static void send_hsr_supervision_frame(struct hsr_port *master, |
---|
254 | | - u8 type, u8 hsrVer) |
---|
| 237 | +static struct sk_buff *hsr_init_skb(struct hsr_port *master) |
---|
255 | 238 | { |
---|
| 239 | + struct hsr_priv *hsr = master->hsr; |
---|
256 | 240 | struct sk_buff *skb; |
---|
257 | 241 | int hlen, tlen; |
---|
258 | | - struct hsr_tag *hsr_tag; |
---|
259 | | - struct hsr_sup_tag *hsr_stag; |
---|
260 | | - struct hsr_sup_payload *hsr_sp; |
---|
261 | | - unsigned long irqflags; |
---|
262 | 242 | |
---|
263 | 243 | hlen = LL_RESERVED_SPACE(master->dev); |
---|
264 | 244 | tlen = master->dev->needed_tailroom; |
---|
265 | | - skb = dev_alloc_skb( |
---|
266 | | - sizeof(struct hsr_tag) + |
---|
267 | | - sizeof(struct hsr_sup_tag) + |
---|
268 | | - sizeof(struct hsr_sup_payload) + hlen + tlen); |
---|
| 245 | + /* skb size is same for PRP/HSR frames, only difference |
---|
| 246 | + * being, for PRP it is a trailer and for HSR it is a |
---|
| 247 | + * header |
---|
| 248 | + */ |
---|
| 249 | + skb = dev_alloc_skb(sizeof(struct hsr_sup_tag) + |
---|
| 250 | + sizeof(struct hsr_sup_payload) + hlen + tlen); |
---|
269 | 251 | |
---|
270 | | - if (skb == NULL) |
---|
271 | | - return; |
---|
| 252 | + if (!skb) |
---|
| 253 | + return skb; |
---|
272 | 254 | |
---|
273 | 255 | skb_reserve(skb, hlen); |
---|
274 | | - |
---|
275 | 256 | skb->dev = master->dev; |
---|
276 | | - skb->protocol = htons(hsrVer ? ETH_P_HSR : ETH_P_PRP); |
---|
277 | 257 | skb->priority = TC_PRIO_CONTROL; |
---|
278 | 258 | |
---|
279 | | - if (dev_hard_header(skb, skb->dev, (hsrVer ? ETH_P_HSR : ETH_P_PRP), |
---|
280 | | - master->hsr->sup_multicast_addr, |
---|
| 259 | + if (dev_hard_header(skb, skb->dev, ETH_P_PRP, |
---|
| 260 | + hsr->sup_multicast_addr, |
---|
281 | 261 | skb->dev->dev_addr, skb->len) <= 0) |
---|
282 | 262 | goto out; |
---|
| 263 | + |
---|
283 | 264 | skb_reset_mac_header(skb); |
---|
| 265 | + skb_reset_mac_len(skb); |
---|
284 | 266 | skb_reset_network_header(skb); |
---|
285 | 267 | skb_reset_transport_header(skb); |
---|
286 | 268 | |
---|
287 | | - if (hsrVer > 0) { |
---|
288 | | - hsr_tag = skb_put(skb, sizeof(struct hsr_tag)); |
---|
289 | | - hsr_tag->encap_proto = htons(ETH_P_PRP); |
---|
290 | | - set_hsr_tag_LSDU_size(hsr_tag, HSR_V1_SUP_LSDUSIZE); |
---|
| 269 | + return skb; |
---|
| 270 | +out: |
---|
| 271 | + kfree_skb(skb); |
---|
| 272 | + |
---|
| 273 | + return NULL; |
---|
| 274 | +} |
---|
| 275 | + |
---|
| 276 | +static void send_hsr_supervision_frame(struct hsr_port *master, |
---|
| 277 | + unsigned long *interval) |
---|
| 278 | +{ |
---|
| 279 | + struct hsr_priv *hsr = master->hsr; |
---|
| 280 | + __u8 type = HSR_TLV_LIFE_CHECK; |
---|
| 281 | + struct hsr_sup_payload *hsr_sp; |
---|
| 282 | + struct hsr_sup_tag *hsr_stag; |
---|
| 283 | + struct sk_buff *skb; |
---|
| 284 | + |
---|
| 285 | + *interval = msecs_to_jiffies(HSR_LIFE_CHECK_INTERVAL); |
---|
| 286 | + if (hsr->announce_count < 3 && hsr->prot_version == 0) { |
---|
| 287 | + type = HSR_TLV_ANNOUNCE; |
---|
| 288 | + *interval = msecs_to_jiffies(HSR_ANNOUNCE_INTERVAL); |
---|
| 289 | + hsr->announce_count++; |
---|
| 290 | + } |
---|
| 291 | + |
---|
| 292 | + skb = hsr_init_skb(master); |
---|
| 293 | + if (!skb) { |
---|
| 294 | + WARN_ONCE(1, "HSR: Could not send supervision frame\n"); |
---|
| 295 | + return; |
---|
291 | 296 | } |
---|
292 | 297 | |
---|
293 | 298 | hsr_stag = skb_put(skb, sizeof(struct hsr_sup_tag)); |
---|
294 | | - set_hsr_stag_path(hsr_stag, (hsrVer ? 0x0 : 0xf)); |
---|
295 | | - set_hsr_stag_HSR_Ver(hsr_stag, hsrVer); |
---|
| 299 | + set_hsr_stag_path(hsr_stag, (hsr->prot_version ? 0x0 : 0xf)); |
---|
| 300 | + set_hsr_stag_HSR_ver(hsr_stag, hsr->prot_version); |
---|
296 | 301 | |
---|
297 | 302 | /* From HSRv1 on we have separate supervision sequence numbers. */ |
---|
298 | | - spin_lock_irqsave(&master->hsr->seqnr_lock, irqflags); |
---|
299 | | - if (hsrVer > 0) { |
---|
300 | | - hsr_stag->sequence_nr = htons(master->hsr->sup_sequence_nr); |
---|
301 | | - hsr_tag->sequence_nr = htons(master->hsr->sequence_nr); |
---|
302 | | - master->hsr->sup_sequence_nr++; |
---|
303 | | - master->hsr->sequence_nr++; |
---|
| 303 | + spin_lock_bh(&hsr->seqnr_lock); |
---|
| 304 | + if (hsr->prot_version > 0) { |
---|
| 305 | + hsr_stag->sequence_nr = htons(hsr->sup_sequence_nr); |
---|
| 306 | + hsr->sup_sequence_nr++; |
---|
304 | 307 | } else { |
---|
305 | | - hsr_stag->sequence_nr = htons(master->hsr->sequence_nr); |
---|
306 | | - master->hsr->sequence_nr++; |
---|
| 308 | + hsr_stag->sequence_nr = htons(hsr->sequence_nr); |
---|
| 309 | + hsr->sequence_nr++; |
---|
307 | 310 | } |
---|
308 | | - spin_unlock_irqrestore(&master->hsr->seqnr_lock, irqflags); |
---|
309 | 311 | |
---|
310 | | - hsr_stag->HSR_TLV_Type = type; |
---|
| 312 | + hsr_stag->HSR_TLV_type = type; |
---|
311 | 313 | /* TODO: Why 12 in HSRv0? */ |
---|
312 | | - hsr_stag->HSR_TLV_Length = hsrVer ? sizeof(struct hsr_sup_payload) : 12; |
---|
| 314 | + hsr_stag->HSR_TLV_length = hsr->prot_version ? |
---|
| 315 | + sizeof(struct hsr_sup_payload) : 12; |
---|
313 | 316 | |
---|
314 | 317 | /* Payload: MacAddressA */ |
---|
315 | 318 | hsr_sp = skb_put(skb, sizeof(struct hsr_sup_payload)); |
---|
316 | | - ether_addr_copy(hsr_sp->MacAddressA, master->dev->dev_addr); |
---|
| 319 | + ether_addr_copy(hsr_sp->macaddress_A, master->dev->dev_addr); |
---|
317 | 320 | |
---|
318 | | - if (skb_put_padto(skb, ETH_ZLEN + HSR_HLEN)) |
---|
| 321 | + if (skb_put_padto(skb, ETH_ZLEN)) { |
---|
| 322 | + spin_unlock_bh(&hsr->seqnr_lock); |
---|
319 | 323 | return; |
---|
| 324 | + } |
---|
320 | 325 | |
---|
321 | 326 | hsr_forward_skb(skb, master); |
---|
| 327 | + spin_unlock_bh(&hsr->seqnr_lock); |
---|
322 | 328 | return; |
---|
323 | | - |
---|
324 | | -out: |
---|
325 | | - WARN_ONCE(1, "HSR: Could not send supervision frame\n"); |
---|
326 | | - kfree_skb(skb); |
---|
327 | 329 | } |
---|
328 | 330 | |
---|
| 331 | +static void send_prp_supervision_frame(struct hsr_port *master, |
---|
| 332 | + unsigned long *interval) |
---|
| 333 | +{ |
---|
| 334 | + struct hsr_priv *hsr = master->hsr; |
---|
| 335 | + struct hsr_sup_payload *hsr_sp; |
---|
| 336 | + struct hsr_sup_tag *hsr_stag; |
---|
| 337 | + struct sk_buff *skb; |
---|
| 338 | + |
---|
| 339 | + skb = hsr_init_skb(master); |
---|
| 340 | + if (!skb) { |
---|
| 341 | + WARN_ONCE(1, "PRP: Could not send supervision frame\n"); |
---|
| 342 | + return; |
---|
| 343 | + } |
---|
| 344 | + |
---|
| 345 | + *interval = msecs_to_jiffies(HSR_LIFE_CHECK_INTERVAL); |
---|
| 346 | + hsr_stag = skb_put(skb, sizeof(struct hsr_sup_tag)); |
---|
| 347 | + set_hsr_stag_path(hsr_stag, (hsr->prot_version ? 0x0 : 0xf)); |
---|
| 348 | + set_hsr_stag_HSR_ver(hsr_stag, (hsr->prot_version ? 1 : 0)); |
---|
| 349 | + |
---|
| 350 | + /* From HSRv1 on we have separate supervision sequence numbers. */ |
---|
| 351 | + spin_lock_bh(&hsr->seqnr_lock); |
---|
| 352 | + hsr_stag->sequence_nr = htons(hsr->sup_sequence_nr); |
---|
| 353 | + hsr->sup_sequence_nr++; |
---|
| 354 | + hsr_stag->HSR_TLV_type = PRP_TLV_LIFE_CHECK_DD; |
---|
| 355 | + hsr_stag->HSR_TLV_length = sizeof(struct hsr_sup_payload); |
---|
| 356 | + |
---|
| 357 | + /* Payload: MacAddressA */ |
---|
| 358 | + hsr_sp = skb_put(skb, sizeof(struct hsr_sup_payload)); |
---|
| 359 | + ether_addr_copy(hsr_sp->macaddress_A, master->dev->dev_addr); |
---|
| 360 | + |
---|
| 361 | + if (skb_put_padto(skb, ETH_ZLEN)) { |
---|
| 362 | + spin_unlock_bh(&hsr->seqnr_lock); |
---|
| 363 | + return; |
---|
| 364 | + } |
---|
| 365 | + |
---|
| 366 | + hsr_forward_skb(skb, master); |
---|
| 367 | + spin_unlock_bh(&hsr->seqnr_lock); |
---|
| 368 | +} |
---|
329 | 369 | |
---|
330 | 370 | /* Announce (supervision frame) timer function |
---|
331 | 371 | */ |
---|
.. | .. |
---|
339 | 379 | |
---|
340 | 380 | rcu_read_lock(); |
---|
341 | 381 | master = hsr_port_get_hsr(hsr, HSR_PT_MASTER); |
---|
342 | | - |
---|
343 | | - if (hsr->announce_count < 3 && hsr->protVersion == 0) { |
---|
344 | | - send_hsr_supervision_frame(master, HSR_TLV_ANNOUNCE, |
---|
345 | | - hsr->protVersion); |
---|
346 | | - hsr->announce_count++; |
---|
347 | | - |
---|
348 | | - interval = msecs_to_jiffies(HSR_ANNOUNCE_INTERVAL); |
---|
349 | | - } else { |
---|
350 | | - send_hsr_supervision_frame(master, HSR_TLV_LIFE_CHECK, |
---|
351 | | - hsr->protVersion); |
---|
352 | | - |
---|
353 | | - interval = msecs_to_jiffies(HSR_LIFE_CHECK_INTERVAL); |
---|
354 | | - } |
---|
| 382 | + hsr->proto_ops->send_sv_frame(master, &interval); |
---|
355 | 383 | |
---|
356 | 384 | if (is_admin_up(master->dev)) |
---|
357 | 385 | mod_timer(&hsr->announce_timer, jiffies + interval); |
---|
.. | .. |
---|
359 | 387 | rcu_read_unlock(); |
---|
360 | 388 | } |
---|
361 | 389 | |
---|
362 | | - |
---|
363 | | -/* According to comments in the declaration of struct net_device, this function |
---|
364 | | - * is "Called from unregister, can be used to call free_netdev". Ok then... |
---|
365 | | - */ |
---|
366 | | -static void hsr_dev_destroy(struct net_device *hsr_dev) |
---|
| 390 | +void hsr_del_ports(struct hsr_priv *hsr) |
---|
367 | 391 | { |
---|
368 | | - struct hsr_priv *hsr; |
---|
369 | 392 | struct hsr_port *port; |
---|
370 | 393 | |
---|
371 | | - hsr = netdev_priv(hsr_dev); |
---|
372 | | - |
---|
373 | | - rtnl_lock(); |
---|
374 | | - hsr_for_each_port(hsr, port) |
---|
| 394 | + port = hsr_port_get_hsr(hsr, HSR_PT_SLAVE_A); |
---|
| 395 | + if (port) |
---|
375 | 396 | hsr_del_port(port); |
---|
376 | | - rtnl_unlock(); |
---|
377 | 397 | |
---|
378 | | - del_timer_sync(&hsr->prune_timer); |
---|
379 | | - del_timer_sync(&hsr->announce_timer); |
---|
| 398 | + port = hsr_port_get_hsr(hsr, HSR_PT_SLAVE_B); |
---|
| 399 | + if (port) |
---|
| 400 | + hsr_del_port(port); |
---|
380 | 401 | |
---|
381 | | - synchronize_rcu(); |
---|
| 402 | + port = hsr_port_get_hsr(hsr, HSR_PT_MASTER); |
---|
| 403 | + if (port) |
---|
| 404 | + hsr_del_port(port); |
---|
382 | 405 | } |
---|
383 | 406 | |
---|
384 | 407 | static const struct net_device_ops hsr_device_ops = { |
---|
.. | .. |
---|
393 | 416 | .name = "hsr", |
---|
394 | 417 | }; |
---|
395 | 418 | |
---|
| 419 | +static struct hsr_proto_ops hsr_ops = { |
---|
| 420 | + .send_sv_frame = send_hsr_supervision_frame, |
---|
| 421 | + .create_tagged_frame = hsr_create_tagged_frame, |
---|
| 422 | + .get_untagged_frame = hsr_get_untagged_frame, |
---|
| 423 | + .fill_frame_info = hsr_fill_frame_info, |
---|
| 424 | + .invalid_dan_ingress_frame = hsr_invalid_dan_ingress_frame, |
---|
| 425 | +}; |
---|
| 426 | + |
---|
| 427 | +static struct hsr_proto_ops prp_ops = { |
---|
| 428 | + .send_sv_frame = send_prp_supervision_frame, |
---|
| 429 | + .create_tagged_frame = prp_create_tagged_frame, |
---|
| 430 | + .get_untagged_frame = prp_get_untagged_frame, |
---|
| 431 | + .drop_frame = prp_drop_frame, |
---|
| 432 | + .fill_frame_info = prp_fill_frame_info, |
---|
| 433 | + .handle_san_frame = prp_handle_san_frame, |
---|
| 434 | + .update_san_info = prp_update_san_info, |
---|
| 435 | +}; |
---|
| 436 | + |
---|
396 | 437 | void hsr_dev_setup(struct net_device *dev) |
---|
397 | 438 | { |
---|
398 | 439 | eth_hw_addr_random(dev); |
---|
.. | .. |
---|
402 | 443 | dev->header_ops = &hsr_header_ops; |
---|
403 | 444 | dev->netdev_ops = &hsr_device_ops; |
---|
404 | 445 | SET_NETDEV_DEVTYPE(dev, &hsr_type); |
---|
405 | | - dev->priv_flags |= IFF_NO_QUEUE; |
---|
| 446 | + dev->priv_flags |= IFF_NO_QUEUE | IFF_DISABLE_NETPOLL; |
---|
406 | 447 | |
---|
407 | 448 | dev->needs_free_netdev = true; |
---|
408 | | - dev->priv_destructor = hsr_dev_destroy; |
---|
409 | 449 | |
---|
410 | 450 | dev->hw_features = NETIF_F_SG | NETIF_F_FRAGLIST | NETIF_F_HIGHDMA | |
---|
411 | 451 | NETIF_F_GSO_MASK | NETIF_F_HW_CSUM | |
---|
.. | .. |
---|
425 | 465 | dev->features |= NETIF_F_NETNS_LOCAL; |
---|
426 | 466 | } |
---|
427 | 467 | |
---|
428 | | - |
---|
429 | 468 | /* Return true if dev is a HSR master; return false otherwise. |
---|
430 | 469 | */ |
---|
431 | 470 | inline bool is_hsr_master(struct net_device *dev) |
---|
.. | .. |
---|
439 | 478 | }; |
---|
440 | 479 | |
---|
441 | 480 | int hsr_dev_finalize(struct net_device *hsr_dev, struct net_device *slave[2], |
---|
442 | | - unsigned char multicast_spec, u8 protocol_version) |
---|
| 481 | + unsigned char multicast_spec, u8 protocol_version, |
---|
| 482 | + struct netlink_ext_ack *extack) |
---|
443 | 483 | { |
---|
| 484 | + bool unregister = false; |
---|
444 | 485 | struct hsr_priv *hsr; |
---|
445 | | - struct hsr_port *port; |
---|
446 | 486 | int res; |
---|
447 | 487 | |
---|
448 | 488 | hsr = netdev_priv(hsr_dev); |
---|
449 | 489 | INIT_LIST_HEAD(&hsr->ports); |
---|
450 | 490 | INIT_LIST_HEAD(&hsr->node_db); |
---|
451 | 491 | INIT_LIST_HEAD(&hsr->self_node_db); |
---|
| 492 | + spin_lock_init(&hsr->list_lock); |
---|
452 | 493 | |
---|
453 | 494 | ether_addr_copy(hsr_dev->dev_addr, slave[0]->dev_addr); |
---|
454 | 495 | |
---|
| 496 | + /* initialize protocol specific functions */ |
---|
| 497 | + if (protocol_version == PRP_V1) { |
---|
| 498 | + /* For PRP, lan_id has most significant 3 bits holding |
---|
| 499 | + * the net_id of PRP_LAN_ID |
---|
| 500 | + */ |
---|
| 501 | + hsr->net_id = PRP_LAN_ID << 1; |
---|
| 502 | + hsr->proto_ops = &prp_ops; |
---|
| 503 | + } else { |
---|
| 504 | + hsr->proto_ops = &hsr_ops; |
---|
| 505 | + } |
---|
| 506 | + |
---|
455 | 507 | /* Make sure we recognize frames from ourselves in hsr_rcv() */ |
---|
456 | | - res = hsr_create_self_node(&hsr->self_node_db, hsr_dev->dev_addr, |
---|
| 508 | + res = hsr_create_self_node(hsr, hsr_dev->dev_addr, |
---|
457 | 509 | slave[1]->dev_addr); |
---|
458 | 510 | if (res < 0) |
---|
459 | 511 | return res; |
---|
.. | .. |
---|
469 | 521 | ether_addr_copy(hsr->sup_multicast_addr, def_multicast_addr); |
---|
470 | 522 | hsr->sup_multicast_addr[ETH_ALEN - 1] = multicast_spec; |
---|
471 | 523 | |
---|
472 | | - hsr->protVersion = protocol_version; |
---|
| 524 | + hsr->prot_version = protocol_version; |
---|
473 | 525 | |
---|
474 | 526 | /* FIXME: should I modify the value of these? |
---|
475 | 527 | * |
---|
.. | .. |
---|
484 | 536 | /* Make sure the 1st call to netif_carrier_on() gets through */ |
---|
485 | 537 | netif_carrier_off(hsr_dev); |
---|
486 | 538 | |
---|
487 | | - res = hsr_add_port(hsr, hsr_dev, HSR_PT_MASTER); |
---|
| 539 | + res = hsr_add_port(hsr, hsr_dev, HSR_PT_MASTER, extack); |
---|
488 | 540 | if (res) |
---|
489 | | - goto err_add_port; |
---|
| 541 | + goto err_add_master; |
---|
490 | 542 | |
---|
491 | 543 | res = register_netdevice(hsr_dev); |
---|
492 | 544 | if (res) |
---|
493 | | - goto fail; |
---|
| 545 | + goto err_unregister; |
---|
494 | 546 | |
---|
495 | | - res = hsr_add_port(hsr, slave[0], HSR_PT_SLAVE_A); |
---|
496 | | - if (res) |
---|
497 | | - goto fail; |
---|
498 | | - res = hsr_add_port(hsr, slave[1], HSR_PT_SLAVE_B); |
---|
499 | | - if (res) |
---|
500 | | - goto fail; |
---|
| 547 | + unregister = true; |
---|
501 | 548 | |
---|
| 549 | + res = hsr_add_port(hsr, slave[0], HSR_PT_SLAVE_A, extack); |
---|
| 550 | + if (res) |
---|
| 551 | + goto err_unregister; |
---|
| 552 | + |
---|
| 553 | + res = hsr_add_port(hsr, slave[1], HSR_PT_SLAVE_B, extack); |
---|
| 554 | + if (res) |
---|
| 555 | + goto err_unregister; |
---|
| 556 | + |
---|
| 557 | + hsr_debugfs_init(hsr, hsr_dev); |
---|
502 | 558 | mod_timer(&hsr->prune_timer, jiffies + msecs_to_jiffies(PRUNE_PERIOD)); |
---|
503 | 559 | |
---|
504 | 560 | return 0; |
---|
505 | 561 | |
---|
506 | | -fail: |
---|
507 | | - hsr_for_each_port(hsr, port) |
---|
508 | | - hsr_del_port(port); |
---|
509 | | -err_add_port: |
---|
510 | | - hsr_del_node(&hsr->self_node_db); |
---|
| 562 | +err_unregister: |
---|
| 563 | + hsr_del_ports(hsr); |
---|
| 564 | +err_add_master: |
---|
| 565 | + hsr_del_self_node(hsr); |
---|
511 | 566 | |
---|
| 567 | + if (unregister) |
---|
| 568 | + unregister_netdevice(hsr_dev); |
---|
512 | 569 | return res; |
---|
513 | 570 | } |
---|