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

Commit f5e2289a authored by Christian Lamparter's avatar Christian Lamparter Committed by John W. Linville
Browse files

carl9170: import updated firmware headers 

Import new headers from our firmware branch:
git://git.kernel.org/pub/scm/linux/kernel/git/chr/carl9170fw.git



Signed-off-by: default avatarChristian Lamparter <chunkeey@googlemail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 7ccc83b0

drivers/net/wireless/ath/carl9170/fwcmd.h

+11 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ enum carl9170_cmd_oids { 
	CARL9170_CMD_READ_TSF		= 0x06,

	CARL9170_CMD_RX_FILTER		= 0x07,

	CARL9170_CMD_WOL		= 0x08,

	CARL9170_CMD_TALLY		= 0x09,



	/* CAM */

	CARL9170_CMD_EKEY		= 0x10,
@@ -286,6 +287,15 @@ struct carl9170_tsf_rsp { 
} __packed;

#define CARL9170_TSF_RSP_SIZE		8



struct carl9170_tally_rsp {

	__le32 active;

	__le32 cca;

	__le32 tx_time;

	__le32 rx_total;

	__le32 rx_overrun;

	__le32 tick;

} __packed;



struct carl9170_rsp {

	struct carl9170_cmd_head hdr;
@@ -300,6 +310,7 @@ struct carl9170_rsp { 
		struct carl9170_gpio		gpio;

		struct carl9170_tsf_rsp		tsf;

		struct carl9170_psm		psm;

		struct carl9170_tally_rsp	tally;

		u8 data[CARL9170_MAX_CMD_PAYLOAD_LEN];

	} __packed;

} __packed __aligned(4);

drivers/net/wireless/ath/carl9170/version.h

+2 −2
Original line number Diff line number Diff line 
#ifndef __CARL9170_SHARED_VERSION_H

#define __CARL9170_SHARED_VERSION_H

#define CARL9170FW_VERSION_YEAR 11

#define CARL9170FW_VERSION_MONTH 6

#define CARL9170FW_VERSION_DAY 30

#define CARL9170FW_VERSION_MONTH 8

#define CARL9170FW_VERSION_DAY 15

#define CARL9170FW_VERSION_GIT "1.9.4"

#endif /* __CARL9170_SHARED_VERSION_H */