diff options
| author | David S. Miller <davem@davemloft.net> | 2019-05-30 12:59:07 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-05-30 12:59:07 -0700 |
| commit | 18a49727083a5a4e949f122aa392fefc8791df77 (patch) | |
| tree | 9de775f748e62f296688dfb02170df660774995d | |
| parent | 32707c4dfa20b01d6a3c8d2797daa52bfc188add (diff) | |
| parent | aeb4a5e8b350d481dcb082ac9a102e0fea3f4065 (diff) | |
| download | linux-18a49727083a5a4e949f122aa392fefc8791df77.tar.gz linux-18a49727083a5a4e949f122aa392fefc8791df77.tar.bz2 linux-18a49727083a5a4e949f122aa392fefc8791df77.zip | |
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>
| -rw-r--r-- | drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c index 33dc37c7e1c1..a97b1ea76438 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c @@ -114,7 +114,7 @@ static struct sk_buff *stmmac_test_get_udp_skb(struct stmmac_priv *priv, } if (attr->vlan) { - u16 *tag, *proto; + __be16 *tag, *proto; if (!attr->remove_sa) { tag = (void *)ehdr + ETH_HLEN; @@ -617,7 +617,7 @@ static int stmmac_test_flowctrl_validate(struct sk_buff *skb, tpriv->ok = true; complete(&tpriv->comp); out: - kfree(skb); + kfree_skb(skb); return 0; } |