diff options
| author | Guenter Roeck <[email protected]> | 2015-02-25 07:02:02 +0000 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2015-02-25 22:57:48 +0000 |
| commit | d79d21073626cf022943e5c4c10a97cdf7cb8465 (patch) | |
| tree | 529fa340e3b007cce36bb7665f1eef4807bdb5b4 /net/dsa/dsa.c | |
| parent | Merge branch 'sf2_hwbridge' (diff) | |
| download | kernel-d79d21073626cf022943e5c4c10a97cdf7cb8465.tar.gz kernel-d79d21073626cf022943e5c4c10a97cdf7cb8465.zip | |
net: dsa: Introduce dsa_is_port_initialized
To avoid race conditions when using the ds->ports[] array,
we need to check if the accessed port has been initialized.
Introduce and use helper function dsa_is_port_initialized
for that purpose and use it where needed.
Signed-off-by: Guenter Roeck <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
Diffstat (limited to 'net/dsa/dsa.c')
| -rw-r--r-- | net/dsa/dsa.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c index 9c208f0dab08..a1d1f0775bea 100644 --- a/net/dsa/dsa.c +++ b/net/dsa/dsa.c @@ -374,7 +374,7 @@ static int dsa_switch_suspend(struct dsa_switch *ds) /* Suspend slave network devices */ for (i = 0; i < DSA_MAX_PORTS; i++) { - if (!(ds->phys_port_mask & (1 << i))) + if (!dsa_is_port_initialized(ds, i)) continue; ret = dsa_slave_suspend(ds->ports[i]); @@ -400,7 +400,7 @@ static int dsa_switch_resume(struct dsa_switch *ds) /* Resume slave network devices */ for (i = 0; i < DSA_MAX_PORTS; i++) { - if (!(ds->phys_port_mask & (1 << i))) + if (!dsa_is_port_initialized(ds, i)) continue; ret = dsa_slave_resume(ds->ports[i]); |