From patchwork Tue Jun 18 12:29:14 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antonio Quartulli X-Patchwork-Id: 2742101 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id B8CEFC0AB1 for ; Tue, 18 Jun 2013 12:31:22 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 92F7920349 for ; Tue, 18 Jun 2013 12:31:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7E83F20345 for ; Tue, 18 Jun 2013 12:31:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755635Ab3FRMbS (ORCPT ); Tue, 18 Jun 2013 08:31:18 -0400 Received: from diserzione.investici.org ([82.221.99.153]:59709 "EHLO diserzione.investici.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754050Ab3FRMbS (ORCPT ); Tue, 18 Jun 2013 08:31:18 -0400 Received: from [82.221.99.153] (diserzione [82.221.99.153]) (Authenticated sender: ordex@autistici.org) by localhost (Postfix) with ESMTPSA id 884EB181206; Tue, 18 Jun 2013 12:31:15 +0000 (UTC) X-DKIM: Sendmail DKIM Filter v2.8.2 diserzione.investici.org 884EB181206 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org; s=stigmate; t=1371558676; bh=Rhwb+PpchKHcpSKHDRakKokb/A1HJNwBb58E9j2SmHc=; h=From:To:Cc:Subject:Date:Message-Id; b=MdUgDJYwww+SflN2Rba3oSjNg5osopPm7LqeSFwCqFiR0/nW05kOitKKXg/FvkCRZ YHBklwYBiGsgg8dgq4x7u9XnYzESsnEx4dZvykpszDqBh9ZOSu+m30700Hxf8D34EF ahUBntvMBSXOCggXvU0J7BulFBffo5NBDjcakZEw= From: Antonio Quartulli To: Johannes Berg Cc: linux-wireless@vger.kernel.org, Antonio Quartulli Subject: [PATCH] nl80211: allow to register for mgmt frames without a matching pattern Date: Tue, 18 Jun 2013 14:29:14 +0200 Message-Id: <1371558554-367-1-git-send-email-ordex@autistici.org> X-Mailer: git-send-email 1.8.1.5 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-7.2 required=5.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_SIGNED, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, 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 From: Antonio Quartulli It may be the case that a user wants to register for any frame of a particular type. Allow this operation by passing null as matching pattern and 0 as pattern len when registering for the frame. This is useful to wpa_supplicant when it wants to receive any AUTH frame. Signed-off-by: Antonio Quartulli --- net/wireless/nl80211.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index e402819..878d346 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -7099,9 +7099,11 @@ static int nl80211_register_mgmt(struct sk_buff *skb, struct genl_info *info) struct cfg80211_registered_device *rdev = info->user_ptr[0]; struct wireless_dev *wdev = info->user_ptr[1]; u16 frame_type = IEEE80211_FTYPE_MGMT | IEEE80211_STYPE_ACTION; + void *data = nla_data(info->attrs[NL80211_ATTR_FRAME_MATCH]); + int len = 0; - if (!info->attrs[NL80211_ATTR_FRAME_MATCH]) - return -EINVAL; + if (data) + len = nla_len(data); if (info->attrs[NL80211_ATTR_FRAME_TYPE]) frame_type = nla_get_u16(info->attrs[NL80211_ATTR_FRAME_TYPE]); @@ -7125,8 +7127,7 @@ static int nl80211_register_mgmt(struct sk_buff *skb, struct genl_info *info) return -EOPNOTSUPP; return cfg80211_mlme_register_mgmt(wdev, info->snd_portid, frame_type, - nla_data(info->attrs[NL80211_ATTR_FRAME_MATCH]), - nla_len(info->attrs[NL80211_ATTR_FRAME_MATCH])); + data, len); } static int nl80211_tx_mgmt(struct sk_buff *skb, struct genl_info *info)