diff options
| author | Arvid Brodin <arvid.brodin@alten.se> | 2014-07-04 23:37:27 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-07-08 11:35:31 -0700 |
| commit | 51f3c605318b056ac5deb9079bbef2a976558827 (patch) | |
| tree | 892ae91481ed018ce84f70a9b1c49ee0972d9406 /net/hsr/hsr_framereg.c | |
| parent | e9aae56ea43ef4a32527b9d86c1f6b5eebfbd223 (diff) | |
| download | linux-stable-51f3c605318b056ac5deb9079bbef2a976558827.tar.gz linux-stable-51f3c605318b056ac5deb9079bbef2a976558827.tar.bz2 linux-stable-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_framereg.c')
| -rw-r--r-- | net/hsr/hsr_framereg.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/hsr/hsr_framereg.c b/net/hsr/hsr_framereg.c index 79e3f7ff6654..3666f94c526f 100644 --- a/net/hsr/hsr_framereg.c +++ b/net/hsr/hsr_framereg.c @@ -455,6 +455,7 @@ int hsr_get_node_data(struct hsr_priv *hsr, u16 *if2_seq) { struct hsr_node *node; + struct net_device *slave; unsigned long tdiff; @@ -491,8 +492,9 @@ int hsr_get_node_data(struct hsr_priv *hsr, *if1_seq = node->seq_out[HSR_DEV_SLAVE_B]; *if2_seq = node->seq_out[HSR_DEV_SLAVE_A]; - if ((node->AddrB_if != HSR_DEV_NONE) && hsr->slave[node->AddrB_if]) - *addr_b_ifindex = hsr->slave[node->AddrB_if]->ifindex; + slave = hsr->slave[node->AddrB_if]; + if ((node->AddrB_if != HSR_DEV_NONE) && slave) + *addr_b_ifindex = slave->ifindex; else *addr_b_ifindex = -1; |