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

Commit 3ed6e080 authored by Anna Neal's avatar Anna Neal Committed by John W. Linville
Browse files

libertas: Improvements on automatic tx power control via SIOCSIWTXPOW (fixups) 



This patch addresses comments from Dan Williams about the patch
committed as "libertas: Improvements on automatic tx power control via
SIOCSIWTXPOW."

Signed-off-by: default avatarAnna Neal <anna@cozybit.com>
Signed-off-by: default avatarJavier Cardona <javier@cozybit.com>
Signed-off-by: default avatarDan Williams <dcbw@redhat.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent d88410a0

drivers/net/wireless/libertas/cmd.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1949,7 +1949,7 @@ int lbs_set_tpc_cfg(struct lbs_private *priv, int enable, int8_t p0, int8_t p1, 
	cmd.hdr.size = cpu_to_le16(sizeof(cmd));

	cmd.hdr.size = cpu_to_le16(sizeof(cmd));

	cmd.action = cpu_to_le16(CMD_ACT_SET);

	cmd.action = cpu_to_le16(CMD_ACT_SET);

	cmd.enable = !!enable;

	cmd.enable = !!enable;

	cmd.usesnr = !!enable;

	cmd.usesnr = !!usesnr;

	cmd.P0 = p0;

	cmd.P0 = p0;

	cmd.P1 = p1;

	cmd.P1 = p1;

	cmd.P2 = p2;

	cmd.P2 = p2;

drivers/net/wireless/libertas/cmd.h

+6 −0
Original line number Original line Diff line number Diff line
@@ -32,6 +32,12 @@ int lbs_set_power_adapt_cfg(struct lbs_private *priv, int enable, int8_t p0, 
int lbs_set_tpc_cfg(struct lbs_private *priv, int enable, int8_t p0, int8_t p1,

int lbs_set_tpc_cfg(struct lbs_private *priv, int enable, int8_t p0, int8_t p1,

		int8_t p2, int usesnr);

		int8_t p2, int usesnr);





int lbs_set_power_adapt_cfg(struct lbs_private *priv, int enable, int8_t p0,

		int8_t p1, int8_t p2);



int lbs_set_tpc_cfg(struct lbs_private *priv, int enable, int8_t p0, int8_t p1,

		int8_t p2, int usesnr);



int lbs_cmd_copyback(struct lbs_private *priv, unsigned long extra,

int lbs_cmd_copyback(struct lbs_private *priv, unsigned long extra,

		     struct cmd_header *resp);

		     struct cmd_header *resp);

drivers/net/wireless/libertas/defs.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -189,7 +189,6 @@ static inline void lbs_deb_hex(unsigned int grp, const char *prompt, u8 *buf, in 
#define MRVDRV_CMD_UPLD_RDY		0x0008

#define MRVDRV_CMD_UPLD_RDY		0x0008

#define MRVDRV_CARDEVENT		0x0010

#define MRVDRV_CARDEVENT		0x0010







/* Automatic TX control default levels */

/* Automatic TX control default levels */

#define POW_ADAPT_DEFAULT_P0 13

#define POW_ADAPT_DEFAULT_P0 13

#define POW_ADAPT_DEFAULT_P1 15

#define POW_ADAPT_DEFAULT_P1 15

drivers/net/wireless/libertas/wext.c

+12 −0
Original line number Original line Diff line number Diff line
@@ -1025,6 +1025,18 @@ static int lbs_set_rate(struct net_device *dev, struct iw_request_info *info, 
				new_rate);

				new_rate);

			goto out;

			goto out;

		}

		}

		if (priv->fwrelease < 0x09000000) {

			ret = lbs_set_power_adapt_cfg(priv, 0,

					POW_ADAPT_DEFAULT_P0,

					POW_ADAPT_DEFAULT_P1,

					POW_ADAPT_DEFAULT_P2);

			if (ret)

				goto out;

		}

		ret = lbs_set_tpc_cfg(priv, 0, TPC_DEFAULT_P0, TPC_DEFAULT_P1,

				TPC_DEFAULT_P2, 1);

		if (ret)

			goto out;

	}

	}





	/* Try the newer command first (Firmware Spec 5.1 and above) */

	/* Try the newer command first (Firmware Spec 5.1 and above) */