diff options
| author |   Vivien Didelot <vivien.didelot@savoirfairelinux.com> | 2017-01-17 20:41:38 -0500 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-01-18 16:49:46 -0500 |
| commit | b22de490869da354116ea4cbbaa09dcbc260b2b4 (patch) | |
| tree | f524fe3351c33f6d18ab3c3f9c455f7e9ca8c199 /net/dsa/dsa2.c | |
| parent | net: ethernet: ti: davinci_cpdma: correct check on NULL in set rate (diff) | |
| download | linux-dev-b22de490869da354116ea4cbbaa09dcbc260b2b4.tar.xz linux-dev-b22de490869da354116ea4cbbaa09dcbc260b2b4.zip | |
net: dsa: store CPU switch structure in the tree
Store a dsa_switch pointer to the CPU switch in the tree instead of only
its index. This avoids the need to initialize it to -1.
Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dsa/dsa2.c')
| -rw-r--r-- | net/dsa/dsa2.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c index 42a41d84053c..020e072b4299 100644 --- a/net/dsa/dsa2.c +++ b/net/dsa/dsa2.c @@ -57,7 +57,6 @@ static struct dsa_switch_tree *dsa_add_dst(u32 tree) if (!dst) return NULL; dst->tree = tree; - dst->cpu_switch = -1; INIT_LIST_HEAD(&dst->list); list_add_tail(&dsa_switch_trees, &dst->list); kref_init(&dst->refcount); @@ -448,8 +447,8 @@ static int dsa_cpu_parse(struct device_node *port, u32 index, if (!dst->master_netdev) dst->master_netdev = ethernet_dev; - if (dst->cpu_switch == -1) { - dst->cpu_switch = ds->index; + if (!dst->cpu_switch) { + dst->cpu_switch = ds; dst->cpu_port = index; } |