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

Commit 58735567 authored by Dhananjay Phadke's avatar Dhananjay Phadke Committed by Jeff Garzik
Browse files

netxen: update driver version 



Change driver version to 4.0.0. Netxen firmwares as old as
v3.4.216 are supported.

Signed-off-by: default avatarDhananjay Phadke <dhananjay@netxen.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent cd1f8160

drivers/net/netxen/netxen_nic.h

+6 −4
Original line number Diff line number Diff line
@@ -63,10 +63,12 @@ 


#include "netxen_nic_hw.h"



#define _NETXEN_NIC_LINUX_MAJOR 3

#define _NETXEN_NIC_LINUX_MINOR 4

#define _NETXEN_NIC_LINUX_SUBVERSION 18

#define NETXEN_NIC_LINUX_VERSIONID  "3.4.18"

#define _NETXEN_NIC_LINUX_MAJOR 4

#define _NETXEN_NIC_LINUX_MINOR 0

#define _NETXEN_NIC_LINUX_SUBVERSION 0

#define NETXEN_NIC_LINUX_VERSIONID  "4.0.0"



#define NETXEN_VERSION_CODE(a, b, c)	(((a) << 16) + ((b) << 8) + (c))



#define NETXEN_NUM_FLASH_SECTORS (64)

#define NETXEN_FLASH_SECTOR_SIZE (64 * 1024)

drivers/net/netxen/netxen_nic_hw.c

+5 −9
Original line number Diff line number Diff line
@@ -2168,16 +2168,12 @@ void netxen_nic_flash_print(struct netxen_adapter *adapter) 
				fw_minor, fw_build);

	}



	if (fw_major != _NETXEN_NIC_LINUX_MAJOR) {

	if (NETXEN_VERSION_CODE(fw_major, fw_minor, fw_build) <

			NETXEN_VERSION_CODE(3, 4, 216)) {

		adapter->driver_mismatch = 1;

	}

	if (fw_minor != _NETXEN_NIC_LINUX_MINOR &&

			fw_minor != (_NETXEN_NIC_LINUX_MINOR + 1)) {

		adapter->driver_mismatch = 1;

	}

	if (adapter->driver_mismatch) {

		printk(KERN_ERR "%s: driver and firmware version mismatch\n",

				adapter->netdev->name);

		printk(KERN_ERR "%s: firmware version %d.%d.%d unsupported\n",

				netxen_nic_driver_name,

				fw_major, fw_minor, fw_build);

		return;

	}

}