diff options
author | Chris Metcalf <cmetcalf@tilera.com> | 2010-08-06 10:37:02 -0400 |
---|---|---|
committer | Chris Metcalf <cmetcalf@tilera.com> | 2010-08-06 10:37:02 -0400 |
commit | ab11b487402f97975f3ac1eeea09c82f4431481e (patch) | |
tree | 86337c5cbbd2b0c4bd07c0847a1dc7de3d898147 /drivers/scsi/bfa/include/defs/bfa_defs_auth.h | |
parent | arch/tile: check kmalloc() result (diff) | |
parent | Merge branch 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 (diff) | |
download | linux-dev-ab11b487402f97975f3ac1eeea09c82f4431481e.tar.xz linux-dev-ab11b487402f97975f3ac1eeea09c82f4431481e.zip |
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/scsi/bfa/include/defs/bfa_defs_auth.h')
-rw-r--r-- | drivers/scsi/bfa/include/defs/bfa_defs_auth.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/bfa/include/defs/bfa_defs_auth.h b/drivers/scsi/bfa/include/defs/bfa_defs_auth.h index 45df32820911..f56ed871bb99 100644 --- a/drivers/scsi/bfa/include/defs/bfa_defs_auth.h +++ b/drivers/scsi/bfa/include/defs/bfa_defs_auth.h @@ -125,10 +125,10 @@ struct bfa_auth_attr_s { enum bfa_auth_status status; enum bfa_auth_algo algo; enum bfa_auth_group dh_grp; - u16 rjt_code; - u16 rjt_code_exp; + enum bfa_auth_rej_code rjt_code; + enum bfa_auth_rej_code_exp rjt_code_exp; u8 secret_set; - u8 resv[7]; + u8 resv[3]; }; #endif /* __BFA_DEFS_AUTH_H__ */ |