From patchwork Fri Jun 29 10:46:59 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Kazior X-Patchwork-Id: 1131491 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 3749CDFF34 for ; Fri, 29 Jun 2012 10:47:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755166Ab2F2Krw (ORCPT ); Fri, 29 Jun 2012 06:47:52 -0400 Received: from ebb06.tieto.com ([131.207.168.38]:62843 "EHLO ebb06.tieto.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754358Ab2F2KrZ (ORCPT ); Fri, 29 Jun 2012 06:47:25 -0400 X-AuditID: 83cfa826-b7cabae00000347a-bf-4fed87bb73a2 Received: from FIVLA-EXHUB02.eu.tieto.com ( [131.207.136.42]) by ebb06.tieto.com (SMTP Mailer) with SMTP id F8.D0.13434.BB78DEF4; Fri, 29 Jun 2012 13:47:23 +0300 (EEST) Received: from localhost (10.28.23.78) by inbound.tieto.com (131.207.136.49) with Microsoft SMTP Server id 8.3.245.1; Fri, 29 Jun 2012 13:47:23 +0300 From: Michal Kazior To: CC: , Michal Kazior Subject: [PATCH 04/13] cfg80211: track ibss fixed channel Date: Fri, 29 Jun 2012 12:46:59 +0200 Message-ID: <1340966828-22874-5-git-send-email-michal.kazior@tieto.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1340966828-22874-1-git-send-email-michal.kazior@tieto.com> References: <1340966828-22874-1-git-send-email-michal.kazior@tieto.com> MIME-Version: 1.0 X-Brightmail-Tracker: AAAAAA== Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org IBSS may hop between channels. It is necessary to account this special case when considering interface combinations. Signed-off-by: Michal Kazior --- include/net/cfg80211.h | 2 ++ net/wireless/ibss.c | 1 + 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index c62bc78..e030c6a 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h @@ -2411,6 +2411,8 @@ struct wireless_dev { /* for AP and mesh channel tracking */ struct ieee80211_channel *channel; + bool ibss_fixed; + bool ps; int ps_timeout; diff --git a/net/wireless/ibss.c b/net/wireless/ibss.c index 89baa33..b90fd86 100644 --- a/net/wireless/ibss.c +++ b/net/wireless/ibss.c @@ -113,6 +113,7 @@ int __cfg80211_join_ibss(struct cfg80211_registered_device *rdev, kfree(wdev->connect_keys); wdev->connect_keys = connkeys; + wdev->ibss_fixed = params->channel_fixed; #ifdef CONFIG_CFG80211_WEXT wdev->wext.ibss.channel = params->channel; #endif