From: Dan Carpenter <error27@gmail.com>
To: Jing Huang <huangj@Brocade.COM>
Cc: "James E.J. Bottomley" <JBottomley@parallels.com>,
"open list:BROCADE BFA FC SC..." <linux-scsi@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"kernel-janitors@vger.kernel.org"
<kernel-janitors@vger.kernel.org>,
Krishna Gudipati <kgudipat@Brocade.COM>
Subject: [patch 2/2 v2] [SCSI] bfa: fix some endian bugs
Date: Thu, 14 Jul 2011 12:48:59 +0300 [thread overview]
Message-ID: <20110714094859.GV18655@shale.localdomain> (raw)
In-Reply-To: <E5313AF6F2BFD14293E5FD0F94750F86A82D670214@HQ1-EXCH01.corp.brocade.com>
The initial problem that I noticed was that
"if (e10g.r.e10g_unall & 0x80)" is always false because e10g_unall
is only one bit wide.
It should be testing just "if (e10g.r.e10g_unall)" instead, but that
also has a problem on big endian systems because there was a typo
where it said __BIGENDIAN and it should have said __BIG_ENDIAN.
Also I updated the other two tests in the if else block to match as
well.
Signed-off-by: Dan Carpenter <error27@gmail.com>
diff --git a/drivers/net/bna/bfi.h b/drivers/net/bna/bfi.h
index 6050379..b2611ef 100644
--- a/drivers/net/bna/bfi.h
+++ b/drivers/net/bna/bfi.h
@@ -104,7 +104,7 @@ union bfi_addr_u {
* Scatter Gather Element
*/
struct bfi_sge {
-#ifdef __BIGENDIAN
+#ifdef __BIG_ENDIAN
u32 flags:2,
rsvd:2,
sg_len:28;
diff --git a/drivers/scsi/bfa/bfa_defs.h b/drivers/scsi/bfa/bfa_defs.h
index ed8d31b..1cefb11 100644
--- a/drivers/scsi/bfa/bfa_defs.h
+++ b/drivers/scsi/bfa/bfa_defs.h
@@ -731,7 +731,7 @@ struct sfp_mem_s {
union sfp_xcvr_e10g_code_u {
u8 b;
struct {
-#ifdef __BIGENDIAN
+#ifdef __BIG_ENDIAN
u8 e10g_unall:1; /* 10G Ethernet compliance */
u8 e10g_lrm:1;
u8 e10g_lr:1;
@@ -811,7 +811,7 @@ union sfp_xcvr_fc2_code_u {
union sfp_xcvr_fc3_code_u {
u8 b;
struct {
-#ifdef __BIGENDIAN
+#ifdef __BIG_ENDIAN
u8 rsv4:1;
u8 mb800:1; /* 800 Mbytes/sec */
u8 mb1600:1; /* 1600 Mbytes/sec */
diff --git a/drivers/scsi/bfa/bfa_ioc.c b/drivers/scsi/bfa/bfa_ioc.c
index d6c2bf3..bc678c7 100644
--- a/drivers/scsi/bfa/bfa_ioc.c
+++ b/drivers/scsi/bfa/bfa_ioc.c
@@ -3589,11 +3589,11 @@ bfa_sfp_media_get(struct bfa_sfp_s *sfp)
(xmtr_tech & SFP_XMTR_TECH_SA))
*media = BFA_SFP_MEDIA_SW;
/* Check 10G Ethernet Compilance code */
- else if (e10g.b & 0x10)
+ else if (e10g.r.e10g_sr)
*media = BFA_SFP_MEDIA_SW;
- else if (e10g.b & 0x60)
+ else if (e10g.r.e10g_lr && e10g.r.e10g_lrm)
*media = BFA_SFP_MEDIA_LW;
- else if (e10g.r.e10g_unall & 0x80)
+ else if (e10g.r.e10g_unall)
*media = BFA_SFP_MEDIA_UNKNOWN;
else
bfa_trc(sfp, 0);
prev parent reply other threads:[~2011-07-14 9:50 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-06 7:40 [patch 2/2] [SCSI] bfa: test is always false in bfa_sfp_media_get() Dan Carpenter
2011-07-12 6:54 ` Jing Huang
2011-07-14 9:48 ` Dan Carpenter [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110714094859.GV18655@shale.localdomain \
--to=error27@gmail.com \
--cc=JBottomley@parallels.com \
--cc=huangj@Brocade.COM \
--cc=kernel-janitors@vger.kernel.org \
--cc=kgudipat@Brocade.COM \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®