From f9ac99ce4205cbe5a67627433dab6a8b6cf49ac7 Mon Sep 17 00:00:00 2001 From: Christian Lamparter Date: Mon, 17 Dec 2012 17:05:55 +0100 Subject: [PATCH] --- yaml --- r: 351794 b: refs/heads/master c: 55fa645e3a3f4c0b5da744eb0e1fec4e51dfc75e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ath/carl9170/main.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index a5b8a4ce04ea..49a4f4267d61 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7a5c7307736cdc26146581aed24cc46a4c7e6f35 +refs/heads/master: 55fa645e3a3f4c0b5da744eb0e1fec4e51dfc75e diff --git a/trunk/drivers/net/wireless/ath/carl9170/main.c b/trunk/drivers/net/wireless/ath/carl9170/main.c index 6ca5dd068275..0abf005aaa4e 100644 --- a/trunk/drivers/net/wireless/ath/carl9170/main.c +++ b/trunk/drivers/net/wireless/ath/carl9170/main.c @@ -583,6 +583,14 @@ static int carl9170_init_interface(struct ar9170 *ar, ar->disable_offload |= ((vif->type != NL80211_IFTYPE_STATION) && (vif->type != NL80211_IFTYPE_AP)); + /* While the driver supports HW offload in a single + * P2P client configuration, it doesn't support HW + * offload in the favourit, concurrent P2P GO+CLIENT + * configuration. Hence, HW offload will always be + * disabled for P2P. + */ + ar->disable_offload |= vif->p2p; + ar->rx_software_decryption = ar->disable_offload; err = carl9170_set_operating_mode(ar);