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

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

net: dsa: add slave to master helper 



Many part of the DSA slave code require to get the master device
assigned to a slave device. Remove dsa_master_netdev() in favor of a
dsa_slave_to_master() helper which does that.

Signed-off-by: default avatarVivien Didelot <vivien.didelot@savoirfairelinux.com>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d945097b

net/dsa/dsa_priv.h

+8 −5
Original line number Diff line number Diff line
@@ -176,6 +176,14 @@ static inline struct dsa_port *dsa_slave_to_port(const struct net_device *dev) 
	return p->dp;

}



static inline struct net_device *

dsa_slave_to_master(const struct net_device *dev)

{

	struct dsa_port *dp = dsa_slave_to_port(dev);



	return dp->cpu_dp->netdev;

}



/* switch.c */

int dsa_switch_register_notifier(struct dsa_switch *ds);

void dsa_switch_unregister_notifier(struct dsa_switch *ds);
@@ -204,9 +212,4 @@ extern const struct dsa_device_ops qca_netdev_ops; 
/* tag_trailer.c */

extern const struct dsa_device_ops trailer_netdev_ops;



static inline struct net_device *dsa_master_netdev(struct dsa_slave_priv *p)

{

	return p->dp->cpu_dp->netdev;

}



#endif

net/dsa/slave.c

+9 −17
Original line number Diff line number Diff line
@@ -64,15 +64,12 @@ void dsa_slave_mii_bus_init(struct dsa_switch *ds) 
/* slave device handling ****************************************************/

static int dsa_slave_get_iflink(const struct net_device *dev)

{

	struct dsa_slave_priv *p = netdev_priv(dev);



	return dsa_master_netdev(p)->ifindex;

	return dsa_slave_to_master(dev)->ifindex;

}



static int dsa_slave_open(struct net_device *dev)

{

	struct dsa_slave_priv *p = netdev_priv(dev);

	struct net_device *master = dsa_master_netdev(p);

	struct net_device *master = dsa_slave_to_master(dev);

	struct dsa_port *dp = dsa_slave_to_port(dev);

	int err;
@@ -120,8 +117,7 @@ static int dsa_slave_open(struct net_device *dev) 


static int dsa_slave_close(struct net_device *dev)

{

	struct dsa_slave_priv *p = netdev_priv(dev);

	struct net_device *master = dsa_master_netdev(p);

	struct net_device *master = dsa_slave_to_master(dev);

	struct dsa_port *dp = dsa_slave_to_port(dev);



	if (dev->phydev)
@@ -144,8 +140,7 @@ static int dsa_slave_close(struct net_device *dev) 


static void dsa_slave_change_rx_flags(struct net_device *dev, int change)

{

	struct dsa_slave_priv *p = netdev_priv(dev);

	struct net_device *master = dsa_master_netdev(p);

	struct net_device *master = dsa_slave_to_master(dev);



	if (change & IFF_ALLMULTI)

		dev_set_allmulti(master, dev->flags & IFF_ALLMULTI ? 1 : -1);
@@ -155,8 +150,7 @@ static void dsa_slave_change_rx_flags(struct net_device *dev, int change) 


static void dsa_slave_set_rx_mode(struct net_device *dev)

{

	struct dsa_slave_priv *p = netdev_priv(dev);

	struct net_device *master = dsa_master_netdev(p);

	struct net_device *master = dsa_slave_to_master(dev);



	dev_mc_sync(master, dev);

	dev_uc_sync(master, dev);
@@ -164,8 +158,7 @@ static void dsa_slave_set_rx_mode(struct net_device *dev) 


static int dsa_slave_set_mac_address(struct net_device *dev, void *a)

{

	struct dsa_slave_priv *p = netdev_priv(dev);

	struct net_device *master = dsa_master_netdev(p);

	struct net_device *master = dsa_slave_to_master(dev);

	struct sockaddr *addr = a;

	int err;
@@ -409,7 +402,7 @@ static netdev_tx_t dsa_slave_xmit(struct sk_buff *skb, struct net_device *dev) 
	/* Queue the SKB for transmission on the parent interface, but

	 * do not modify its EtherType

	 */

	nskb->dev = dsa_master_netdev(p);

	nskb->dev = dsa_slave_to_master(dev);

	dev_queue_xmit(nskb);



	return NETDEV_TX_OK;
@@ -632,8 +625,8 @@ static int dsa_slave_get_eee(struct net_device *dev, struct ethtool_eee *e) 
static int dsa_slave_netpoll_setup(struct net_device *dev,

				   struct netpoll_info *ni)

{

	struct net_device *master = dsa_slave_to_master(dev);

	struct dsa_slave_priv *p = netdev_priv(dev);

	struct net_device *master = dsa_master_netdev(p);

	struct netpoll *netpoll;

	int err = 0;
@@ -1115,8 +1108,7 @@ int dsa_slave_resume(struct net_device *slave_dev) 


static void dsa_slave_notify(struct net_device *dev, unsigned long val)

{

	struct dsa_slave_priv *p = netdev_priv(dev);

	struct net_device *master = dsa_master_netdev(p);

	struct net_device *master = dsa_slave_to_master(dev);

	struct dsa_port *dp = dsa_slave_to_port(dev);

	struct dsa_notifier_register_info rinfo = {

		.switch_number = dp->ds->index,