Commit c60c9840 authored by Vivien Didelot's avatar Vivien Didelot Committed by David S. Miller
Browse files

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: default avatarVivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2dabf0c4

include/net/dsa.h

+0 −5
Original line number Diff line number Diff line
@@ -135,11 +135,6 @@ struct dsa_switch { 
	 */

	void *priv;



	/*

	 * Tagging protocol understood by this switch

	 */

	enum dsa_tag_protocol	tag_protocol;



	/*

	 * Configuration data for this switch.

	 */

net/dsa/dsa.c

+2 −3
Original line number Diff line number Diff line
@@ -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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE