Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

net: dsa: kill circular reference with slave priv 



The dsa_slave_priv structure does not need a pointer to its net_device.
Kill it.

Signed-off-by: default avatarVivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9f4ab6ec

net/dsa/dsa_priv.h

+0 −5
Original line number Diff line number Diff line
@@ -22,11 +22,6 @@ struct dsa_device_ops { 
};



struct dsa_slave_priv {

	/*

	 * The linux network interface corresponding to this

	 * switch port.

	 */

	struct net_device	*dev;

	struct sk_buff *	(*xmit)(struct sk_buff *skb,

					struct net_device *dev);

net/dsa/slave.c

+4 −5
Original line number Diff line number Diff line
@@ -673,10 +673,10 @@ static void dsa_slave_get_ethtool_stats(struct net_device *dev, 
	struct dsa_slave_priv *p = netdev_priv(dev);

	struct dsa_switch *ds = p->parent;



	data[0] = p->dev->stats.tx_packets;

	data[1] = p->dev->stats.tx_bytes;

	data[2] = p->dev->stats.rx_packets;

	data[3] = p->dev->stats.rx_bytes;

	data[0] = dev->stats.tx_packets;

	data[1] = dev->stats.tx_bytes;

	data[2] = dev->stats.rx_packets;

	data[3] = dev->stats.rx_bytes;

	if (ds->drv->get_ethtool_stats != NULL)

		ds->drv->get_ethtool_stats(ds, p->port, data + 4);

}
@@ -1063,7 +1063,6 @@ int dsa_slave_create(struct dsa_switch *ds, struct device *parent, 
	slave_dev->vlan_features = master->vlan_features;



	p = netdev_priv(slave_dev);

	p->dev = slave_dev;

	p->parent = ds;

	p->port = port;