Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18a49727 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'net-stmmac-selftests-Two-fixes' 



Jose Abreu says:

====================
net: stmmac: selftests: Two fixes

Two fixes reported by kbuild.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 32707c4d aeb4a5e8

drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

}