Merge branch 'net-dsa-Constify-two-tagger-ops'

davem330 · davem330 · commit 3242956bd610 · 2020-05-11T16:50:45.000-07:00
Florian Fainelli says:

====================
net: dsa: Constify two tagger ops

This patch series constifies the dsa_device_ops for ocelot and sja1105
====================

Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/net/dsa/tag_ocelot.c b/net/dsa/tag_ocelot.c
@@ -228,7 +228,7 @@ static struct sk_buff *ocelot_rcv(struct sk_buff *skb,
 	return skb;
 }
 
-static struct dsa_device_ops ocelot_netdev_ops = {
+static const struct dsa_device_ops ocelot_netdev_ops = {
 	.name			= "ocelot",
 	.proto			= DSA_TAG_PROTO_OCELOT,
 	.xmit			= ocelot_xmit,
diff --git a/net/dsa/tag_sja1105.c b/net/dsa/tag_sja1105.c
@@ -304,7 +304,7 @@ static struct sk_buff *sja1105_rcv(struct sk_buff *skb,
 					      is_meta);
 }
 
-static struct dsa_device_ops sja1105_netdev_ops = {
+static const struct dsa_device_ops sja1105_netdev_ops = {
 	.name = "sja1105",
 	.proto = DSA_TAG_PROTO_SJA1105,
 	.xmit = sja1105_xmit,

Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,7 @@ static struct sk_buff ocelot_rcv(struct sk_buff skb,`
`228`	`228`	`return skb;`
`229`	`229`	`}`
`230`	`230`
`231`		`-static struct dsa_device_ops ocelot_netdev_ops = {`
	`231`	`+static const struct dsa_device_ops ocelot_netdev_ops = {`
`232`	`232`	`.name = "ocelot",`
`233`	`233`	`.proto = DSA_TAG_PROTO_OCELOT,`
`234`	`234`	`.xmit = ocelot_xmit,`
Original file line number	Diff line number	Diff line change
`@@ -304,7 +304,7 @@ static struct sk_buff sja1105_rcv(struct sk_buff skb,`
`304`	`304`	`is_meta);`
`305`	`305`	`}`
`306`	`306`
`307`		`-static struct dsa_device_ops sja1105_netdev_ops = {`
	`307`	`+static const struct dsa_device_ops sja1105_netdev_ops = {`
`308`	`308`	`.name = "sja1105",`
`309`	`309`	`.proto = DSA_TAG_PROTO_SJA1105,`
`310`	`310`	`.xmit = sja1105_xmit,`