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: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 3 insertions, 3 deletions

diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c
index 81c852e32821..51ca2a524a27 100644
--- a/net/dsa/dsa.c
+++ b/net/dsa/dsa.c
@@ -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;