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

Commit 4f3465f8 authored by Dan Williams's avatar Dan Williams Committed by John W. Linville
Browse files

[PATCH] libertas: remove SUPPORT_BOOT_COMMAND 



Remove the static definition of SUPPORT_BOOT_COMMAND.

Signed-off-by: default avatarHolger Schurig <hs4233@mail.mn-solutions.de>
Acked-by: default avatarDan Williams <dcbw@redhat.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 4b19fcc3

drivers/net/wireless/libertas/Makefile

+1 −2
Original line number Original line Diff line number Diff line
@@ -12,8 +12,7 @@ EXTRA_CFLAGS += -DDEBUG -DPROC_DEBUG 
endif

endif









# This is needed to support the newer boot2 bootloader (v >= 3104)

#EXTRA_CFLAGS +=

EXTRA_CFLAGS += -DSUPPORT_BOOT_COMMAND

usb8xxx-objs += if_bootcmd.o

usb8xxx-objs += if_bootcmd.o

usb8xxx-objs += if_usb.o

usb8xxx-objs += if_usb.o

drivers/net/wireless/libertas/if_usb.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -775,7 +775,6 @@ int libertas_sbi_prog_firmware(wlan_private * priv) 
		return -1;

		return -1;

	}

	}





#ifdef SUPPORT_BOOT_COMMAND

	cardp->bootcmdresp = 0;

	cardp->bootcmdresp = 0;

	do {

	do {

		int j = 0;

		int j = 0;
@@ -796,7 +795,6 @@ int libertas_sbi_prog_firmware(wlan_private * priv) 
		}

		}

		return -1;

		return -1;

	}

	}

#endif





	i = 0;

	i = 0;

	priv->adapter->fw_ready = 0;

	priv->adapter->fw_ready = 0;

drivers/net/wireless/libertas/if_usb.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -12,7 +12,6 @@ 
#define USB8388_VID_2	0x05a3

#define USB8388_VID_2	0x05a3

#define USB8388_PID_2	0x8388

#define USB8388_PID_2	0x8388





#ifdef SUPPORT_BOOT_COMMAND

#define BOOT_CMD_FW_BY_USB     0x01

#define BOOT_CMD_FW_BY_USB     0x01

#define BOOT_CMD_FW_IN_EEPROM  0x02

#define BOOT_CMD_FW_IN_EEPROM  0x02

#define BOOT_CMD_UPDATE_BOOT2  0x03

#define BOOT_CMD_UPDATE_BOOT2  0x03
@@ -36,7 +35,6 @@ struct bootcmdrespStr 
	u8  u8result;

	u8  u8result;

	u8  au8dumy[2];

	u8  au8dumy[2];

};

};

#endif /* SUPPORT_BOOT_COMMAND */





/* read callback private data */

/* read callback private data */

struct read_cb_info {

struct read_cb_info {