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

Commit e37b6741 authored Sep 02, 2012 by Christian Lamparter Committed by John W. Linville Sep 24, 2012

carl9170: connect to 11w protected networks



Previously, it was not possible to connect to
networks which requires 11w to be supported by
the stations.

While the documentation hints that there's some
hardware support for offloading MFP "decryption",
this simple implementation relies on the mac80211
stack to do the actual crypto operations.

Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent 960334a7

drivers/net/wireless/ath/carl9170/mac.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -304,7 +304,8 @@ int carl9170_set_operating_mode(struct ar9170 *ar)
		struct ath_common *common = &ar->common;
		u8 mac_addr, bssid;
		u32 cam_mode = AR9170_MAC_CAM_DEFAULTS;
		u32 enc_mode = AR9170_MAC_ENCRYPTION_DEFAULTS;
		u32 enc_mode = AR9170_MAC_ENCRYPTION_DEFAULTS \|
		AR9170_MAC_ENCRYPTION_MGMT_RX_SOFTWARE;
		u32 rx_ctrl = AR9170_MAC_RX_CTRL_DEAGG \|
		AR9170_MAC_RX_CTRL_SHORT_FILTER;
		u32 sniffer = AR9170_MAC_SNIFFER_DEFAULTS;

drivers/net/wireless/ath/carl9170/main.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -1149,6 +1149,7 @@ static int carl9170_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
		break;
		case WLAN_CIPHER_SUITE_CCMP:
		ktype = AR9170_ENC_ALG_AESCCMP;
		key->flags \|= IEEE80211_KEY_FLAG_SW_MGMT_TX;
		break;
		default:
		return -EOPNOTSUPP;
		@@ -1780,6 +1781,7 @@ void *carl9170_alloc(size_t priv_size)
		hw->wiphy->interface_modes = 0;

		hw->flags \|= IEEE80211_HW_RX_INCLUDES_FCS \|
		IEEE80211_HW_MFP_CAPABLE \|
		IEEE80211_HW_REPORTS_TX_ACK_STATUS \|
		IEEE80211_HW_SUPPORTS_PS \|
		IEEE80211_HW_PS_NULLFUNC_STACK \|