From d5f388ceaf509232fb79b95f3a7742e02d28c260 Mon Sep 17 00:00:00 2001 From: Matt Carlson Date: Thu, 14 Oct 2010 10:37:38 +0000 Subject: [PATCH] --- yaml --- r: 215191 b: refs/heads/master c: bba226acf4d13586ce47cf8376db33bed7bc0bd6 h: refs/heads/master i: 215189: 42c21b6f501b23dc69c7fe4387cf62bc55ac52fc 215187: e92c6e5298fec86a8624ddd8dbe6a5b84481bb73 215183: eb698944c4dca3854adb15b64130ef8b1df3127a v: v3 --- [refs] | 2 +- trunk/drivers/net/tg3.c | 3 +++ trunk/drivers/net/tg3.h | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 1b800037277c..47790881ad47 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 19f572565ef66a0439574fd2299a7c804147e133 +refs/heads/master: bba226acf4d13586ce47cf8376db33bed7bc0bd6 diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c index 943c28325444..978ba5d8c253 100644 --- a/trunk/drivers/net/tg3.c +++ b/trunk/drivers/net/tg3.c @@ -12702,6 +12702,9 @@ static void __devinit tg3_read_sb_ver(struct tg3 *tp, u32 val) case TG3_EEPROM_SB_REVISION_5: offset = TG3_EEPROM_SB_F1R5_EDH_OFF; break; + case TG3_EEPROM_SB_REVISION_6: + offset = TG3_EEPROM_SB_F1R6_EDH_OFF; + break; default: return; } diff --git a/trunk/drivers/net/tg3.h b/trunk/drivers/net/tg3.h index f6b709a3ca32..89553c42fd08 100644 --- a/trunk/drivers/net/tg3.h +++ b/trunk/drivers/net/tg3.h @@ -1915,6 +1915,7 @@ #define TG3_EEPROM_SB_REVISION_3 0x00030000 #define TG3_EEPROM_SB_REVISION_4 0x00040000 #define TG3_EEPROM_SB_REVISION_5 0x00050000 +#define TG3_EEPROM_SB_REVISION_6 0x00060000 #define TG3_EEPROM_MAGIC_HW 0xabcd #define TG3_EEPROM_MAGIC_HW_MSK 0xffff @@ -1934,6 +1935,7 @@ #define TG3_EEPROM_SB_F1R3_EDH_OFF 0x18 #define TG3_EEPROM_SB_F1R4_EDH_OFF 0x1c #define TG3_EEPROM_SB_F1R5_EDH_OFF 0x20 +#define TG3_EEPROM_SB_F1R6_EDH_OFF 0x4c #define TG3_EEPROM_SB_EDH_MAJ_MASK 0x00000700 #define TG3_EEPROM_SB_EDH_MAJ_SHFT 8 #define TG3_EEPROM_SB_EDH_MIN_MASK 0x000000ff