summaryrefslogtreecommitdiff
path: root/sys/dev/ic/rtl81x9reg.h
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/ic/rtl81x9reg.h')
-rw-r--r--sys/dev/ic/rtl81x9reg.h52
1 files changed, 33 insertions, 19 deletions
diff --git a/sys/dev/ic/rtl81x9reg.h b/sys/dev/ic/rtl81x9reg.h
index e61e4e3d77b..531bf1accc7 100644
--- a/sys/dev/ic/rtl81x9reg.h
+++ b/sys/dev/ic/rtl81x9reg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: rtl81x9reg.h,v 1.85 2014/07/08 05:35:18 dlg Exp $ */
+/* $OpenBSD: rtl81x9reg.h,v 1.86 2014/09/06 04:46:58 brad Exp $ */
/*
* Copyright (c) 1997, 1998
@@ -736,7 +736,15 @@ struct rl_stats {
/* see comment in dev/ic/re.c */
#define RL_JUMBO_FRAMELEN 7440
-#define RL_JUMBO_MTU (RL_JUMBO_FRAMELEN-ETHER_HDR_LEN-ETHER_CRC_LEN)
+#define RL_JUMBO_MTU_4K \
+ ((4 * 1024) - ETHER_HDR_LEN - ETHER_CRC_LEN - ETHER_VLAN_ENCAP_LEN)
+#define RL_JUMBO_MTU_6K \
+ ((6 * 1024) - ETHER_HDR_LEN - ETHER_CRC_LEN - ETHER_VLAN_ENCAP_LEN)
+#define RL_JUMBO_MTU_7K \
+ (RL_JUMBO_FRAMELEN - ETHER_HDR_LEN - ETHER_CRC_LEN - ETHER_VLAN_ENCAP_LEN)
+#define RL_JUMBO_MTU_9K \
+ ((9 * 1024) - ETHER_HDR_LEN - ETHER_CRC_LEN - ETHER_VLAN_ENCAP_LEN)
+#define RL_MTU ETHERMTU
#define MAX_NUM_MULTICAST_ADDRESSES 128
@@ -823,6 +831,8 @@ struct rl_softc {
struct mii_data sc_mii; /* MII information */
u_int8_t rl_type;
u_int32_t sc_hwrev;
+ u_int16_t sc_product;
+ int rl_max_mtu;
int rl_eecmd_read;
int rl_eewidth;
int rl_bus_speed;
@@ -841,23 +851,27 @@ struct rl_softc {
#define RL_FLAG_MSI 0x00000001
#define RL_FLAG_PCI64 0x00000002
#define RL_FLAG_PCIE 0x00000004
-#define RL_FLAG_INVMAR 0x00000008
-#define RL_FLAG_PHYWAKE 0x00000010
-#define RL_FLAG_NOJUMBO 0x00000020
-#define RL_FLAG_PAR 0x00000040
-#define RL_FLAG_DESCV2 0x00000080
-#define RL_FLAG_MACSTAT 0x00000100
-#define RL_FLAG_HWIM 0x00000200
-#define RL_FLAG_TIMERINTR 0x00000400
-#define RL_FLAG_MACLDPS 0x00000800
-#define RL_FLAG_CMDSTOP 0x00001000
-#define RL_FLAG_MACSLEEP 0x00002000
-#define RL_FLAG_AUTOPAD 0x00004000
-#define RL_FLAG_LINK 0x00008000
-#define RL_FLAG_PHYWAKE_PM 0x00010000
-#define RL_FLAG_EARLYOFF 0x00020000
-#define RL_FLAG_EARLYOFFV2 0x00040000
-#define RL_FLAG_RXDV_GATED 0x00080000
+#define RL_FLAG_PHYWAKE 0x00000008
+#define RL_FLAG_PAR 0x00000010
+#define RL_FLAG_DESCV2 0x00000020
+#define RL_FLAG_MACSTAT 0x00000040
+#define RL_FLAG_HWIM 0x00000080
+#define RL_FLAG_TIMERINTR 0x00000100
+#define RL_FLAG_MACRESET 0x00000200
+#define RL_FLAG_CMDSTOP 0x00000400
+#define RL_FLAG_MACSLEEP 0x00000800
+#define RL_FLAG_AUTOPAD 0x00001000
+#define RL_FLAG_LINK 0x00002000
+#define RL_FLAG_PHYWAKE_PM 0x00004000
+#define RL_FLAG_EARLYOFF 0x00008000
+#define RL_FLAG_EARLYOFFV2 0x00010000
+#define RL_FLAG_RXDV_GATED 0x00020000
+#define RL_FLAG_FASTETHER 0x00040000
+#define RL_FLAG_CMDSTOP_WAIT_TXQ 0x00080000
+#define RL_FLAG_JUMBOV2 0x00100000
+#define RL_FLAG_WOL_MANLINK 0x00200000
+#define RL_FLAG_WAIT_TXPOLL 0x00400000
+#define RL_FLAG_WOLRXENB 0x00800000
u_int16_t rl_intrs;
u_int16_t rl_tx_ack;