diff options
| author | cc210113 <none@none> | 2008-06-16 20:48:40 -0700 |
|---|---|---|
| committer | cc210113 <none@none> | 2008-06-16 20:48:40 -0700 |
| commit | e33b3e6c8793812e1695af15ea0bf0fdf7993ce9 (patch) | |
| tree | 18d57f9b4e47987f65a7155179e4c5bc67dc62f6 /usr/src | |
| parent | 0ca83ba24ef823585c27fa512e4deafbd9986a06 (diff) | |
| download | illumos-joyent-e33b3e6c8793812e1695af15ea0bf0fdf7993ce9.tar.gz | |
6713685 e1000g:one device id macro should be renamed
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/uts/common/io/e1000g/README | 6 | ||||
| -rw-r--r-- | usr/src/uts/common/io/e1000g/e1000_api.c | 2 | ||||
| -rw-r--r-- | usr/src/uts/common/io/e1000g/e1000_hw.h | 1 | ||||
| -rw-r--r-- | usr/src/uts/common/io/e1000g/e1000_osdep.h | 2 | ||||
| -rw-r--r-- | usr/src/uts/common/io/e1000g/e1000g_main.c | 4 |
5 files changed, 10 insertions, 5 deletions
diff --git a/usr/src/uts/common/io/e1000g/README b/usr/src/uts/common/io/e1000g/README index b34b89b0c8..e6db459e5f 100644 --- a/usr/src/uts/common/io/e1000g/README +++ b/usr/src/uts/common/io/e1000g/README @@ -575,8 +575,12 @@ Notes on packaging: 5.2.8 ====== This version has the following fix: - 6674179 doradi panics at e1000g_receive + 6674179 SunFire X4150 panics at e1000g_receive 6679136 E1000g with patch 128028-03 will not allow pause frames to be set 6687947 e1000g needs to integrate the latest Intel shared code to support ICH9m 6699622 e1000g: add support for network device in new development machine +5.2.9 +====== + 6665738 e1000g issues with some Ethernet controllers + 6713685 e1000g:one device id macro should be renamed diff --git a/usr/src/uts/common/io/e1000g/e1000_api.c b/usr/src/uts/common/io/e1000g/e1000_api.c index f0e0447c54..d25d2e9046 100644 --- a/usr/src/uts/common/io/e1000g/e1000_api.c +++ b/usr/src/uts/common/io/e1000g/e1000_api.c @@ -239,7 +239,7 @@ e1000_set_mac_type(struct e1000_hw *hw) case E1000_DEV_ID_ICH9_IGP_AMT: case E1000_DEV_ID_ICH9_BM: case E1000_DEV_ID_ICH9_IGP_C: - case E1000_DEV_ID_MCCREARY: + case E1000_DEV_ID_ICH10D_BM_LM: mac->type = e1000_ich9lan; break; default: diff --git a/usr/src/uts/common/io/e1000g/e1000_hw.h b/usr/src/uts/common/io/e1000g/e1000_hw.h index e0e368ba06..7cee0a6128 100644 --- a/usr/src/uts/common/io/e1000g/e1000_hw.h +++ b/usr/src/uts/common/io/e1000g/e1000_hw.h @@ -113,7 +113,6 @@ struct e1000_hw; #define E1000_DEV_ID_ICH9_IFE 0x10C0 #define E1000_DEV_ID_ICH9_IFE_GT 0x10C3 #define E1000_DEV_ID_ICH9_IFE_G 0x10C2 -#define E1000_DEV_ID_MCCREARY 0x10DE #define E1000_REVISION_0 0 #define E1000_REVISION_1 1 diff --git a/usr/src/uts/common/io/e1000g/e1000_osdep.h b/usr/src/uts/common/io/e1000g/e1000_osdep.h index 21cb600cff..f71c6562c0 100644 --- a/usr/src/uts/common/io/e1000g/e1000_osdep.h +++ b/usr/src/uts/common/io/e1000g/e1000_osdep.h @@ -87,6 +87,8 @@ extern "C" { #define E1000_MDALIGN 4096 #define E1000_ERT_2048 0x100 +#define E1000_DEV_ID_ICH10D_BM_LM 0x10DE + /* PHY Extended Status Register */ #define IEEE_ESR_1000T_HD_CAPS 0x1000 /* 1000T HD capable */ #define IEEE_ESR_1000T_FD_CAPS 0x2000 /* 1000T FD capable */ diff --git a/usr/src/uts/common/io/e1000g/e1000g_main.c b/usr/src/uts/common/io/e1000g/e1000g_main.c index 77817f6ce2..4c43db66d5 100644 --- a/usr/src/uts/common/io/e1000g/e1000g_main.c +++ b/usr/src/uts/common/io/e1000g/e1000g_main.c @@ -46,9 +46,9 @@ #include "e1000g_sw.h" #include "e1000g_debug.h" -static char ident[] = "Intel PRO/1000 Ethernet 5.2.8"; +static char ident[] = "Intel PRO/1000 Ethernet 5.2.9"; static char e1000g_string[] = "Intel(R) PRO/1000 Network Connection"; -static char e1000g_version[] = "Driver Ver. 5.2.8"; +static char e1000g_version[] = "Driver Ver. 5.2.9"; /* * Proto types for DDI entry points |