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

Commit c47884e4 authored by Manish chopra's avatar Manish chopra Committed by David S. Miller
Browse files

qlcnic: Fix API unlock 



Log dump status.
Remove unmatched qlcnic_api_unlock call.
Update version to 5.0.26.

Signed-off-by: default avatarManish Chopra <manish.chopra@qlogic.com>
Signed-off-by: default avatarSony Chacko <sony.chacko@qlogic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 97048a1f

drivers/net/ethernet/qlogic/qlcnic/qlcnic.h

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
#define _QLCNIC_LINUX_MAJOR 5

#define _QLCNIC_LINUX_MINOR 0

#define _QLCNIC_LINUX_SUBVERSION 25

#define QLCNIC_LINUX_VERSIONID  "5.0.25"

#define QLCNIC_LINUX_VERSIONID  "5.0.26"

#define QLCNIC_DRV_IDC_VER  0x01

#define QLCNIC_DRIVER_VERSION  ((_QLCNIC_LINUX_MAJOR << 16) |\

		 (_QLCNIC_LINUX_MINOR << 8) | (_QLCNIC_LINUX_SUBVERSION))

drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c

+2 −3
Original line number Diff line number Diff line
@@ -1152,7 +1152,6 @@ qlcnic_get_dump_data(struct net_device *netdev, struct ethtool_dump *dump, 


	if (!fw_dump->clr) {

		netdev_info(netdev, "Dump not available\n");

		qlcnic_api_unlock(adapter);

		return -EINVAL;

	}

	/* Copy template header first */
@@ -1171,7 +1170,7 @@ qlcnic_get_dump_data(struct net_device *netdev, struct ethtool_dump *dump, 
	vfree(fw_dump->data);

	fw_dump->data = NULL;

	fw_dump->clr = 0;



	netdev_info(netdev, "extracted the FW dump Successfully\n");

	return 0;

}
@@ -1189,7 +1188,7 @@ qlcnic_set_dump(struct net_device *netdev, struct ethtool_dump *val) 
			return ret;

		}

		if (fw_dump->clr) {

			dev_info(&adapter->pdev->dev,

			netdev_info(netdev,

			"Previous dump not cleared, not forcing dump\n");

			return ret;

		}