Commit f4f57943 authored by Eliad Peller's avatar Eliad Peller Committed by Luciano Coelho
Browse files

wl12xx: add TX_HW_ATTR_HOST_ENCRYPT flag 



In WEP shared authentication, we encrypt the auth frame
in the host, and we want the fw to pass it as-is.
Use the TX_HW_ATTR_HOST_ENCRYPT flag in order to indicate
it to the fw.

Signed-off-by: default avatarEliad Peller <eliad@wizery.com>
Signed-off-by: default avatarLuciano Coelho <coelho@ti.com>
parent defe02c7

drivers/net/wireless/wl12xx/tx.c

+13 −4
Original line number Diff line number Diff line
@@ -255,16 +255,20 @@ static void wl1271_tx_fill_hdr(struct wl1271 *wl, struct wl12xx_vif *wlvif, 
	int aligned_len, ac, rate_idx;

	s64 hosttime;

	u16 tx_attr = 0;

	__le16 frame_control;

	struct ieee80211_hdr *hdr;

	u8 *frame_start;

	bool is_dummy;



	desc = (struct wl1271_tx_hw_descr *) skb->data;

	frame_start = (u8 *)(desc + 1);

	hdr = (struct ieee80211_hdr *)(frame_start + extra);

	frame_control = hdr->frame_control;



	/* relocate space for security header */

	if (extra) {

		void *framestart = skb->data + sizeof(*desc);

		u16 fc = *(u16 *)(framestart + extra);

		int hdrlen = ieee80211_hdrlen(cpu_to_le16(fc));

		memmove(framestart, framestart + extra, hdrlen);

		int hdrlen = ieee80211_hdrlen(frame_control);

		memmove(frame_start, hdr, hdrlen);

	}



	/* configure packet life time */
@@ -353,6 +357,11 @@ static void wl1271_tx_fill_hdr(struct wl1271 *wl, struct wl12xx_vif *wlvif, 
			     desc->wl127x_mem.total_mem_blocks);

	}



	/* for WEP shared auth - no fw encryption is needed */

	if (ieee80211_is_auth(frame_control) &&

	    ieee80211_has_protected(frame_control))

		tx_attr |= TX_HW_ATTR_HOST_ENCRYPT;



	desc->tx_attr = cpu_to_le16(tx_attr);

}

drivers/net/wireless/wl12xx/tx.h

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
#define TX_HW_ATTR_LAST_WORD_PAD         (BIT(10) | BIT(11))

#define TX_HW_ATTR_TX_CMPLT_REQ          BIT(12)

#define TX_HW_ATTR_TX_DUMMY_REQ          BIT(13)

#define TX_HW_ATTR_HOST_ENCRYPT          BIT(14)



#define TX_HW_ATTR_OFST_SAVE_RETRIES     0

#define TX_HW_ATTR_OFST_HEADER_PAD       1

CRA Git | Maintained and supported by SUSTech CRA and CCSE