diff options
| author |   Vivien Didelot <vivien.didelot@savoirfairelinux.com> | 2017-01-27 15:29:39 -0500 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-01-29 18:42:46 -0500 |
| commit | afdcf151c1f7346207dcee3f8d6d82991dbbb7e5 (patch) | |
| tree | 1afa077b113e04b364c88e90cabade71e3675f80 /net/dsa/tag_dsa.c | |
| parent | net: dsa: add ds and index to dsa_port (diff) | |
| download | linux-dev-afdcf151c1f7346207dcee3f8d6d82991dbbb7e5.tar.xz linux-dev-afdcf151c1f7346207dcee3f8d6d82991dbbb7e5.zip | |
net: dsa: store a dsa_port in dsa_slave_priv
Store a pointer to the dsa_port structure in the dsa_slave_priv
structure, instead of the switch/port index.
This will allow to store more information such as the bridge device,
needed in DSA drivers for multi-chip configuration.
Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dsa/tag_dsa.c')
| -rw-r--r-- | net/dsa/tag_dsa.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/dsa/tag_dsa.c b/net/dsa/tag_dsa.c index 8fa4b1942671..72579ceea381 100644 --- a/net/dsa/tag_dsa.c +++ b/net/dsa/tag_dsa.c @@ -33,8 +33,8 @@ static struct sk_buff *dsa_xmit(struct sk_buff *skb, struct net_device *dev) * Construct tagged FROM_CPU DSA tag from 802.1q tag. */ dsa_header = skb->data + 2 * ETH_ALEN; - dsa_header[0] = 0x60 | p->parent->index; - dsa_header[1] = p->port << 3; + dsa_header[0] = 0x60 | p->dp->ds->index; + dsa_header[1] = p->dp->index << 3; /* * Move CFI field from byte 2 to byte 1. @@ -54,8 +54,8 @@ static struct sk_buff *dsa_xmit(struct sk_buff *skb, struct net_device *dev) * Construct untagged FROM_CPU DSA tag. */ dsa_header = skb->data + 2 * ETH_ALEN; - dsa_header[0] = 0x40 | p->parent->index; - dsa_header[1] = p->port << 3; + dsa_header[0] = 0x40 | p->dp->ds->index; + dsa_header[1] = p->dp->index << 3; dsa_header[2] = 0x00; dsa_header[3] = 0x00; } |