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

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

net: dsa: change dsa_ptr for a dsa_port 



With DSA, a master net device (CPU facing interface) has a dsa_ptr
pointer to which hangs a dsa_switch_tree. This is not correct because a
master interface is wired to a dedicated switch port, and because we can
theoretically have several master interfaces pointing to several CPU
ports of the same switch fabric.

Change the master interface's dsa_ptr for the CPU dsa_port pointer.
This is a step towards supporting multiple CPU ports.

Signed-off-by: default avatarVivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3e41f93b

include/linux/netdevice.h

+2 −2
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ 
struct netpoll_info;

struct device;

struct phy_device;

struct dsa_switch_tree;

struct dsa_port;



/* 802.11 specific */

struct wireless_dev;
@@ -1752,7 +1752,7 @@ struct net_device { 
	struct vlan_info __rcu	*vlan_info;

#endif

#if IS_ENABLED(CONFIG_NET_DSA)

	struct dsa_switch_tree	*dsa_ptr;

	struct dsa_port		*dsa_ptr;

#endif

#if IS_ENABLED(CONFIG_TIPC)

	struct tipc_bearer __rcu *tipc_ptr;

net/dsa/dsa.c

+3 −3
Original line number Diff line number Diff line
@@ -160,12 +160,12 @@ EXPORT_SYMBOL_GPL(dsa_dev_to_net_device); 
static int dsa_switch_rcv(struct sk_buff *skb, struct net_device *dev,

			  struct packet_type *pt, struct net_device *unused)

{

	struct dsa_switch_tree *dst = dev->dsa_ptr;

	struct dsa_port *cpu_dp = dev->dsa_ptr;

	struct sk_buff *nskb = NULL;

	struct pcpu_sw_netstats *s;

	struct dsa_slave_priv *p;



	if (unlikely(dst == NULL)) {

	if (unlikely(!cpu_dp)) {

		kfree_skb(skb);

		return 0;

	}
@@ -174,7 +174,7 @@ static int dsa_switch_rcv(struct sk_buff *skb, struct net_device *dev, 
	if (!skb)

		return 0;



	nskb = dst->rcv(skb, dev, pt);

	nskb = cpu_dp->rcv(skb, dev, pt);

	if (!nskb) {

		kfree_skb(skb);

		return 0;

net/dsa/dsa2.c

+1 −1
Original line number Diff line number Diff line
@@ -438,7 +438,7 @@ static int dsa_dst_apply(struct dsa_switch_tree *dst) 
	 * sent to the tag format's receive function.

	 */

	wmb();

	dst->cpu_dp->netdev->dsa_ptr = dst;

	dst->cpu_dp->netdev->dsa_ptr = dst->cpu_dp;



	err = dsa_master_ethtool_setup(dst->cpu_dp->netdev);

	if (err)

net/dsa/dsa_priv.h

+2 −1
Original line number Diff line number Diff line
@@ -116,7 +116,8 @@ void dsa_master_ethtool_restore(struct net_device *dev); 
static inline struct net_device *dsa_master_get_slave(struct net_device *dev,

						      int device, int port)

{

	struct dsa_switch_tree *dst = dev->dsa_ptr;

	struct dsa_port *cpu_dp = dev->dsa_ptr;

	struct dsa_switch_tree *dst = cpu_dp->dst;

	struct dsa_switch *ds;



	if (device < 0 || device >= DSA_MAX_SWITCHES)

net/dsa/legacy.c

+1 −1
Original line number Diff line number Diff line
@@ -607,7 +607,7 @@ static int dsa_setup_dst(struct dsa_switch_tree *dst, struct net_device *dev, 
	 * sent to the tag format's receive function.

	 */

	wmb();

	dev->dsa_ptr = dst;

	dev->dsa_ptr = dst->cpu_dp;



	return dsa_master_ethtool_setup(dst->cpu_dp->netdev);

}