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

Commit 5dc36387 authored by Prameela Rani Garnepudi's avatar Prameela Rani Garnepudi Committed by Kalle Valo
Browse files

rsi: move xtend_desc structure from rsi_main.h to rsi_mgmt.h 



All descriptor structures are in rsi_mgmt.h except this
extended descriptor structure. Hence moving it to rsi_mgmt.h
and also renaming to rsi_xtend_desc.

Signed-off-by: default avatarPrameela Rani Garnepudi <prameela.j04cs@gmail.com>
Signed-off-by: default avatarAmitkumar Karwar <amit.karwar@redpinesignals.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 0fb1abc3

drivers/net/wireless/rsi/rsi_91x_hal.c

+6 −6
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ static int rsi_prepare_mgmt_desc(struct rsi_common *common, struct sk_buff *skb) 
	struct rsi_mgmt_desc *mgmt_desc;

	struct skb_info *tx_params;

	struct ieee80211_bss_conf *bss = NULL;

	struct xtended_desc *xtend_desc = NULL;

	struct rsi_xtended_desc *xtend_desc = NULL;

	u8 header_size;

	u32 dword_align_bytes = 0;
@@ -69,7 +69,7 @@ static int rsi_prepare_mgmt_desc(struct rsi_common *common, struct sk_buff *skb) 
	vif = tx_params->vif;



	/* Update header size */

	header_size = FRAME_DESC_SZ + sizeof(struct xtended_desc);

	header_size = FRAME_DESC_SZ + sizeof(struct rsi_xtended_desc);

	if (header_size > skb_headroom(skb)) {

		rsi_dbg(ERR_ZONE,

			"%s: Failed to add extended descriptor\n",
@@ -92,7 +92,7 @@ static int rsi_prepare_mgmt_desc(struct rsi_common *common, struct sk_buff *skb) 
	wh = (struct ieee80211_hdr *)&skb->data[header_size];



	mgmt_desc = (struct rsi_mgmt_desc *)skb->data;

	xtend_desc = (struct xtended_desc *)&skb->data[FRAME_DESC_SZ];

	xtend_desc = (struct rsi_xtended_desc *)&skb->data[FRAME_DESC_SZ];



	rsi_set_len_qno(&mgmt_desc->len_qno, (skb->len - FRAME_DESC_SZ),

			RSI_WIFI_MGMT_Q);
@@ -158,7 +158,7 @@ static int rsi_prepare_data_desc(struct rsi_common *common, struct sk_buff *skb) 
	struct skb_info *tx_params;

	struct ieee80211_bss_conf *bss;

	struct rsi_data_desc *data_desc;

	struct xtended_desc *xtend_desc;

	struct rsi_xtended_desc *xtend_desc;

	u8 ieee80211_size = MIN_802_11_HDR_LEN;

	u8 header_size;

	u8 vap_id = 0;
@@ -170,7 +170,7 @@ static int rsi_prepare_data_desc(struct rsi_common *common, struct sk_buff *skb) 
	bss = &vif->bss_conf;

	tx_params = (struct skb_info *)info->driver_data;



	header_size = FRAME_DESC_SZ + sizeof(struct xtended_desc);

	header_size = FRAME_DESC_SZ + sizeof(struct rsi_xtended_desc);

	if (header_size > skb_headroom(skb)) {

		rsi_dbg(ERR_ZONE, "%s: Unable to send pkt\n", __func__);

		return -ENOSPC;
@@ -188,7 +188,7 @@ static int rsi_prepare_data_desc(struct rsi_common *common, struct sk_buff *skb) 
	data_desc = (struct rsi_data_desc *)skb->data;

	memset(data_desc, 0, header_size);



	xtend_desc = (struct xtended_desc *)&skb->data[FRAME_DESC_SZ];

	xtend_desc = (struct rsi_xtended_desc *)&skb->data[FRAME_DESC_SZ];

	wh = (struct ieee80211_hdr *)&skb->data[header_size];

	seq_num = IEEE80211_SEQ_TO_SN(le16_to_cpu(wh->seq_ctrl));

drivers/net/wireless/rsi/rsi_main.h

+0 −6
Original line number Diff line number Diff line
@@ -190,12 +190,6 @@ struct cqm_info { 
	u32 rssi_hyst;

};



struct xtended_desc {

	u8 confirm_frame_type;

	u8 retry_cnt;

	u16 reserved;

};



enum rsi_dfs_regions {

	RSI_REGION_FCC = 0,

	RSI_REGION_ETSI,

drivers/net/wireless/rsi/rsi_mgmt.h

+6 −0
Original line number Diff line number Diff line
@@ -301,6 +301,12 @@ struct rsi_mac_frame { 
#define ENCAP_MGMT_PKT			BIT(7)

#define DESC_IMMEDIATE_WAKEUP		BIT(15)



struct rsi_xtended_desc {

	u8 confirm_frame_type;

	u8 retry_cnt;

	u16 reserved;

};



struct rsi_cmd_desc_dword0 {

	__le16 len_qno;

	u8 frame_type;