diff options
| author | Florian Fainelli <f.fainelli@gmail.com> | 2017-06-13 13:27:20 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-06-13 16:35:02 -0400 |
| commit | 67dbb9d433447e358de7d293f15318bb5db9529b (patch) | |
| tree | 74f40b003da2d762e06b897ee819a2070933592d /include/net/dsa.h | |
| parent | 6d3c8c0dd88a5ffc7e3695997641e4b6d4c11065 (diff) | |
| download | linux-stable-67dbb9d433447e358de7d293f15318bb5db9529b.tar.gz linux-stable-67dbb9d433447e358de7d293f15318bb5db9529b.tar.bz2 linux-stable-67dbb9d433447e358de7d293f15318bb5db9529b.zip | |
net: dsa: Relocate master ethtool operations
Relocate master_ethtool_ops and master_orig_ethtool_ops into struct
dsa_port in order to be both consistent, and make things self contained
within the dsa_port structure.
This is a preliminary change to supporting multiple CPU port interfaces.
Reviewed-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/dsa.h')
| -rw-r--r-- | include/net/dsa.h | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/include/net/dsa.h b/include/net/dsa.h index b2fb53f5e28e..7e93869819f9 100644 --- a/include/net/dsa.h +++ b/include/net/dsa.h @@ -122,12 +122,6 @@ struct dsa_switch_tree { */ struct dsa_platform_data *pd; - /* - * Reference to network device to use, and which tagging - * protocol to use. - */ - struct net_device *master_netdev; - /* Copy of tag_ops->rcv for faster access in hot path */ struct sk_buff * (*rcv)(struct sk_buff *skb, struct net_device *dev, @@ -135,12 +129,6 @@ struct dsa_switch_tree { struct net_device *orig_dev); /* - * Original copy of the master netdev ethtool_ops - */ - struct ethtool_ops master_ethtool_ops; - const struct ethtool_ops *master_orig_ethtool_ops; - - /* * The switch port to which the CPU is attached. */ struct dsa_port *cpu_dp; @@ -189,6 +177,11 @@ struct dsa_port { u8 stp_state; struct net_device *bridge_dev; struct devlink_port devlink_port; + /* + * Original copy of the master netdev ethtool_ops + */ + struct ethtool_ops ethtool_ops; + const struct ethtool_ops *orig_ethtool_ops; }; struct dsa_switch { |