From patchwork Tue Apr 26 08:06:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Dichtel X-Patchwork-Id: 614815 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from archives.nicira.com (archives.nicira.com [96.126.127.54]) by ozlabs.org (Postfix) with ESMTP id 3qvG0n5T6dz9t3h for ; Tue, 26 Apr 2016 18:07:37 +1000 (AEST) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id 4338D10655; Tue, 26 Apr 2016 01:06:44 -0700 (PDT) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx3v3.cudamail.com (mx3.cudamail.com [64.34.241.5]) by archives.nicira.com (Postfix) with ESMTPS id 2874D10619 for ; Tue, 26 Apr 2016 01:06:41 -0700 (PDT) Received: from bar6.cudamail.com (localhost [127.0.0.1]) by mx3v3.cudamail.com (Postfix) with ESMTPS id AC4C116251A for ; Tue, 26 Apr 2016 02:06:40 -0600 (MDT) X-ASG-Debug-ID: 1461657998-0b32374edb89e20001-byXFYA Received: from mx1-pf2.cudamail.com ([192.168.24.2]) by bar6.cudamail.com with ESMTP id PgejUyUK6XmbSrwj (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Tue, 26 Apr 2016 02:06:38 -0600 (MDT) X-Barracuda-Envelope-From: root@6wind.com X-Barracuda-RBL-Trusted-Forwarder: 192.168.24.2 Received: from unknown (HELO proxy.6wind.com) (62.23.145.76) by mx1-pf2.cudamail.com with SMTP; 26 Apr 2016 08:06:38 -0000 Received-SPF: none (mx1-pf2.cudamail.com: domain at 6wind.com does not designate permitted sender hosts) X-Barracuda-Apparent-Source-IP: 62.23.145.76 X-Barracuda-RBL-IP: 62.23.145.76 Received: from elsass.dev.6wind.com (unknown [10.16.0.149]) by proxy.6wind.com (Postfix) with ESMTPS id 57D8927BD4; Tue, 26 Apr 2016 10:04:58 +0200 (CEST) Received: from root by elsass.dev.6wind.com with local (Exim 4.80) (envelope-from ) id 1auy0k-0003Uu-Q0; Tue, 26 Apr 2016 10:06:22 +0200 X-CudaMail-Envelope-Sender: root@6wind.com From: Nicolas Dichtel To: netdev@vger.kernel.org X-CudaMail-MID: CM-E2-425002516 X-CudaMail-DTE: 042616 X-CudaMail-Originating-IP: 62.23.145.76 Date: Tue, 26 Apr 2016 10:06:12 +0200 X-ASG-Orig-Subj: [##CM-E2-425002516##][PATCH net-next 2/8] drivers/wireless: use nla_put_u64_64bit() Message-Id: <1461657978-13360-3-git-send-email-nicolas.dichtel@6wind.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1461657978-13360-1-git-send-email-nicolas.dichtel@6wind.com> References: <1461657978-13360-1-git-send-email-nicolas.dichtel@6wind.com> X-GBUdb-Analysis: 0, 62.23.145.76, Ugly c=0.071429 p=0 Source Normal X-MessageSniffer-Rules: 0-0-0-4029-c X-Barracuda-Connect: UNKNOWN[192.168.24.2] X-Barracuda-Start-Time: 1461657998 X-Barracuda-Encrypted: DHE-RSA-AES256-SHA X-Barracuda-URL: https://web.cudamail.com:443/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at cudamail.com X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.60 X-Barracuda-Spam-Status: No, SCORE=0.60 using per-user scores of TAG_LEVEL=3.5 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=4.0 tests=BSF_SC0_MISMATCH_TO, BSF_SC5_MJ1963, RDNS_NONE X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.3.29065 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.00 BSF_SC0_MISMATCH_TO Envelope rcpt doesn't match header 0.10 RDNS_NONE Delivered to trusted network by a host with no rDNS 0.50 BSF_SC5_MJ1963 Custom Rule MJ1963 Cc: dev@openvswitch.org, Nicolas Dichtel , sd@queasysnail.net, linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, jhs@mojatatu.com, lars.ellenberg@linbit.com, jack@suse.com, johannes@sipsolutions.net, philipp.reisner@linbit.com, davem@davemloft.net, kvalo@codeaurora.org, drbd-dev@lists.linbit.com Subject: [ovs-dev] [PATCH net-next 2/8] drivers/wireless: use nla_put_u64_64bit() X-BeenThere: dev@openvswitch.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dev-bounces@openvswitch.org Sender: "dev" Signed-off-by: Nicolas Dichtel --- drivers/net/wireless/mac80211_hwsim.c | 2 +- drivers/net/wireless/mac80211_hwsim.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c index c757f14c4c00..9ed0ed1bf514 100644 --- a/drivers/net/wireless/mac80211_hwsim.c +++ b/drivers/net/wireless/mac80211_hwsim.c @@ -1030,7 +1030,7 @@ static void mac80211_hwsim_tx_frame_nl(struct ieee80211_hw *hw, data->pending_cookie++; cookie = data->pending_cookie; info->rate_driver_data[0] = (void *)cookie; - if (nla_put_u64(skb, HWSIM_ATTR_COOKIE, cookie)) + if (nla_put_u64_64bit(skb, HWSIM_ATTR_COOKIE, cookie, HWSIM_ATTR_PAD)) goto nla_put_failure; genlmsg_end(skb, msg_head); diff --git a/drivers/net/wireless/mac80211_hwsim.h b/drivers/net/wireless/mac80211_hwsim.h index 66e1c73bd507..39f22467ca2a 100644 --- a/drivers/net/wireless/mac80211_hwsim.h +++ b/drivers/net/wireless/mac80211_hwsim.h @@ -148,6 +148,7 @@ enum { HWSIM_ATTR_RADIO_NAME, HWSIM_ATTR_NO_VIF, HWSIM_ATTR_FREQ, + HWSIM_ATTR_PAD, __HWSIM_ATTR_MAX, }; #define HWSIM_ATTR_MAX (__HWSIM_ATTR_MAX - 1)