From patchwork Wed Aug 22 08:51:07 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sujith Manoharan X-Patchwork-Id: 1360651 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 5C5F13FD40 for ; Wed, 22 Aug 2012 08:52:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755646Ab2HVIwv (ORCPT ); Wed, 22 Aug 2012 04:52:51 -0400 Received: from wolverine02.qualcomm.com ([199.106.114.251]:1434 "EHLO wolverine02.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755111Ab2HVIwj (ORCPT ); Wed, 22 Aug 2012 04:52:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=qca.qualcomm.com; i=@qca.qualcomm.com; q=dns/txt; s=qcdkim; t=1345625560; x=1377161560; h=from:mime-version:content-transfer-encoding:message-id: date:to:cc:subject; bh=Y69f2SD6UGX5EabILmb1e8Yc3+KN+Ll2vOdOC6N/Nis=; b=wyn5mIAQ9kYScv7YjDsG/sqwxJRksMwq8b+ZUJkLD4yg0leUCKMm0VtC +5zbNebg24P627qVpgdR8xSaNVOyRz5n6/4O6BGZGydsZ6fAaKNuY9v8T +nLVqSFfnH/p6fs9wTZKEs7rbAAbKiyNZOC4lxgxLuYN3uJsxAv5v9aKY M=; X-IronPort-AV: E=McAfee;i="5400,1158,6811"; a="225758029" Received: from ironmsg03-l.qualcomm.com ([172.30.48.18]) by wolverine02.qualcomm.com with ESMTP; 22 Aug 2012 01:52:38 -0700 X-IronPort-AV: E=Sophos;i="4.77,808,1336374000"; d="scan'208";a="312082247" Received: from nasanexhc08.na.qualcomm.com ([172.30.39.7]) by Ironmsg03-L.qualcomm.com with ESMTP/TLS/RC4-SHA; 22 Aug 2012 01:52:38 -0700 Received: from alfalfa (172.30.39.5) by qcmail1.qualcomm.com (172.30.39.7) with Microsoft SMTP Server (TLS) id 14.2.318.1; Wed, 22 Aug 2012 01:52:36 -0700 From: Sujith Manoharan MIME-Version: 1.0 Message-ID: <20532.40315.58985.214038@gargle.gargle.HOWL> Date: Wed, 22 Aug 2012 14:21:07 +0530 To: CC: , Subject: [PATCH] mac80211: Fix AP mode regression X-Mailer: VM 8.2.0b under 24.1.1 (x86_64-unknown-linux-gnu) X-Originating-IP: [172.30.39.5] Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Commit mac80211: avoid using synchronize_rcu in ieee80211_set_probe_resp changed the return value when the probe response template is not present. Revert to the earlier value of 1 - this fixes AP mode for drivers like ath9k. Signed-off-by: Sujith Manoharan --- net/mac80211/cfg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index 69b322f..929f897 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -740,7 +740,7 @@ static int ieee80211_set_probe_resp(struct ieee80211_sub_if_data *sdata, struct probe_resp *new, *old; if (!resp || !resp_len) - return -EINVAL; + return 1; old = rtnl_dereference(sdata->u.ap.probe_resp);