diff options
| author | David S. Miller <[email protected]> | 2017-01-29 23:42:47 +0000 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2017-01-29 23:42:47 +0000 |
| commit | 6d45408db1ad87c2080cffeb7868553eec6e053b (patch) | |
| tree | 28d1ab92fd28edc6d9a2232e2e17b64660b87046 /net/dsa/dsa_priv.h | |
| parent | Merge branch 'ravb-gigabit-R-Car-H3-ES1.1-and-R-Car-M3-W' (diff) | |
| parent | net: dsa: b53: use dsa_port's bridge pointer (diff) | |
| download | kernel-6d45408db1ad87c2080cffeb7868553eec6e053b.tar.gz kernel-6d45408db1ad87c2080cffeb7868553eec6e053b.zip | |
Merge branch 'dsa-multi-chip-prep'
Vivien Didelot says:
====================
net: dsa: preparatory patches for multi-chip
In order to introduce support for multi-chip configuration, we need to
do a few enhancements. This patchset makes the number of ports in a
switch dynamic (instead of capping to DSA_MAX_PORTS), stores the switch
and index of a port in the dsa_port structure, uses it in the slave
private structure, and exposes the bridge device a port belongs to.
====================
Signed-off-by: David S. Miller <[email protected]>
Diffstat (limited to 'net/dsa/dsa_priv.h')
| -rw-r--r-- | net/dsa/dsa_priv.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/net/dsa/dsa_priv.h b/net/dsa/dsa_priv.h index 16194a4bb2fe..3022f2e42cdc 100644 --- a/net/dsa/dsa_priv.h +++ b/net/dsa/dsa_priv.h @@ -25,12 +25,8 @@ struct dsa_slave_priv { struct sk_buff * (*xmit)(struct sk_buff *skb, struct net_device *dev); - /* - * Which switch this port is a part of, and the port index - * for this port. - */ - struct dsa_switch *parent; - u8 port; + /* DSA port data, such as switch, port index, etc. */ + struct dsa_port *dp; /* * The phylib phy_device pointer for the PHY connected @@ -42,7 +38,6 @@ struct dsa_slave_priv { int old_pause; int old_duplex; - struct net_device *bridge_dev; #ifdef CONFIG_NET_POLL_CONTROLLER struct netpoll *netpoll; #endif |