nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

net: stmmac: Fix misuses of GENMASK macro

Browse source 
Arguments are supposed to be ordered high then low.

Fixes: 293e4365a1 ("stmmac: change descriptor layout")
Fixes: 9f93ac8d40 ("net-next: stmmac: Add dwmac-sun8i")
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Joe Perches 2019-07-09 22:04:21 -07:00 committed by David S. Miller
parent 937a944090
commit aa4c0c9091
2 changed files with 3 additions and 3 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/net/ethernet/stmicro/stmmac/descs.h
View file

@ -123,7 +123,7 @@
#define ETDES1_BUFFER2_SIZE_SHIFT 16 #define ETDES1_BUFFER2_SIZE_SHIFT 16
/* Extended Receive descriptor definitions */ /* 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_HDR_ERR BIT(3)
#define ERDES4_IP_PAYLOAD_ERR BIT(4) #define ERDES4_IP_PAYLOAD_ERR BIT(4)
#define ERDES4_IP_CSUM_BYPASSED BIT(5) #define ERDES4_IP_CSUM_BYPASSED BIT(5)

4
drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
View file

@ -192,7 +192,7 @@ static const struct emac_variant emac_variant_h6 = {
/* Used in RX_CTL1*/ /* Used in RX_CTL1*/
#define EMAC_RX_MD BIT(1) #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_32 0
#define EMAC_RX_TH_64 (0x1 << 4) #define EMAC_RX_TH_64 (0x1 << 4)
#define EMAC_RX_TH_96 (0x2 << 4) #define EMAC_RX_TH_96 (0x2 << 4)
@ -203,7 +203,7 @@ static const struct emac_variant emac_variant_h6 = {
/* Used in TX_CTL1*/ /* Used in TX_CTL1*/
#define EMAC_TX_MD BIT(1) #define EMAC_TX_MD BIT(1)
#define EMAC_TX_NEXT_FRM BIT(2) #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_64 0
#define EMAC_TX_TH_128 (0x1 << 8) #define EMAC_TX_TH_128 (0x1 << 8)
#define EMAC_TX_TH_192 (0x2 << 8) #define EMAC_TX_TH_192 (0x2 << 8)