renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-18 18:43:59 +08:00
Code

net: dsa: kill circular reference with slave priv

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

Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Vivien Didelot 2016-04-18 16:10:24 -04:00 committed by David S. Miller
parent 9f4ab6ec7e
commit 46e7b8d8d5
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
net/dsa/dsa_priv.h
View File

@ -22,11 +22,6 @@ struct dsa_device_ops {
}; };
struct dsa_slave_priv { 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 sk_buff * (*xmit)(struct sk_buff *skb,
struct net_device *dev); struct net_device *dev);

9
net/dsa/slave.c
View File

@ -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_slave_priv *p = netdev_priv(dev);
struct dsa_switch *ds = p->parent; struct dsa_switch *ds = p->parent;
data[0] = p->dev->stats.tx_packets; data[0] = dev->stats.tx_packets;
data[1] = p->dev->stats.tx_bytes; data[1] = dev->stats.tx_bytes;
data[2] = p->dev->stats.rx_packets; data[2] = dev->stats.rx_packets;
data[3] = p->dev->stats.rx_bytes; data[3] = dev->stats.rx_bytes;
if (ds->drv->get_ethtool_stats != NULL) if (ds->drv->get_ethtool_stats != NULL)
ds->drv->get_ethtool_stats(ds, p->port, data + 4); 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; slave_dev->vlan_features = master->vlan_features;
p = netdev_priv(slave_dev); p = netdev_priv(slave_dev);
p->dev = slave_dev;
p->parent = ds; p->parent = ds;
p->port = port; p->port = port;