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

Commit c1e5f471 authored by Johannes Berg's avatar Johannes Berg
Browse files

cfg80211: constify more pointers in the cfg80211 API 



This also propagates through the drivers.

The orinoco driver uses the cfg80211 API structs for internal
bookkeeping, and so needs a (void *) cast that removes the
const - but that's OK because it allocates those pointers.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 3b3a0162

drivers/net/wireless/ath/ath6kl/wmi.c

+1 −1
Original line number Diff line number Diff line
@@ -2322,7 +2322,7 @@ int ath6kl_wmi_addkey_cmd(struct wmi *wmi, u8 if_idx, u8 key_index, 
	return ret;

}



int ath6kl_wmi_add_krk_cmd(struct wmi *wmi, u8 if_idx, u8 *krk)

int ath6kl_wmi_add_krk_cmd(struct wmi *wmi, u8 if_idx, const u8 *krk)

{

	struct sk_buff *skb;

	struct wmi_add_krk_cmd *cmd;

drivers/net/wireless/ath/ath6kl/wmi.h

+1 −1
Original line number Diff line number Diff line
@@ -2617,7 +2617,7 @@ int ath6kl_wmi_addkey_cmd(struct wmi *wmi, u8 if_idx, u8 key_index, 
			  u8 *key_material,

			  u8 key_op_ctrl, u8 *mac_addr,

			  enum wmi_sync_flag sync_flag);

int ath6kl_wmi_add_krk_cmd(struct wmi *wmi, u8 if_idx, u8 *krk);

int ath6kl_wmi_add_krk_cmd(struct wmi *wmi, u8 if_idx, const u8 *krk);

int ath6kl_wmi_deletekey_cmd(struct wmi *wmi, u8 if_idx, u8 key_index);

int ath6kl_wmi_setpmkid_cmd(struct wmi *wmi, u8 if_idx, const u8 *bssid,

			    const u8 *pmkid, bool set);

drivers/net/wireless/libertas/cfg.c

+2 −3
Original line number Diff line number Diff line
@@ -1006,9 +1006,8 @@ struct cmd_key_material { 
} __packed;



static int lbs_set_key_material(struct lbs_private *priv,

				int key_type,

				int key_info,

				u8 *key, u16 key_len)

				int key_type, int key_info,

				const u8 *key, u16 key_len)

{

	struct cmd_key_material cmd;

	int ret;

drivers/net/wireless/libertas/defs.h

+2 −1
Original line number Diff line number Diff line
@@ -90,7 +90,8 @@ do { if ((lbs_debug & (grp)) == (grp)) \ 
#define lbs_deb_cfg80211(fmt, args...)  LBS_DEB_LL(LBS_DEB_CFG80211, " cfg80211", fmt, ##args)



#ifdef DEBUG

static inline void lbs_deb_hex(unsigned int grp, const char *prompt, u8 *buf, int len)

static inline void lbs_deb_hex(unsigned int grp, const char *prompt,

			       const u8 *buf, int len)

{

	int i = 0;

drivers/net/wireless/orinoco/hw.c

+2 −2
Original line number Diff line number Diff line
@@ -988,8 +988,8 @@ int __orinoco_hw_setup_enc(struct orinoco_private *priv) 
 * tsc must be NULL or up to 8 bytes

 */

int __orinoco_hw_set_tkip_key(struct orinoco_private *priv, int key_idx,

			      int set_tx, u8 *key, u8 *rsc, size_t rsc_len,

			      u8 *tsc, size_t tsc_len)

			      int set_tx, const u8 *key, const u8 *rsc,

			      size_t rsc_len, const u8 *tsc, size_t tsc_len)

{

	struct {

		__le16 idx;