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

Commit d1f3de71 authored by Christian Lamparter's avatar Christian Lamparter Committed by John W. Linville
Browse files

carl9170: advertise support for TDLS 



Based on a quick test [ath9k and carl9170],
TDLS seemed to be working fine. And while
we are at it, let's move the wiphy feature
flag set from carl9170_alloc into a single
place in carl9170_fw.

Signed-off-by: default avatarChristian Lamparter <chunkeey@googlemail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent c1b976d2

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

+5 −1
Original line number Diff line number Diff line
@@ -354,7 +354,11 @@ static int carl9170_fw(struct ar9170 *ar, const __u8 *data, size_t len) 


	ar->hw->wiphy->interface_modes |= if_comb_types;



	ar->hw->wiphy->flags |= WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL;

	ar->hw->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT;



	/* As IBSS Encryption is software-based, IBSS RSN is supported. */

	ar->hw->wiphy->flags |= WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL |

		 WIPHY_FLAG_IBSS_RSN | WIPHY_FLAG_SUPPORTS_TDLS;



#undef SUPPORTED

	return carl9170_fw_tx_sequence(ar);

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

+0 −4
Original line number Diff line number Diff line
@@ -1807,10 +1807,6 @@ void *carl9170_alloc(size_t priv_size) 
	for (i = 0; i < ARRAY_SIZE(ar->noise); i++)

		ar->noise[i] = -95; /* ATH_DEFAULT_NOISE_FLOOR */



	hw->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT;



	/* As IBSS Encryption is software-based, IBSS RSN is supported. */

	hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN;

	return ar;



err_nomem: