bna: replace pragma(pack) with attribute __packed

[cascardo/linux.git] / drivers / net / ethernet / brocade / bna / bfa_defs_cna.h

diff --git a/drivers/net/ethernet/brocade/bna/bfa_defs_cna.h b/drivers/net/ethernet/brocade/bna/bfa_defs_cna.h
index b39c5f2..f048887 100644 (file)
--- a/drivers/net/ethernet/brocade/bna/bfa_defs_cna.h
+++ b/drivers/net/ethernet/brocade/bna/bfa_defs_cna.h
@@ -1,5 +1,5 @@
 /*
- * Linux network driver for Brocade Converged Network Adapter.
+ * Linux network driver for QLogic BR-series Converged Network Adapter.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License (GPL) Version 2 as
@@ -11,9 +11,10 @@
  * General Public License for more details.
  */
 /*
- * Copyright (c) 2005-2010 Brocade Communications Systems, Inc.
+ * Copyright (c) 2005-2014 Brocade Communications Systems, Inc.
+ * Copyright (c) 2014-2015 QLogic Corporation
  * All rights reserved
- * www.brocade.com
+ * www.qlogic.com
  */
 #ifndef __BFA_DEFS_CNA_H__
 #define __BFA_DEFS_CNA_H__
@@ -108,8 +109,6 @@ union bfa_port_stats_u {
        struct bfa_port_eth_stats eth;
 };
 
-#pragma pack(1)
-
 #define BFA_CEE_LLDP_MAX_STRING_LEN (128)
 #define BFA_CEE_DCBX_MAX_PRIORITY      (8)
 #define BFA_CEE_DCBX_MAX_PGID          (8)
@@ -132,9 +131,9 @@ struct bfa_cee_lldp_str {
        u8 len;
        u8 rsvd[2];
        u8 value[BFA_CEE_LLDP_MAX_STRING_LEN];
-};
+} __packed;
 
-/* LLDP paramters */
+/* LLDP parameters */
 struct bfa_cee_lldp_cfg {
        struct bfa_cee_lldp_str chassis_id;
        struct bfa_cee_lldp_str port_id;
@@ -144,7 +143,7 @@ struct bfa_cee_lldp_cfg {
        struct bfa_cee_lldp_str mgmt_addr;
        u16 time_to_live;
        u16 enabled_system_cap;
-};
+} __packed;
 
 enum bfa_cee_dcbx_version {
        DCBX_PROTOCOL_PRECEE    = 1,
@@ -170,7 +169,7 @@ struct bfa_cee_dcbx_cfg {
        u8 lls_fcoe; /* FCoE Logical Link Status */
        u8 lls_lan; /* LAN Logical Link Status */
        u8 rsvd[2];
-};
+} __packed;
 
 /* CEE status */
 /* Making this to tri-state for the benefit of port list command */
@@ -187,11 +186,11 @@ struct bfa_cee_attr {
        u8 error_reason;
        struct bfa_cee_lldp_cfg lldp_remote;
        struct bfa_cee_dcbx_cfg dcbx_remote;
-       mac_t src_mac;
+       u8 src_mac[ETH_ALEN];
        u8 link_speed;
        u8 nw_priority;
        u8 filler[2];
-};
+} __packed;
 
 /* LLDP/DCBX/CEE Statistics */
 struct bfa_cee_stats {
@@ -213,8 +212,6 @@ struct bfa_cee_stats {
        u32     cee_status_up;          /*!< CEE status up */
        u32     cee_hw_cfg_changed;     /*!< CEE hw cfg changed */
        u32     cee_rx_invalid_cfg;     /*!< CEE invalid cfg */
-};
-
-#pragma pack()
+} __packed;
 
 #endif /* __BFA_DEFS_CNA_H__ */