diff options
-rw-r--r-- | net/dsa/dsa.c | 2 | ||||
-rw-r--r-- | net/dsa/dsa2.c | 2 | ||||
-rw-r--r-- | net/dsa/dsa_priv.h | 3 | ||||
-rw-r--r-- | net/dsa/legacy.c | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c index 71907acd8f82..0a68d784ea18 100644 --- a/net/dsa/dsa.c +++ b/net/dsa/dsa.c | |||
@@ -123,7 +123,7 @@ const char *dsa_tag_protocol_to_str(const struct dsa_device_ops *ops) | |||
123 | return ops->name; | 123 | return ops->name; |
124 | }; | 124 | }; |
125 | 125 | ||
126 | const struct dsa_device_ops *dsa_resolve_tag_protocol(int tag_protocol) | 126 | const struct dsa_device_ops *dsa_tag_driver_get(int tag_protocol) |
127 | { | 127 | { |
128 | const struct dsa_device_ops *ops; | 128 | const struct dsa_device_ops *ops; |
129 | 129 | ||
diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c index d122f1bcdab2..ba91bda8bdd3 100644 --- a/net/dsa/dsa2.c +++ b/net/dsa/dsa2.c | |||
@@ -577,7 +577,7 @@ static int dsa_port_parse_cpu(struct dsa_port *dp, struct net_device *master) | |||
577 | enum dsa_tag_protocol tag_protocol; | 577 | enum dsa_tag_protocol tag_protocol; |
578 | 578 | ||
579 | tag_protocol = ds->ops->get_tag_protocol(ds, dp->index); | 579 | tag_protocol = ds->ops->get_tag_protocol(ds, dp->index); |
580 | tag_ops = dsa_resolve_tag_protocol(tag_protocol); | 580 | tag_ops = dsa_tag_driver_get(tag_protocol); |
581 | if (IS_ERR(tag_ops)) { | 581 | if (IS_ERR(tag_ops)) { |
582 | dev_warn(ds->dev, "No tagger for this switch\n"); | 582 | dev_warn(ds->dev, "No tagger for this switch\n"); |
583 | return PTR_ERR(tag_ops); | 583 | return PTR_ERR(tag_ops); |
diff --git a/net/dsa/dsa_priv.h b/net/dsa/dsa_priv.h index 093b7d145eb1..abe3abeb0bb9 100644 --- a/net/dsa/dsa_priv.h +++ b/net/dsa/dsa_priv.h | |||
@@ -84,7 +84,8 @@ struct dsa_slave_priv { | |||
84 | }; | 84 | }; |
85 | 85 | ||
86 | /* dsa.c */ | 86 | /* dsa.c */ |
87 | const struct dsa_device_ops *dsa_resolve_tag_protocol(int tag_protocol); | 87 | const struct dsa_device_ops *dsa_tag_driver_get(int tag_protocol); |
88 | |||
88 | bool dsa_schedule_work(struct work_struct *work); | 89 | bool dsa_schedule_work(struct work_struct *work); |
89 | const char *dsa_tag_protocol_to_str(const struct dsa_device_ops *ops); | 90 | const char *dsa_tag_protocol_to_str(const struct dsa_device_ops *ops); |
90 | 91 | ||
diff --git a/net/dsa/legacy.c b/net/dsa/legacy.c index cb42939db776..a8c076250237 100644 --- a/net/dsa/legacy.c +++ b/net/dsa/legacy.c | |||
@@ -152,7 +152,7 @@ static int dsa_switch_setup_one(struct dsa_switch *ds, | |||
152 | enum dsa_tag_protocol tag_protocol; | 152 | enum dsa_tag_protocol tag_protocol; |
153 | 153 | ||
154 | tag_protocol = ops->get_tag_protocol(ds, dst->cpu_dp->index); | 154 | tag_protocol = ops->get_tag_protocol(ds, dst->cpu_dp->index); |
155 | tag_ops = dsa_resolve_tag_protocol(tag_protocol); | 155 | tag_ops = dsa_tag_driver_get(tag_protocol); |
156 | if (IS_ERR(tag_ops)) | 156 | if (IS_ERR(tag_ops)) |
157 | return PTR_ERR(tag_ops); | 157 | return PTR_ERR(tag_ops); |
158 | 158 | ||