Merge branch 'net-stmmac-selftests-Two-fixes'
Jose Abreu says: ==================== net: stmmac: selftests: Two fixes Two fixes reported by kbuild. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Коммит
18a4972708
|
@ -114,7 +114,7 @@ static struct sk_buff *stmmac_test_get_udp_skb(struct stmmac_priv *priv,
|
||||||
}
|
}
|
||||||
|
|
||||||
if (attr->vlan) {
|
if (attr->vlan) {
|
||||||
u16 *tag, *proto;
|
__be16 *tag, *proto;
|
||||||
|
|
||||||
if (!attr->remove_sa) {
|
if (!attr->remove_sa) {
|
||||||
tag = (void *)ehdr + ETH_HLEN;
|
tag = (void *)ehdr + ETH_HLEN;
|
||||||
|
@ -617,7 +617,7 @@ static int stmmac_test_flowctrl_validate(struct sk_buff *skb,
|
||||||
tpriv->ok = true;
|
tpriv->ok = true;
|
||||||
complete(&tpriv->comp);
|
complete(&tpriv->comp);
|
||||||
out:
|
out:
|
||||||
kfree(skb);
|
kfree_skb(skb);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче