From patchwork Thu Dec 13 18:51:55 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marco Porsch X-Patchwork-Id: 1875871 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 22E093FC81 for ; Thu, 13 Dec 2012 18:52:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756640Ab2LMSwP (ORCPT ); Thu, 13 Dec 2012 13:52:15 -0500 Received: from mail-pb0-f46.google.com ([209.85.160.46]:52872 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756358Ab2LMSwL (ORCPT ); Thu, 13 Dec 2012 13:52:11 -0500 Received: by mail-pb0-f46.google.com with SMTP id wy7so1756244pbc.19 for ; Thu, 13 Dec 2012 10:52:11 -0800 (PST) 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=CqNwJ8TbVhaIWk9wo5MgOtk9hRVGmfl9DjUGVurBJ9Y=; b=PJ1V+83Eti/qIW9v8Tx7+uALljgKgi8qbYL1nXeUlg0LeyKQnQeAyLhE/mWzVxrw4S BxSCkxLrva1shYUHI6et4UzURV6G/c5AMYF4LHpFuasw+I06+uMNQ/uQnV/y40feHwpv hmVrOnWIFK3nHiQw5UqNbfGGFPFHqpXQiEgL4tJ2nDE+jv7CMHgq2J/Lc1RuNtzdKyYp 68V601aCEObKBSqV9MHii3EKqnDFlFW0ye5qThW1FgRE+SDnuhZxSVGz0rkSuXD8zD36 BTd7SMKllk1DMsJN5j4V3NVHQqHIxAePY9Bt/ZDD8t7r3oN0jrNkA9tZInxtyVk+mYL5 Up1Q== Received: by 10.68.190.227 with SMTP id gt3mr8360135pbc.5.1355424731275; Thu, 13 Dec 2012 10:52:11 -0800 (PST) Received: from X220-marco.lan (70-35-43-50.static.wiline.com. [70.35.43.50]) by mx.google.com with ESMTPS id oj1sm1446228pbb.19.2012.12.13.10.52.09 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 13 Dec 2012 10:52:10 -0800 (PST) From: Marco Porsch To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org, devel@lists.open80211s.org, Marco Porsch Subject: [PATCH 3/6] mac80211: move add_tim to subfunction Date: Thu, 13 Dec 2012 10:51:55 -0800 Message-Id: <1355424718-2982-4-git-send-email-marco@cozybit.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1355424718-2982-1-git-send-email-marco@cozybit.com> References: <1355424718-2982-1-git-send-email-marco@cozybit.com> X-Gm-Message-State: ALoCoQmob1MFZozl04dwibqWzJg9Otgi0C1zn2PaCkQJxNN1U0h7LAeHvjioarPa9qs5DkgQLB5M Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org This functions will be used for mesh beacons, too. Signed-off-by: Marco Porsch --- net/mac80211/tx.c | 48 +++++++++++++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 19 deletions(-) diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index e9eadc4..1b04984 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -2261,9 +2261,9 @@ void ieee80211_tx_pending(unsigned long data) /* functions for drivers to get certain frames */ -static void ieee80211_beacon_add_tim(struct ieee80211_sub_if_data *sdata, - struct ps_data *ps, - struct sk_buff *skb) +static void __ieee80211_beacon_add_tim(struct ieee80211_sub_if_data *sdata, + struct ps_data *ps, + struct sk_buff *skb) { u8 *pos, *tim; int aid0 = 0; @@ -2325,6 +2325,31 @@ static void ieee80211_beacon_add_tim(struct ieee80211_sub_if_data *sdata, } } +static int ieee80211_beacon_add_tim(struct ieee80211_sub_if_data *sdata, + struct ps_data *ps, + struct sk_buff *skb) +{ + struct ieee80211_local *local = sdata->local; + + /* Not very nice, but we want to allow the driver to call + * ieee80211_beacon_get() as a response to the set_tim() callback. + * That, however, is already invoked under the sta_lock to guarantee + * consistent and race-free update of the tim bitmap in mac80211 and + * the driver. + */ + if (local->tim_in_locked_section) { + __ieee80211_beacon_add_tim(sdata, ps, skb); + } else { + unsigned long flags; + + spin_lock_irqsave(&local->tim_lock, flags); + __ieee80211_beacon_add_tim(sdata, ps, skb); + spin_unlock_irqrestore(&local->tim_lock, flags); + } + + return 0; +} + struct sk_buff *ieee80211_beacon_get_tim(struct ieee80211_hw *hw, struct ieee80211_vif *vif, u16 *tim_offset, u16 *tim_length) @@ -2369,22 +2394,7 @@ struct sk_buff *ieee80211_beacon_get_tim(struct ieee80211_hw *hw, memcpy(skb_put(skb, beacon->head_len), beacon->head, beacon->head_len); - /* - * Not very nice, but we want to allow the driver to call - * ieee80211_beacon_get() as a response to the set_tim() - * callback. That, however, is already invoked under the - * sta_lock to guarantee consistent and race-free update - * of the tim bitmap in mac80211 and the driver. - */ - if (local->tim_in_locked_section) { - ieee80211_beacon_add_tim(sdata, &ap->ps, skb); - } else { - unsigned long flags; - - spin_lock_irqsave(&local->tim_lock, flags); - ieee80211_beacon_add_tim(sdata, &ap->ps, skb); - spin_unlock_irqrestore(&local->tim_lock, flags); - } + ieee80211_beacon_add_tim(sdata, &ap->ps, skb); if (tim_offset) *tim_offset = beacon->head_len;