Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / scsi / bfa / bfa_defs_svc.h

diff --git a/drivers/scsi/bfa/bfa_defs_svc.h b/drivers/scsi/bfa/bfa_defs_svc.h
index e24e9f7ca81ff0b68f0b6ea2383f374a73d47165..648c84176722ce108d556ffc4efd4c883ee16b34 100644 (file)
--- a/drivers/scsi/bfa/bfa_defs_svc.h
+++ b/drivers/scsi/bfa/bfa_defs_svc.h
@@ -34,8 +34,8 @@
 struct bfa_iocfc_intr_attr_s {
        u8              coalesce;       /*  enable/disable coalescing */
        u8              rsvd[3];
-       u16     latency;        /*  latency in microseconds   */
-       u16     delay;          /*  delay in microseconds     */
+       __be16  latency;        /*  latency in microseconds   */
+       __be16  delay;          /*  delay in microseconds     */
 };
 
 /*
@@ -743,7 +743,7 @@ struct bfa_port_cfg_s {
        u8       qos_enabled;   /*  qos enabled or not          */
        u8       cfg_hardalpa;  /*  is hard alpa configured     */
        u8       hardalpa;      /*  configured hard alpa        */
-       u16 maxfrsize;  /*  maximum frame size          */
+       __be16   maxfrsize;     /*  maximum frame size          */
        u8       rx_bbcredit;   /*  receive buffer credits      */
        u8       tx_bbcredit;   /*  transmit buffer credits     */
        u8       ratelimit;     /*  ratelimit enabled or not    */
@@ -843,7 +843,7 @@ struct bfa_fcport_fcf_s {
        u8       fka_disabled;   /*  FKA is disabled      */
        u8       maxsz_verified; /*  FCoE max size verified   */
        u8       fc_map[3];      /*  FC map                */
-       u16     vlan;      /*  FCoE vlan tag/priority   */
+       __be16   vlan;     /*  FCoE vlan tag/priority   */
        u32     fka_adv_per;    /*  FIP  ka advert. period   */
        mac_t      mac;     /*  FCF mac           */
 };