Commit 98cdfb43 authored by Jing Huang's avatar Jing Huang Committed by James Bottomley

[SCSI] bfa: fix endian and bit field check bug

Fix some endian issue. __BIGENDIAN is not defined and it needs to be
replaced with __BIG_ENDIAN. Also fixed a bug in bit field access.
These two issues were reported by Dan Carpenter.
Signed-off-by: default avatarJing Huang <huangj@brocade.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 275a63ac
...@@ -902,7 +902,7 @@ struct sfp_mem_s { ...@@ -902,7 +902,7 @@ struct sfp_mem_s {
union sfp_xcvr_e10g_code_u { union sfp_xcvr_e10g_code_u {
u8 b; u8 b;
struct { struct {
#ifdef __BIGENDIAN #ifdef __BIG_ENDIAN
u8 e10g_unall:1; /* 10G Ethernet compliance */ u8 e10g_unall:1; /* 10G Ethernet compliance */
u8 e10g_lrm:1; u8 e10g_lrm:1;
u8 e10g_lr:1; u8 e10g_lr:1;
...@@ -982,7 +982,7 @@ union sfp_xcvr_fc2_code_u { ...@@ -982,7 +982,7 @@ union sfp_xcvr_fc2_code_u {
union sfp_xcvr_fc3_code_u { union sfp_xcvr_fc3_code_u {
u8 b; u8 b;
struct { struct {
#ifdef __BIGENDIAN #ifdef __BIG_ENDIAN
u8 rsv4:1; u8 rsv4:1;
u8 mb800:1; /* 800 Mbytes/sec */ u8 mb800:1; /* 800 Mbytes/sec */
u8 mb1600:1; /* 1600 Mbytes/sec */ u8 mb1600:1; /* 1600 Mbytes/sec */
......
...@@ -3727,11 +3727,11 @@ bfa_sfp_media_get(struct bfa_sfp_s *sfp) ...@@ -3727,11 +3727,11 @@ bfa_sfp_media_get(struct bfa_sfp_s *sfp)
(xmtr_tech & SFP_XMTR_TECH_SA)) (xmtr_tech & SFP_XMTR_TECH_SA))
*media = BFA_SFP_MEDIA_SW; *media = BFA_SFP_MEDIA_SW;
/* Check 10G Ethernet Compilance code */ /* Check 10G Ethernet Compilance code */
else if (e10g.b & 0x10) else if (e10g.r.e10g_sr)
*media = BFA_SFP_MEDIA_SW; *media = BFA_SFP_MEDIA_SW;
else if (e10g.b & 0x60) else if (e10g.r.e10g_lrm && e10g.r.e10g_lr)
*media = BFA_SFP_MEDIA_LW; *media = BFA_SFP_MEDIA_LW;
else if (e10g.r.e10g_unall & 0x80) else if (e10g.r.e10g_unall)
*media = BFA_SFP_MEDIA_UNKNOWN; *media = BFA_SFP_MEDIA_UNKNOWN;
else else
bfa_trc(sfp, 0); bfa_trc(sfp, 0);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment