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

Commit 981f187b authored by David Woodhouse's avatar David Woodhouse Committed by John W. Linville
Browse files

[PATCH] libertas: first pass at fixing up endianness issues 



Signed-off-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 123e0e04

drivers/net/wireless/libertas/11d.c

+4 −5
Original line number Diff line number Diff line
@@ -570,7 +570,7 @@ int libertas_cmd_802_11d_domain_info(wlan_private * priv, 
		    cpu_to_le16(sizeof(pdomaininfo->action) + S_DS_GEN);

	}



	lbs_dbg_hex("11D:802_11D_DOMAIN_INFO:", (u8 *) cmd, (int)(cmd->size));

	lbs_dbg_hex("11D:802_11D_DOMAIN_INFO:", (u8 *) cmd, le16_to_cpu(cmd->size));



done:

	lbs_deb_enter(LBS_DEB_11D);
@@ -611,8 +611,7 @@ int libertas_cmd_enable_11d(wlan_private * priv, struct iwreq *wrq) 
int libertas_ret_802_11d_domain_info(wlan_private * priv,

				 struct cmd_ds_command *resp)

{

	struct cmd_ds_802_11d_domain_info

	*domaininfo = &resp->params.domaininforesp;

	struct cmd_ds_802_11d_domain_info *domaininfo = &resp->params.domaininforesp;

	struct mrvlietypes_domainparamset *domain = &domaininfo->domain;

	u16 action = le16_to_cpu(domaininfo->action);

	s16 ret = 0;
@@ -623,8 +622,8 @@ int libertas_ret_802_11d_domain_info(wlan_private * priv, 
	lbs_dbg_hex("11D DOMAIN Info Rsp Data:", (u8 *) resp,

		(int)le16_to_cpu(resp->size));



	nr_subband = (domain->header.len - 3) / sizeof(struct ieeetypes_subbandset);

	/* countrycode 3 bytes */

	nr_subband = (le16_to_cpu(domain->header.len) - COUNTRY_CODE_LEN) /

		      sizeof(struct ieeetypes_subbandset);



	lbs_deb_11d("11D Domain Info Resp: nr_subband=%d\n", nr_subband);

drivers/net/wireless/libertas/11d.h

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ struct mrvlietypes_domainparamset { 
} __attribute__ ((packed));



struct cmd_ds_802_11d_domain_info {

	u16 action;

	__le16 action;

	struct mrvlietypes_domainparamset domain;

} __attribute__ ((packed));

drivers/net/wireless/libertas/assoc.c

+1 −1
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ static int assoc_helper_mode(wlan_private *priv, 
				    cmd_802_11_snmp_mib,

				    0, cmd_option_waitforrsp,

				    OID_802_11_INFRASTRUCTURE_MODE,

				    (void *) (size_t) assoc_req->mode);

		/* Shoot me now */  (void *) (size_t) assoc_req->mode);



done:

	lbs_deb_leave_args(LBS_DEB_ASSOC, "ret %d", ret);

drivers/net/wireless/libertas/cmd.c

+103 −145

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/wireless/libertas/cmdresp.c

+64 −98

File changed.

Preview size limit exceeded, changes collapsed.