Staging: Merge staging-next into Linus's tree

[sfrench/cifs-2.6.git] / drivers / scsi / bfa / include / defs / bfa_defs_fcport.h

diff --git a/drivers/scsi/bfa/include/defs/bfa_defs_fcport.h b/drivers/scsi/bfa/include/defs/bfa_defs_fcport.h
index a07ef4a3cd789f7ae37980825359e1c5778aa5bc..af86a6396439baa217b8978301ae9646c2ec2bc5 100644 (file)
--- a/drivers/scsi/bfa/include/defs/bfa_defs_fcport.h
+++ b/drivers/scsi/bfa/include/defs/bfa_defs_fcport.h
@@ -48,7 +48,7 @@ struct bfa_fcoe_stats_s {
        u64     disc_fcf_unavail; /*  Discovery FCF not avail        */
        u64     linksvc_unsupp; /*  FIP link service req unsupp.    */
        u64     linksvc_err;    /*  FIP link service req errors     */
-       u64     logo_req;       /*  FIP logo                         */
+       u64     logo_req;       /*  FIP logos received                       */
        u64     clrvlink_req;   /*  Clear virtual link requests     */
        u64     op_unsupp;      /*  FIP operation unsupp.            */
        u64     untagged;       /*  FIP untagged frames      */
@@ -64,21 +64,15 @@ struct bfa_fcoe_stats_s {
        u64     txf_timeout;    /*  Tx timeouts              */
        u64     txf_parity_errors; /*  Transmit parity err           */
        u64     txf_fid_parity_errors; /*  Transmit FID parity err  */
-       u64     tx_pause;       /*  Tx pause frames                  */
-       u64     tx_zero_pause;  /*  Tx zero pause frames             */
-       u64     tx_first_pause; /*  Tx first pause frames            */
-       u64     rx_pause;       /*  Rx pause frames                  */
-       u64     rx_zero_pause;  /*  Rx zero pause frames             */
-       u64     rx_first_pause; /*  Rx first pause frames            */
-       u64     rxf_ucast_octets; /*  Rx unicast octets      */
-       u64     rxf_ucast;      /*  Rx unicast frames                */
-       u64     rxf_ucast_vlan; /*  Rx unicast vlan frames           */
-       u64     rxf_mcast_octets; /*  Rx multicast octets            */
-       u64     rxf_mcast;      /*  Rx multicast frames      */
-       u64     rxf_mcast_vlan; /*  Rx multicast vlan frames         */
-       u64     rxf_bcast_octets; /*  Rx broadcast octests           */
-       u64     rxf_bcast;      /*  Rx broadcast frames      */
-       u64     rxf_bcast_vlan; /*  Rx broadcast vlan frames         */
+       u64     rxf_ucast_octets; /* Rx FCoE unicast octets        */
+       u64     rxf_ucast;      /* Rx FCoE unicast frames          */
+       u64     rxf_ucast_vlan; /* Rx FCoE unicast vlan frames     */
+       u64     rxf_mcast_octets; /* Rx FCoE multicast octets      */
+       u64     rxf_mcast;      /* Rx FCoE multicast frames        */
+       u64     rxf_mcast_vlan; /* Rx FCoE multicast vlan frames   */
+       u64     rxf_bcast_octets; /* Rx FCoE broadcast octets      */
+       u64     rxf_bcast;      /* Rx FCoE broadcast frames        */
+       u64     rxf_bcast_vlan; /* Rx FCoE broadcast vlan frames   */
 };
 
 /**