Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d6b30598 authored by Ivan Vecera's avatar Ivan Vecera Committed by David S. Miller
Browse files

bna: get rid of mac_t 



The patch converts mac_t type to widely used 'u8 [ETH_ALEN]'.

Signed-off-by: default avatarIvan Vecera <ivecera@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e2f9ecfc

drivers/net/ethernet/brocade/bna/bfa_defs.h

+2 −2
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ struct bfa_adapter_attr { 
	char		optrom_ver[BFA_VERSION_LEN];

	char		os_type[BFA_ADAPTER_OS_TYPE_LEN];

	struct bfa_mfg_vpd vpd;

	struct mac mac;

	u8		mac[ETH_ALEN];



	u8		nports;

	u8		max_speed;
@@ -211,7 +211,7 @@ struct bfa_mfg_block { 
	char	supplier_partnum[STRSZ(BFA_MFG_SUPPLIER_PARTNUM_SIZE)];

	char	supplier_serialnum[STRSZ(BFA_MFG_SUPPLIER_SERIALNUM_SIZE)];

	char	supplier_revision[STRSZ(BFA_MFG_SUPPLIER_REVISION_SIZE)];

	mac_t	mfg_mac;	/* base mac address */

	u8	mfg_mac[ETH_ALEN]; /* base mac address */

	u8	num_mac;	/* number of mac addresses */

	u8	rsv2;

	u32	card_type;	/* card type          */

drivers/net/ethernet/brocade/bna/bfa_defs_cna.h

+1 −1
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ 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];

drivers/net/ethernet/brocade/bna/bfa_ioc.c

+4 −4
Original line number Diff line number Diff line
@@ -2796,7 +2796,7 @@ bfa_ioc_get_adapter_attr(struct bfa_ioc *ioc, 
		ad_attr->prototype = 0;



	ad_attr->pwwn = bfa_ioc_get_pwwn(ioc);

	ad_attr->mac  = bfa_nw_ioc_get_mac(ioc);

	bfa_nw_ioc_get_mac(ioc, ad_attr->mac);



	ad_attr->pcie_gen = ioc_attr->pcie_gen;

	ad_attr->pcie_lanes = ioc_attr->pcie_lanes;
@@ -2942,10 +2942,10 @@ bfa_ioc_get_pwwn(struct bfa_ioc *ioc) 
	return ioc->attr->pwwn;

}



mac_t

bfa_nw_ioc_get_mac(struct bfa_ioc *ioc)

void

bfa_nw_ioc_get_mac(struct bfa_ioc *ioc, u8 *mac)

{

	return ioc->attr->mac;

	ether_addr_copy(mac, ioc->attr->mac);

}



/* Firmware failure detected. Start recovery actions. */

drivers/net/ethernet/brocade/bna/bfa_ioc.h

+1 −1
Original line number Diff line number Diff line
@@ -309,7 +309,7 @@ void bfa_nw_ioc_fwver_get(struct bfa_ioc *ioc, 
			struct bfi_ioc_image_hdr *fwhdr);

bool bfa_nw_ioc_fwver_cmp(struct bfa_ioc *ioc,

			struct bfi_ioc_image_hdr *fwhdr);

mac_t bfa_nw_ioc_get_mac(struct bfa_ioc *ioc);

void bfa_nw_ioc_get_mac(struct bfa_ioc *ioc, u8 *mac);

void bfa_nw_ioc_debug_memclaim(struct bfa_ioc *ioc, void *dbg_fwsave);

int bfa_nw_ioc_debug_fwtrc(struct bfa_ioc *ioc, void *trcdata, int *trclen);

int bfa_nw_ioc_debug_fwsave(struct bfa_ioc *ioc, void *trcdata, int *trclen);

drivers/net/ethernet/brocade/bna/bfi.h

+3 −3
Original line number Diff line number Diff line
@@ -189,14 +189,14 @@ struct bfi_ioc_getattr_req { 
struct bfi_ioc_attr {

	u64		mfg_pwwn;	/*!< Mfg port wwn	   */

	u64		mfg_nwwn;	/*!< Mfg node wwn	   */

	mac_t		mfg_mac;	/*!< Mfg mac		   */

	u8		mfg_mac[ETH_ALEN]; /*!< Mfg mac		   */

	u8		port_mode;	/* enum bfi_port_mode	   */

	u8		rsvd_a;

	u64		pwwn;

	u64		nwwn;

	mac_t		mac;		/*!< PBC or Mfg mac	   */

	u8		mac[ETH_ALEN];	/*!< PBC or Mfg mac	   */

	u16	rsvd_b;

	mac_t		fcoe_mac;

	u8		fcoe_mac[ETH_ALEN];

	u16	rsvd_c;

	char		brcd_serialnum[STRSZ(BFA_MFG_SERIALNUM_SIZE)];

	u8		pcie_gen;