diff options
| author |   Arvid Brodin <arvid.brodin@alten.se> | 2014-07-04 23:38:05 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2014-07-08 11:35:31 -0700 |
| commit | c5a7591172100269e426cf630da0f2dc8138a206 (patch) | |
| tree | 1b77a7c8bf531b24d227e165bd10ab15bb9c0680 /net/hsr/hsr_slave.h | |
| parent | net/hsr: Move slave init to hsr_slave.c. (diff) | |
| download | linux-dev-c5a7591172100269e426cf630da0f2dc8138a206.tar.xz linux-dev-c5a7591172100269e426cf630da0f2dc8138a206.zip | |
net/hsr: Use list_head (and rcu) instead of array for slave devices.
Signed-off-by: Arvid Brodin <arvid.brodin@alten.se>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/hsr/hsr_slave.h')
| -rw-r--r-- | net/hsr/hsr_slave.h | 29 |
1 files changed, 27 insertions, 2 deletions
diff --git a/net/hsr/hsr_slave.h b/net/hsr/hsr_slave.h index 03c15fda39a8..3055022eddb3 100644 --- a/net/hsr/hsr_slave.h +++ b/net/hsr/hsr_slave.h @@ -14,10 +14,35 @@ #include <linux/skbuff.h> #include <linux/netdevice.h> +#include <linux/rtnetlink.h> #include "hsr_main.h" -int hsr_add_slave(struct hsr_priv *hsr, struct net_device *dev, int idx); -void hsr_del_slave(struct hsr_priv *hsr, int idx); +int hsr_add_port(struct hsr_priv *hsr, struct net_device *dev, + enum hsr_port_type pt); +void hsr_del_port(struct hsr_port *port); rx_handler_result_t hsr_handle_frame(struct sk_buff **pskb); + +#define hsr_for_each_port(hsr, port) \ + list_for_each_entry_rcu((port), &(hsr)->ports, port_list) + + +static inline bool hsr_port_exists(const struct net_device *dev) +{ + return dev->rx_handler == hsr_handle_frame; +} + +static inline struct hsr_port *hsr_port_get_rtnl(const struct net_device *dev) +{ + ASSERT_RTNL(); + return hsr_port_exists(dev) ? + rtnl_dereference(dev->rx_handler_data) : NULL; +} + +static inline struct hsr_port *hsr_port_get_rcu(const struct net_device *dev) +{ + return hsr_port_exists(dev) ? + rcu_dereference(dev->rx_handler_data) : NULL; +} + #endif /* __HSR_SLAVE_H */ |