Commit d4bb3815 authored by Leon Romanovsky's avatar Leon Romanovsky Committed by David S. Miller
Browse files

net/liquidio: Delete non-working LIQUIDIO_PACKAGE check 



Size of LIQUIDIO_PACKAGE is 0 and it means that checks of package
version never worked, delete dead code.

Fixes: 32581245 ("liquidio: Consolidate common functionality")
Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b6334be6

drivers/net/ethernet/cavium/liquidio/liquidio_common.h

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 


#include "octeon_config.h"



#define LIQUIDIO_PACKAGE ""

#define LIQUIDIO_BASE_MAJOR_VERSION 1

#define LIQUIDIO_BASE_MINOR_VERSION 7

#define LIQUIDIO_BASE_MICRO_VERSION 2

drivers/net/ethernet/cavium/liquidio/octeon_console.c

+2 −8
Original line number Diff line number Diff line
@@ -840,17 +840,11 @@ int octeon_download_firmware(struct octeon_device *oct, const u8 *data, 
		return -EINVAL;

	}



	if (strncmp(LIQUIDIO_PACKAGE, h->version, strlen(LIQUIDIO_PACKAGE))) {

		dev_err(&oct->pci_dev->dev, "Unmatched firmware package type. Expected %s, got %s.\n",

			LIQUIDIO_PACKAGE, h->version);

		return -EINVAL;

	}



	if (memcmp(LIQUIDIO_BASE_VERSION, h->version + strlen(LIQUIDIO_PACKAGE),

	if (memcmp(LIQUIDIO_BASE_VERSION, h->version,

		   strlen(LIQUIDIO_BASE_VERSION))) {

		dev_err(&oct->pci_dev->dev, "Unmatched firmware version. Expected %s.x, got %s.\n",

			LIQUIDIO_BASE_VERSION,

			h->version + strlen(LIQUIDIO_PACKAGE));

			h->version);

		return -EINVAL;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE