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

Commit 5ee1c326 authored by Bastian Blank's avatar Bastian Blank Committed by David S. Miller
Browse files

bnx2: Don't use reserved names 



The mips identifier is reserved by gcc on mips plattforms. Don't use it
in the code.

Signed-off-by: default avatarBastian Blank <waldi@debian.org>
Tested-by: default avatarMartin Michlmayr <tbm@cyrius.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fb922b0d

drivers/net/bnx2.c

+13 −13
Original line number Diff line number Diff line
@@ -3427,8 +3427,8 @@ static int __devinit 
bnx2_request_firmware(struct bnx2 *bp)

{

	const char *mips_fw_file, *rv2p_fw_file;

	const struct bnx2_mips_fw_file *mips;

	const struct bnx2_rv2p_fw_file *rv2p;

	const struct bnx2_mips_fw_file *mips_fw;

	const struct bnx2_rv2p_fw_file *rv2p_fw;

	int rc;



	if (CHIP_NUM(bp) == CHIP_NUM_5709) {
@@ -3452,21 +3452,21 @@ bnx2_request_firmware(struct bnx2 *bp) 
		       rv2p_fw_file);

		return rc;

	}

	mips = (const struct bnx2_mips_fw_file *) bp->mips_firmware->data;

	rv2p = (const struct bnx2_rv2p_fw_file *) bp->rv2p_firmware->data;

	if (bp->mips_firmware->size < sizeof(*mips) ||

	    check_mips_fw_entry(bp->mips_firmware, &mips->com) ||

	    check_mips_fw_entry(bp->mips_firmware, &mips->cp) ||

	    check_mips_fw_entry(bp->mips_firmware, &mips->rxp) ||

	    check_mips_fw_entry(bp->mips_firmware, &mips->tpat) ||

	    check_mips_fw_entry(bp->mips_firmware, &mips->txp)) {

	mips_fw = (const struct bnx2_mips_fw_file *) bp->mips_firmware->data;

	rv2p_fw = (const struct bnx2_rv2p_fw_file *) bp->rv2p_firmware->data;

	if (bp->mips_firmware->size < sizeof(*mips_fw) ||

	    check_mips_fw_entry(bp->mips_firmware, &mips_fw->com) ||

	    check_mips_fw_entry(bp->mips_firmware, &mips_fw->cp) ||

	    check_mips_fw_entry(bp->mips_firmware, &mips_fw->rxp) ||

	    check_mips_fw_entry(bp->mips_firmware, &mips_fw->tpat) ||

	    check_mips_fw_entry(bp->mips_firmware, &mips_fw->txp)) {

		printk(KERN_ERR PFX "Firmware file \"%s\" is invalid\n",

		       mips_fw_file);

		return -EINVAL;

	}

	if (bp->rv2p_firmware->size < sizeof(*rv2p) ||

	    check_fw_section(bp->rv2p_firmware, &rv2p->proc1.rv2p, 8, true) ||

	    check_fw_section(bp->rv2p_firmware, &rv2p->proc2.rv2p, 8, true)) {

	if (bp->rv2p_firmware->size < sizeof(*rv2p_fw) ||

	    check_fw_section(bp->rv2p_firmware, &rv2p_fw->proc1.rv2p, 8, true) ||

	    check_fw_section(bp->rv2p_firmware, &rv2p_fw->proc2.rv2p, 8, true)) {

		printk(KERN_ERR PFX "Firmware file \"%s\" is invalid\n",

		       rv2p_fw_file);

		return -EINVAL;