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

Commit b08a92bb authored by Manish Chopra's avatar Manish Chopra Committed by David S. Miller
Browse files

netxen_nic: Log proper error message in case of mismatched adapter type 



o log "Unknown" board name and "Unknown" serial number in case
  of mismatched adapter type found. This will avoid weird characters
  logs when an adapter is in bad state or corrupted.

Signed-off-by: default avatarManish Chopra <manish.chopra@qlogic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent dc7551cb

drivers/net/ethernet/qlogic/netxen/netxen_nic.h

+7 −3
Original line number Diff line number Diff line
@@ -1855,7 +1855,7 @@ static const struct netxen_brdinfo netxen_boards[] = { 


#define NUM_SUPPORTED_BOARDS ARRAY_SIZE(netxen_boards)



static inline void get_brd_name_by_type(u32 type, char *name)

static inline int netxen_nic_get_brd_name_by_type(u32 type, char *name)

{

	int i, found = 0;

	for (i = 0; i < NUM_SUPPORTED_BOARDS; ++i) {
@@ -1864,10 +1864,14 @@ static inline void get_brd_name_by_type(u32 type, char *name) 
			found = 1;

			break;

		}

	}



	if (!found) {

		strcpy(name, "Unknown");

		return -EINVAL;

	}

	if (!found)

		name = "Unknown";



	return 0;

}



static inline u32 netxen_tx_avail(struct nx_host_tx_ring *tx_ring)

drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c

+3 −1
Original line number Diff line number Diff line
@@ -841,7 +841,9 @@ netxen_check_options(struct netxen_adapter *adapter) 
	}



	if (adapter->portnum == 0) {

		get_brd_name_by_type(adapter->ahw.board_type, brd_name);

		if (netxen_nic_get_brd_name_by_type(adapter->ahw.board_type,

						    brd_name))

			strcpy(serial_num, "Unknown");



		pr_info("%s: %s Board S/N %s  Chip rev 0x%x\n",

				module_name(THIS_MODULE),