diff options
| author |   Jakub Kicinski <kuba@kernel.org> | 2021-01-14 18:34:50 -0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2021-01-14 18:34:50 -0800 |
| commit | 1d9f03c0a15fa01aa14fb295cbc1236403fceb0b (patch) | |
| tree | 2161a4e17f383a14e1e235e2deed7142733aca9b /net/dsa/dsa2.c | |
| parent | Merge branch 'dissect-ptp-l2-packet-header' (diff) | |
| parent | Merge tag 'linux-kselftest-fixes-5.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest (diff) | |
| download | linux-rng-1d9f03c0a15fa01aa14fb295cbc1236403fceb0b.tar.xz linux-rng-1d9f03c0a15fa01aa14fb295cbc1236403fceb0b.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/dsa/dsa2.c')
| -rw-r--r-- | net/dsa/dsa2.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c index fd343466df27..6f65ea0eef9f 100644 --- a/net/dsa/dsa2.c +++ b/net/dsa/dsa2.c @@ -412,9 +412,13 @@ static int dsa_port_devlink_setup(struct dsa_port *dp) static void dsa_port_teardown(struct dsa_port *dp) { + struct devlink_port *dlp = &dp->devlink_port; + if (!dp->setup) return; + devlink_port_type_clear(dlp); + switch (dp->type) { case DSA_PORT_TYPE_UNUSED: break; |