diff options
| author |   David S. Miller <davem@davemloft.net> | 2017-01-11 14:43:39 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-01-11 14:43:39 -0500 |
| commit | 02ac5d1487115d160fab4c3e61b7edc20a945af9 (patch) | |
| tree | 08a39341379ce6f1ad4f3997df36c76ee82cee9c /net/dsa/dsa2.c | |
| parent | Merge branch 'cls_flower-ARP' (diff) | |
| parent | Merge branch 'akpm' (patches from Andrew) (diff) | |
| download | linux-rng-02ac5d1487115d160fab4c3e61b7edc20a945af9.tar.xz linux-rng-02ac5d1487115d160fab4c3e61b7edc20a945af9.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Two AF_* families adding entries to the lockdep tables
at the same time.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dsa/dsa2.c')
| -rw-r--r-- | net/dsa/dsa2.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c index 9526bdf2a34a..42a41d84053c 100644 --- a/net/dsa/dsa2.c +++ b/net/dsa/dsa2.c @@ -378,9 +378,11 @@ static int dsa_dst_apply(struct dsa_switch_tree *dst) return err; } - err = dsa_cpu_port_ethtool_setup(dst->ds[0]); - if (err) - return err; + if (dst->ds[0]) { + err = dsa_cpu_port_ethtool_setup(dst->ds[0]); + if (err) + return err; + } /* If we use a tagging format that doesn't have an ethertype * field, make sure that all packets from this point on get @@ -417,7 +419,8 @@ static void dsa_dst_unapply(struct dsa_switch_tree *dst) dsa_ds_unapply(dst, ds); } - dsa_cpu_port_ethtool_restore(dst->ds[0]); + if (dst->ds[0]) + dsa_cpu_port_ethtool_restore(dst->ds[0]); pr_info("DSA: tree %d unapplied\n", dst->tree); dst->applied = false; |