Fix defines macro to be align with upstream.

Signed-off-by: Sasha Neftin <sasha.nef...@intel.com>
Signed-off-by: Guinan Sun <guinanx....@intel.com>
---
 drivers/net/e1000/base/e1000_defines.h | 3 +++
 drivers/net/e1000/base/e1000_regs.h    | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/drivers/net/e1000/base/e1000_defines.h 
b/drivers/net/e1000/base/e1000_defines.h
index bcd7a1008..9302e5ed6 100644
--- a/drivers/net/e1000/base/e1000_defines.h
+++ b/drivers/net/e1000/base/e1000_defines.h
@@ -1524,6 +1524,9 @@
 #define E1000_MAX_MAC_HDR_LEN  127
 #define E1000_MAX_NETWORK_HDR_LEN      511
 
+#define E1000_VLANPQF_QSEL(_n, q_idx) ((q_idx) << ((_n) * 4))
+#define E1000_VLANPQF_VALID(_n)        (0x1 << (3 + (_n) * 4))
+#define E1000_VLANPQF_QUEUE_MASK       0x03
 #define E1000_VFTA_BLOCK_SIZE  8
 /* SerDes Control */
 #define E1000_GEN_CTL_READY            0x80000000
diff --git a/drivers/net/e1000/base/e1000_regs.h 
b/drivers/net/e1000/base/e1000_regs.h
index 9262d7fac..b0f9ff487 100644
--- a/drivers/net/e1000/base/e1000_regs.h
+++ b/drivers/net/e1000/base/e1000_regs.h
@@ -271,6 +271,8 @@
                                 (0x054E0 + ((_i - 16) * 8)))
 #define E1000_RAH(_i)          (((_i) <= 15) ? (0x05404 + ((_i) * 8)) : \
                                 (0x054E4 + ((_i - 16) * 8)))
+#define E1000_VLANPQF          0x055B0  /* VLAN Priority Queue Filter VLAPQF */
+
 #define E1000_SHRAL(_i)                (0x05438 + ((_i) * 8))
 #define E1000_SHRAH(_i)                (0x0543C + ((_i) * 8))
 #define E1000_IP4AT_REG(_i)    (0x05840 + ((_i) * 8))
-- 
2.17.1

Reply via email to