From patchwork Fri Jun 21 06:50:59 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Pedersen X-Patchwork-Id: 2760471 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 8DC649F472 for ; Fri, 21 Jun 2013 06:53:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C389D201C8 for ; Fri, 21 Jun 2013 06:53:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 03787201C7 for ; Fri, 21 Jun 2013 06:53:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753061Ab3FUGxs (ORCPT ); Fri, 21 Jun 2013 02:53:48 -0400 Received: from mail-pb0-f42.google.com ([209.85.160.42]:39235 "EHLO mail-pb0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751239Ab3FUGxr (ORCPT ); Fri, 21 Jun 2013 02:53:47 -0400 Received: by mail-pb0-f42.google.com with SMTP id un1so7349874pbc.15 for ; Thu, 20 Jun 2013 23:53:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=WCNbR8PgMd3O3/hQGa+581iKfamoTLz+W0Ckbq9zA4o=; b=fyxw+cceUICyq2D26NOIWsCd+6R+aByxBLdyaJA5jG9Tl5QHfI1cpnAxUxU+50pfOs dgv0v6dji6tu0CeOb7haZrGdjW8/mTSw90xV3Emavpxbd4c73PzOmXzuzOtC4XnZOBWy bXePqX0aa9fFE57gIJxdXzMMYp4lqOkMiCnll3UbFcxuHEUwxTJEtx3V5q1bydc7Tv1O 7XfckvwbU565otcMipv1NzyXsBuTtBqrHq9zMaPhKr2soj8JbSZv5Gom1tKlLbfdGJ9Q gEjeEoTW3HJmnwbuJhOSHlNJa9vqVDSROfV2NPL4MxDNZoLTstMMwWkxxEktHELv4Ypj ChNQ== X-Received: by 10.66.163.38 with SMTP id yf6mr14735387pab.45.1371797626969; Thu, 20 Jun 2013 23:53:46 -0700 (PDT) Received: from cable.lan (70-35-43-50.static.wiline.com. [70.35.43.50]) by mx.google.com with ESMTPSA id ra4sm4387598pab.9.2013.06.20.23.53.44 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 20 Jun 2013 23:53:45 -0700 (PDT) From: Thomas Pedersen To: Johannes Berg Cc: linux-wireless , open80211s , marco@cozybit.com, Bob Copeland , Thomas Pedersen Subject: [PATCH 2/2] mac80211: initialize power mode for mesh STAs Date: Thu, 20 Jun 2013 23:50:59 -0700 Message-Id: <1371797459-16585-2-git-send-email-thomas@cozybit.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1371797459-16585-1-git-send-email-thomas@cozybit.com> References: <1371797459-16585-1-git-send-email-thomas@cozybit.com> X-Gm-Message-State: ALoCoQnhT8PFFxsC5KMhNg7+WDuKC98pQLGlGiwVAnap/rgi6e4TE1EHaE7ZGgeqZCAAGZ4hz0rK Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-8.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Previously the default mesh STA nonpeer power mode was UNKNOWN (0) make the default mesh STA power mode ACTIVE, to prevent unnecessary frame buffering while peering is not yet complete. Fixes a panic in ath9k_htc when adding stations from userspace, and mcast buffered frames are later released. Thanks to Bob Copeland for his help debugging this. Signed-off-by: Thomas Pedersen --- net/mac80211/sta_info.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c index aaf68d2..aeb967a 100644 --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c @@ -347,6 +347,7 @@ struct sta_info *sta_info_alloc(struct ieee80211_sub_if_data *sdata, if (ieee80211_vif_is_mesh(&sdata->vif) && !sdata->u.mesh.user_mpm) init_timer(&sta->plink_timer); + sta->nonpeer_pm = NL80211_MESH_POWER_ACTIVE; #endif memcpy(sta->sta.addr, addr, ETH_ALEN);