From patchwork Wed Mar 20 19:13:35 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janusz Dziedzic X-Patchwork-Id: 2309341 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 133FCDF24C for ; Wed, 20 Mar 2013 19:13:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933205Ab3CTTNh (ORCPT ); Wed, 20 Mar 2013 15:13:37 -0400 Received: from mail-ie0-f181.google.com ([209.85.223.181]:54998 "EHLO mail-ie0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757831Ab3CTTNg (ORCPT ); Wed, 20 Mar 2013 15:13:36 -0400 Received: by mail-ie0-f181.google.com with SMTP id 17so2476828iea.40 for ; Wed, 20 Mar 2013 12:13:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:x-received:date:message-id:subject:from:to:cc :content-type; bh=J7dDTOKZDSeDmzuFt7BCzzUGMft7a5CARpp968fVZuU=; b=qLajnVLCoytD3HIw30kGqjsGw4kACAbwxxaHJBbbkdJr0iDwelBfaI397iUX2P+Ju6 IbMLbkfibevPMLnj2s/xFQXMDQAt87DPapYgbdz1u3jeGubxCdfR6XhFHmVZ/7wAuzM/ GdOcK1HtfVUIV6etm0go5Bp2YTDuucgfnG8AWgaB5tdFg7eYvn8oKd4StKI13ACq5kvi E9jnGB/cggpCiczyrfOm9tlt9/8BQ0FN8x5o98JOAoxxUCq1CLOjEWMiR19v3VAegcGM ZJu8qmRayKx9O+cM6hdHsbMx7cXTinshD0Hk0/mhkJ8piPjttkxd9Kbn5PKAMqSULGas piYg== MIME-Version: 1.0 X-Received: by 10.50.186.227 with SMTP id fn3mr192856igc.17.1363806815782; Wed, 20 Mar 2013 12:13:35 -0700 (PDT) Received: by 10.42.169.9 with HTTP; Wed, 20 Mar 2013 12:13:35 -0700 (PDT) Date: Wed, 20 Mar 2013 20:13:35 +0100 Message-ID: Subject: [PATCH 2/4] mac80211: use ieee80211_p2p_noa_attr structure From: Janusz Dziedzic To: linux-wireless Cc: Johannes Berg Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Use ieee80211_p2p_noa_attr structure during P2P_PS (oppps) detection. Signed-off-by: Janusz Dziedzic --- net/mac80211/mlme.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) rcu_read_unlock(); @@ -2953,18 +2955,20 @@ ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata, } if (sdata->vif.p2p) { - u8 noa[2]; + struct ieee80211_p2p_noa_attr noa; int ret; ret = cfg80211_get_p2p_attr(mgmt->u.beacon.variable, len - baselen, IEEE80211_P2P_ATTR_ABSENCE_NOTICE, - noa, sizeof(noa)); - if (ret >= 2 && sdata->u.mgd.p2p_noa_index != noa[0]) { - bss_conf->p2p_oppps = noa[1] & 0x80; - bss_conf->p2p_ctwindow = noa[1] & 0x7f; + (u8 *) &noa, sizeof(noa)); + if (ret >= 2 && sdata->u.mgd.p2p_noa_index != noa.index) { + bss_conf->p2p_oppps = noa.oppps_ctwindow & + IEEE80211_P2P_OPPPS_ENABLE_BIT; + bss_conf->p2p_ctwindow = noa.oppps_ctwindow & + IEEE80211_P2P_OPPPS_CTWINDOW_MASK; changed |= BSS_CHANGED_P2P_PS; - sdata->u.mgd.p2p_noa_index = noa[0]; + sdata->u.mgd.p2p_noa_index = noa.index; /* * make sure we update all information, the CRC * mechanism doesn't look at P2P attributes. diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index fdc06e3..14612cd 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -1655,18 +1655,20 @@ static void ieee80211_set_associated(struct ieee80211_sub_if_data *sdata, rcu_read_lock(); ies = rcu_dereference(cbss->ies); if (ies) { - u8 noa[2]; + struct ieee80211_p2p_noa_attr noa; int ret; ret = cfg80211_get_p2p_attr( ies->data, ies->len, IEEE80211_P2P_ATTR_ABSENCE_NOTICE, - noa, sizeof(noa)); + (u8 *) &noa, sizeof(noa)); if (ret >= 2) { - bss_conf->p2p_oppps = noa[1] & 0x80; - bss_conf->p2p_ctwindow = noa[1] & 0x7f; + bss_conf->p2p_oppps = noa.oppps_ctwindow & + IEEE80211_P2P_OPPPS_ENABLE_BIT; + bss_conf->p2p_ctwindow = noa.oppps_ctwindow & + IEEE80211_P2P_OPPPS_CTWINDOW_MASK; bss_info_changed |= BSS_CHANGED_P2P_PS; - sdata->u.mgd.p2p_noa_index = noa[0]; + sdata->u.mgd.p2p_noa_index = noa.index; } }