|
Denis Kirjanov |
fc6700 |
From a9a7f707cc523070b6045c09cec99e48985a8d9d Mon Sep 17 00:00:00 2001
|
|
Denis Kirjanov |
fc6700 |
From: Joe Perches <joe@perches.com>
|
|
Denis Kirjanov |
fc6700 |
Date: Tue, 9 Jul 2019 22:04:21 -0700
|
|
Denis Kirjanov |
fc6700 |
Subject: [PATCH 2/8] net: stmmac: Fix misuses of GENMASK macro
|
|
Denis Kirjanov |
fc6700 |
Git-commit: aa4c0c9091b0bb4cb261bbe0718d17c2834c4690
|
|
Denis Kirjanov |
fc6700 |
Patch-mainline: v5.3-rc1
|
|
Denis Kirjanov |
fc6700 |
References: git-fixes
|
|
Denis Kirjanov |
fc6700 |
|
|
Denis Kirjanov |
fc6700 |
Arguments are supposed to be ordered high then low.
|
|
Denis Kirjanov |
fc6700 |
|
|
Denis Kirjanov |
fc6700 |
Fixes: 293e4365a1ad ("stmmac: change descriptor layout")
|
|
Denis Kirjanov |
fc6700 |
Fixes: 9f93ac8d4085 ("net-next: stmmac: Add dwmac-sun8i")
|
|
Denis Kirjanov |
fc6700 |
Signed-off-by: Joe Perches <joe@perches.com>
|
|
Denis Kirjanov |
fc6700 |
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
Denis Kirjanov |
fc6700 |
Signed-off-by: Denis Kirjanov <denis.kirjanov@suse.com>
|
|
Denis Kirjanov |
fc6700 |
---
|
|
Denis Kirjanov |
fc6700 |
drivers/net/ethernet/stmicro/stmmac/descs.h | 2 +-
|
|
Denis Kirjanov |
fc6700 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
Denis Kirjanov |
fc6700 |
|
|
Denis Kirjanov |
fc6700 |
diff --git a/drivers/net/ethernet/stmicro/stmmac/descs.h b/drivers/net/ethernet/stmicro/stmmac/descs.h
|
|
Denis Kirjanov |
fc6700 |
index 0c2432b1ce67..1ff402484831 100644
|
|
Denis Kirjanov |
fc6700 |
--- a/drivers/net/ethernet/stmicro/stmmac/descs.h
|
|
Denis Kirjanov |
fc6700 |
+++ b/drivers/net/ethernet/stmicro/stmmac/descs.h
|
|
Denis Kirjanov |
fc6700 |
@@ -133,7 +133,7 @@
|
|
Denis Kirjanov |
fc6700 |
#define ETDES1_BUFFER2_SIZE_SHIFT 16
|
|
Denis Kirjanov |
fc6700 |
|
|
Denis Kirjanov |
fc6700 |
/* Extended Receive descriptor definitions */
|
|
Denis Kirjanov |
fc6700 |
-#define ERDES4_IP_PAYLOAD_TYPE_MASK GENMASK(2, 6)
|
|
Denis Kirjanov |
fc6700 |
+#define ERDES4_IP_PAYLOAD_TYPE_MASK GENMASK(6, 2)
|
|
Denis Kirjanov |
fc6700 |
#define ERDES4_IP_HDR_ERR BIT(3)
|
|
Denis Kirjanov |
fc6700 |
#define ERDES4_IP_PAYLOAD_ERR BIT(4)
|
|
Denis Kirjanov |
fc6700 |
#define ERDES4_IP_CSUM_BYPASSED BIT(5)
|
|
Denis Kirjanov |
fc6700 |
--
|
|
Denis Kirjanov |
fc6700 |
2.16.4
|
|
Denis Kirjanov |
fc6700 |
|