Commit 3242956b authored by David S. Miller's avatar David S. Miller
Browse files

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



Florian Fainelli says:

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

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

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 9b1b31d5 097f0244

net/dsa/tag_ocelot.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

net/dsa/tag_sja1105.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

CRA Git | Maintained and supported by SUSTech CRA and CCSE