summaryrefslogtreecommitdiffstats
path: root/net/hsr/hsr_slave.h
diff options
context:
space:
mode:
authorArvid Brodin <arvid.brodin@alten.se>2014-07-04 23:37:27 +0200
committerDavid S. Miller <davem@davemloft.net>2014-07-08 20:35:31 +0200
commit51f3c605318b056ac5deb9079bbef2a976558827 (patch)
tree892ae91481ed018ce84f70a9b1c49ee0972d9406 /net/hsr/hsr_slave.h
parentnet/hsr: Operstate handling cleanup. (diff)
downloadlinux-51f3c605318b056ac5deb9079bbef2a976558827.tar.xz
linux-51f3c605318b056ac5deb9079bbef2a976558827.zip
net/hsr: Move slave init to hsr_slave.c.
Also try to prevent some possible slave dereference race conditions. This is finalized in the next patch, which abandons the slave array in favour of a list_head list and list RCU. 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.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/hsr/hsr_slave.h b/net/hsr/hsr_slave.h
index ae90c8d0fde4..03c15fda39a8 100644
--- a/net/hsr/hsr_slave.h
+++ b/net/hsr/hsr_slave.h
@@ -14,7 +14,10 @@
#include <linux/skbuff.h>
#include <linux/netdevice.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);
rx_handler_result_t hsr_handle_frame(struct sk_buff **pskb);
#endif /* __HSR_SLAVE_H */