diff options
| author | David S. Miller <davem@davemloft.net> | 2020-02-14 07:34:51 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-02-14 07:34:51 -0800 |
| commit | 3ea89fa795c5e994141a21ea6d68d5a2d5fe8780 (patch) | |
| tree | f5b5652dc4a256d52aaef46518d29606617210c8 | |
| parent | 5fdcce211b3a41c3fed229333027f59a94a2f265 (diff) | |
| parent | ddc9abaf5d9924569afe09a605c9012089d0c25b (diff) | |
| download | linux-3ea89fa795c5e994141a21ea6d68d5a2d5fe8780.tar.bz2 | |
Merge branch 'dsa-headroom'
Per Forlin says:
====================
net: dsa: Make sure there is headroom for tag
Sorry for re-posting yet another time....
I manage to include multiple email-senders and forgot to include cover-letter.
Let's hope everyhthing is in order this time.
Fix two tag drivers to make sure there is headroom for the tag data.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/dsa/tag_ar9331.c | 2 | ||||
| -rw-r--r-- | net/dsa/tag_qca.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/dsa/tag_ar9331.c b/net/dsa/tag_ar9331.c index 466ffa92a474..55b00694cdba 100644 --- a/net/dsa/tag_ar9331.c +++ b/net/dsa/tag_ar9331.c @@ -31,7 +31,7 @@ static struct sk_buff *ar9331_tag_xmit(struct sk_buff *skb, __le16 *phdr; u16 hdr; - if (skb_cow_head(skb, 0) < 0) + if (skb_cow_head(skb, AR9331_HDR_LEN) < 0) return NULL; phdr = skb_push(skb, AR9331_HDR_LEN); diff --git a/net/dsa/tag_qca.c b/net/dsa/tag_qca.c index c8a128c9e5e0..70db7c909f74 100644 --- a/net/dsa/tag_qca.c +++ b/net/dsa/tag_qca.c @@ -33,7 +33,7 @@ static struct sk_buff *qca_tag_xmit(struct sk_buff *skb, struct net_device *dev) struct dsa_port *dp = dsa_slave_to_port(dev); u16 *phdr, hdr; - if (skb_cow_head(skb, 0) < 0) + if (skb_cow_head(skb, QCA_HDR_LEN) < 0) return NULL; skb_push(skb, QCA_HDR_LEN); |