From 39b8b6bca4684a8d8f0bda75a8b4440f0854ac0b Mon Sep 17 00:00:00 2001 From: Rasesh Mody Date: Tue, 11 Dec 2012 12:24:55 +0000 Subject: [PATCH] --- yaml --- r: 342151 b: refs/heads/master c: 478ab8c93a65c2a21f560636db416318a1927b11 h: refs/heads/master i: 342149: 6132a2702dcb2904f695ddfc45474e1dfb4363b3 342147: 263aac4b4c1d078deb586495865870e0e68c9c4e 342143: a0e7170809a979d5bbb4ba832c87cfdf5c058a6c v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/brocade/bna/bfi_enet.h | 1 + trunk/drivers/net/ethernet/brocade/bna/bnad_ethtool.c | 1 + trunk/drivers/net/ethernet/brocade/bna/cna.h | 4 ++-- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index bae46fa084f5..f3f82244bf9e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 215a64a25cd483e54d472987426d78694fc46ed0 +refs/heads/master: 478ab8c93a65c2a21f560636db416318a1927b11 diff --git a/trunk/drivers/net/ethernet/brocade/bna/bfi_enet.h b/trunk/drivers/net/ethernet/brocade/bna/bfi_enet.h index eef6e1f8aecc..7d10e335c27d 100644 --- a/trunk/drivers/net/ethernet/brocade/bna/bfi_enet.h +++ b/trunk/drivers/net/ethernet/brocade/bna/bfi_enet.h @@ -787,6 +787,7 @@ struct bfi_enet_stats_bpc { /* MAC Rx Statistics */ struct bfi_enet_stats_mac { + u64 stats_clr_cnt; /* times this stats cleared */ u64 frame_64; /* both rx and tx counter */ u64 frame_65_127; /* both rx and tx counter */ u64 frame_128_255; /* both rx and tx counter */ diff --git a/trunk/drivers/net/ethernet/brocade/bna/bnad_ethtool.c b/trunk/drivers/net/ethernet/brocade/bna/bnad_ethtool.c index 40e1e84f4984..455b5a2e59d4 100644 --- a/trunk/drivers/net/ethernet/brocade/bna/bnad_ethtool.c +++ b/trunk/drivers/net/ethernet/brocade/bna/bnad_ethtool.c @@ -102,6 +102,7 @@ static const char *bnad_net_stats_strings[BNAD_ETHTOOL_STATS_NUM] = { "rx_unmap_q_alloc_failed", "rxbuf_alloc_failed", + "mac_stats_clr_cnt", "mac_frame_64", "mac_frame_65_127", "mac_frame_128_255", diff --git a/trunk/drivers/net/ethernet/brocade/bna/cna.h b/trunk/drivers/net/ethernet/brocade/bna/cna.h index 32e8f178ab76..14ca9317c915 100644 --- a/trunk/drivers/net/ethernet/brocade/bna/cna.h +++ b/trunk/drivers/net/ethernet/brocade/bna/cna.h @@ -37,8 +37,8 @@ extern char bfa_version[]; -#define CNA_FW_FILE_CT "ctfw.bin" -#define CNA_FW_FILE_CT2 "ct2fw.bin" +#define CNA_FW_FILE_CT "ctfw-3.1.0.0.bin" +#define CNA_FW_FILE_CT2 "ct2fw-3.1.0.0.bin" #define FC_SYMNAME_MAX 256 /*!< max name server symbolic name size */ #pragma pack(1)