diff options
| author |   Andrew Lunn <andrew@lunn.ch> | 2016-06-04 21:16:57 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-06-04 14:29:53 -0700 |
| commit | c8b098086b4c744084350d2757a637ad756adf34 (patch) | |
| tree | 0777d99335eff8adf732bd1cb574926b87f9d6c2 /net/dsa/tag_edsa.c | |
| parent | net: dsa: tag_{e}dsa.c: Remove dependency on platform data (diff) | |
| download | linux-dev-c8b098086b4c744084350d2757a637ad756adf34.tar.xz linux-dev-c8b098086b4c744084350d2757a637ad756adf34.zip | |
net: dsa: Add a ports structure and use it in the switch structure
There are going to be more per-port members added to the switch
structure. So add a port structure and move the netdev into it.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Reviewed-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dsa/tag_edsa.c')
| -rw-r--r-- | net/dsa/tag_edsa.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/dsa/tag_edsa.c b/net/dsa/tag_edsa.c index 3890aac8190f..6c1720e88537 100644 --- a/net/dsa/tag_edsa.c +++ b/net/dsa/tag_edsa.c @@ -127,7 +127,7 @@ static int edsa_rcv(struct sk_buff *skb, struct net_device *dev, if (!ds) goto out_drop; - if (source_port >= DSA_MAX_PORTS || ds->ports[source_port] == NULL) + if (source_port >= DSA_MAX_PORTS || !ds->ports[source_port].netdev) goto out_drop; /* @@ -182,7 +182,7 @@ static int edsa_rcv(struct sk_buff *skb, struct net_device *dev, 2 * ETH_ALEN); } - skb->dev = ds->ports[source_port]; + skb->dev = ds->ports[source_port].netdev; skb_push(skb, ETH_HLEN); skb->pkt_type = PACKET_HOST; skb->protocol = eth_type_trans(skb, skb->dev); |