diff options
| author | David S. Miller <davem@davemloft.net> | 2017-06-01 17:34:57 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-06-01 17:34:57 -0400 |
| commit | 0c34ca478ad5fa3a0abae5eae288afea422ddde5 (patch) | |
| tree | a45ba1a54b080a3a71e4650f03d57ac3de3767e8 /net/dsa/legacy.c | |
| parent | 0266f79778de0afadd070941aae493c28529d974 (diff) | |
| parent | fe47d563065c91cd30088d9b118b79d44905be6f (diff) | |
| download | linux-stable-0c34ca478ad5fa3a0abae5eae288afea422ddde5.tar.gz linux-stable-0c34ca478ad5fa3a0abae5eae288afea422ddde5.tar.bz2 linux-stable-0c34ca478ad5fa3a0abae5eae288afea422ddde5.zip | |
Merge branch 'dsa-tagger-simplification'
Vivien Didelot says:
====================
net: dsa: tagger simplification
This series clarifies the hot path, removes the labels in tagging
implementations, and frees the original SKB in the xmit caller.
Changes in v3:
- drop removal of usused rcv arguments because they will be used later
- include the new ksz tagging implementation
- add reviewers' tags
Changes in v2:
- do not remove tagger function copies
- document hot path requirements
- make netdev_uses_dsa simpler
- add reviewers' tags
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dsa/legacy.c')
| -rw-r--r-- | net/dsa/legacy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/dsa/legacy.c b/net/dsa/legacy.c index ac4379b8d7ac..d70a1a788d17 100644 --- a/net/dsa/legacy.c +++ b/net/dsa/legacy.c @@ -651,7 +651,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 = (void *)dst; + dev->dsa_ptr = dst; return 0; } |