Commit aa4c0c90 authored by Joe Perches's avatar Joe Perches Committed by David S. Miller
Browse files

net: stmmac: Fix misuses of GENMASK macro 



Arguments are supposed to be ordered high then low.

Fixes: 293e4365 ("stmmac: change descriptor layout")
Fixes: 9f93ac8d ("net-next: stmmac: Add dwmac-sun8i")
Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 937a9440

drivers/net/ethernet/stmicro/stmmac/descs.h

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ 
#define	ETDES1_BUFFER2_SIZE_SHIFT	16



/* Extended Receive descriptor definitions */

#define	ERDES4_IP_PAYLOAD_TYPE_MASK	GENMASK(2, 6)

#define	ERDES4_IP_PAYLOAD_TYPE_MASK	GENMASK(6, 2)

#define	ERDES4_IP_HDR_ERR		BIT(3)

#define	ERDES4_IP_PAYLOAD_ERR		BIT(4)

#define	ERDES4_IP_CSUM_BYPASSED		BIT(5)

drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c

+2 −2
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ static const struct emac_variant emac_variant_h6 = { 


/* Used in RX_CTL1*/

#define EMAC_RX_MD              BIT(1)

#define EMAC_RX_TH_MASK		GENMASK(4, 5)

#define EMAC_RX_TH_MASK		GENMASK(5, 4)

#define EMAC_RX_TH_32		0

#define EMAC_RX_TH_64		(0x1 << 4)

#define EMAC_RX_TH_96		(0x2 << 4)
@@ -203,7 +203,7 @@ static const struct emac_variant emac_variant_h6 = { 
/* Used in TX_CTL1*/

#define EMAC_TX_MD              BIT(1)

#define EMAC_TX_NEXT_FRM        BIT(2)

#define EMAC_TX_TH_MASK		GENMASK(8, 10)

#define EMAC_TX_TH_MASK		GENMASK(10, 8)

#define EMAC_TX_TH_64		0

#define EMAC_TX_TH_128		(0x1 << 8)

#define EMAC_TX_TH_192		(0x2 << 8)

CRA Git | Maintained and supported by SUSTech CRA and CCSE