You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
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>
This commit is contained in:
committed by
David S. Miller
parent
6d3c8c0dd8
commit
67dbb9d433
+5
-12
@@ -122,24 +122,12 @@ 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,
|
||||
struct packet_type *pt,
|
||||
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.
|
||||
*/
|
||||
@@ -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 {
|
||||
|
||||
Reference in New Issue
Block a user