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

Commit 7a55724e authored by Juuso Oikarinen's avatar Juuso Oikarinen Committed by Luciano Coelho
Browse files

wl1271: Add support for hardware GEM cipher 



This patch adds support for the hardware GEM cipher suite.

Signed-off-by: default avatarJuuso Oikarinen <juuso.oikarinen@nokia.com>
Reviewed-by: default avatarLuciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: default avatarLuciano Coelho <luciano.coelho@nokia.com>
parent 8eab7b47

drivers/net/wireless/wl12xx/wl1271.h

+2 −0
Original line number Diff line number Diff line
@@ -117,6 +117,8 @@ enum { 
#define WL1271_TX_SECURITY_LO16(s) ((u16)((s) & 0xffff))

#define WL1271_TX_SECURITY_HI32(s) ((u32)(((s) >> 16) & 0xffffffff))



#define WL1271_CIPHER_SUITE_GEM 0x00147201



#define WL1271_BUSY_WORD_CNT 1

#define WL1271_BUSY_WORD_LEN (WL1271_BUSY_WORD_CNT * sizeof(u32))

drivers/net/wireless/wl12xx/wl1271_cmd.h

+1 −1
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ enum wl1271_cmd_key_type { 
	KEY_WEP  = 1,

	KEY_TKIP = 2,

	KEY_AES  = 3,

	KEY_GEM  = 4

	KEY_GEM  = 4,

};



/* FIXME: Add description for key-types */

drivers/net/wireless/wl12xx/wl1271_main.c

+16 −0
Original line number Diff line number Diff line
@@ -1549,6 +1549,11 @@ static int wl1271_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, 
		tx_seq_32 = WL1271_TX_SECURITY_HI32(wl->tx_security_seq);

		tx_seq_16 = WL1271_TX_SECURITY_LO16(wl->tx_security_seq);

		break;

	case WL1271_CIPHER_SUITE_GEM:

		key_type = KEY_GEM;

		tx_seq_32 = WL1271_TX_SECURITY_HI32(wl->tx_security_seq);

		tx_seq_16 = WL1271_TX_SECURITY_LO16(wl->tx_security_seq);

		break;

	default:

		wl1271_error("Unknown key algo 0x%x", key_conf->cipher);
@@ -2403,6 +2408,14 @@ EXPORT_SYMBOL_GPL(wl1271_unregister_hw); 


int wl1271_init_ieee80211(struct wl1271 *wl)

{

	static const u32 cipher_suites[] = {

		WLAN_CIPHER_SUITE_WEP40,

		WLAN_CIPHER_SUITE_WEP104,

		WLAN_CIPHER_SUITE_TKIP,

		WLAN_CIPHER_SUITE_CCMP,

		WL1271_CIPHER_SUITE_GEM,

	};



	/* The tx descriptor buffer and the TKIP space. */

	wl->hw->extra_tx_headroom = WL1271_TKIP_IV_SPACE +

		sizeof(struct wl1271_tx_hw_descr);
@@ -2420,6 +2433,9 @@ int wl1271_init_ieee80211(struct wl1271 *wl) 
		IEEE80211_HW_CONNECTION_MONITOR |

		IEEE80211_HW_SUPPORTS_CQM_RSSI;



	wl->hw->wiphy->cipher_suites = cipher_suites;

	wl->hw->wiphy->n_cipher_suites = ARRAY_SIZE(cipher_suites);



	wl->hw->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) |

		BIT(NL80211_IFTYPE_ADHOC);

	wl->hw->wiphy->max_scan_ssids = 1;