From 93afd9cc10cb182daadeaf3915c82ca17af94e02 Mon Sep 17 00:00:00 2001 From: Dimitris Michailidis Date: Tue, 14 Dec 2010 21:36:45 +0000 Subject: [PATCH] --- yaml --- r: 225173 b: refs/heads/master c: ec16400823ce63bc0cfe89df78c6b7bf4a4d684b h: refs/heads/master i: 225171: 9e440a31fb7c3d9cea5708ee4aec9979e184aa82 v: v3 --- [refs] | 2 +- trunk/drivers/net/cxgb4/t4_hw.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 688c23d5fe94..6457f540b90f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ef306b50b983be4873aed453c1feeaab22f3a098 +refs/heads/master: ec16400823ce63bc0cfe89df78c6b7bf4a4d684b diff --git a/trunk/drivers/net/cxgb4/t4_hw.c b/trunk/drivers/net/cxgb4/t4_hw.c index e97521c801ea..6af04520fa06 100644 --- a/trunk/drivers/net/cxgb4/t4_hw.c +++ b/trunk/drivers/net/cxgb4/t4_hw.c @@ -370,7 +370,7 @@ int t4_seeprom_wp(struct adapter *adapter, bool enable) static int get_vpd_params(struct adapter *adapter, struct vpd_params *p) { int i, ret; - int ec, sn, v2; + int ec, sn; u8 vpd[VPD_LEN], csum; unsigned int vpdr_len; const struct t4_vpd_hdr *v; @@ -408,10 +408,8 @@ static int get_vpd_params(struct adapter *adapter, struct vpd_params *p) FIND_VPD_KW(ec, "EC"); FIND_VPD_KW(sn, "SN"); - FIND_VPD_KW(v2, "V2"); #undef FIND_VPD_KW - p->cclk = simple_strtoul(vpd + v2, NULL, 10); memcpy(p->id, v->id_data, ID_LEN); strim(p->id); memcpy(p->ec, vpd + ec, EC_LEN);