diff options
| author | Vivien Didelot <vivien.didelot@savoirfairelinux.com> | 2016-04-18 18:24:04 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-04-21 13:43:11 -0400 |
| commit | c60c9840423f32117a5422511c53c39df0b4d1dd (patch) | |
| tree | 96c7e59fd13e2c1e16371198ddb1afce470ff9c6 | |
| parent | 2dabf0c4d0348f6f0b1ce0e0efcbcedef6a72045 (diff) | |
| download | linux-c60c9840423f32117a5422511c53c39df0b4d1dd.tar.bz2 | |
net: dsa: remove tag_protocol from dsa_switch
Having the tag protocol in dsa_switch_driver for setup time and in
dsa_switch_tree for runtime is enough. Remove dsa_switch's one.
Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/net/dsa.h | 5 | ||||
| -rw-r--r-- | net/dsa/dsa.c | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/include/net/dsa.h b/include/net/dsa.h index c4bc42bd3538..2d280aba97e2 100644 --- a/include/net/dsa.h +++ b/include/net/dsa.h @@ -136,11 +136,6 @@ struct dsa_switch { void *priv; /* - * Tagging protocol understood by this switch - */ - enum dsa_tag_protocol tag_protocol; - - /* * Configuration data for this switch. */ struct dsa_chip_data *pd; diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c index efa612f0ab9b..d61ceed912be 100644 --- a/net/dsa/dsa.c +++ b/net/dsa/dsa.c @@ -267,7 +267,7 @@ static int dsa_switch_setup_one(struct dsa_switch *ds, struct device *parent) * switch. */ if (dst->cpu_switch == index) { - switch (ds->tag_protocol) { + switch (drv->tag_protocol) { #ifdef CONFIG_NET_DSA_TAG_DSA case DSA_TAG_PROTO_DSA: dst->rcv = dsa_netdev_ops.rcv; @@ -295,7 +295,7 @@ static int dsa_switch_setup_one(struct dsa_switch *ds, struct device *parent) goto out; } - dst->tag_protocol = ds->tag_protocol; + dst->tag_protocol = drv->tag_protocol; } /* @@ -411,7 +411,6 @@ dsa_switch_setup(struct dsa_switch_tree *dst, int index, ds->pd = pd; ds->drv = drv; ds->priv = priv; - ds->tag_protocol = drv->tag_protocol; ds->master_dev = host_dev; ret = dsa_switch_setup_one(ds, parent); |