From patchwork Tue Mar 5 10:04:46 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Berg X-Patchwork-Id: 2218501 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 0F95ADF24C for ; Tue, 5 Mar 2013 10:04:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755507Ab3CEKEy (ORCPT ); Tue, 5 Mar 2013 05:04:54 -0500 Received: from he.sipsolutions.net ([78.46.109.217]:45295 "EHLO sipsolutions.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755299Ab3CEKEx (ORCPT ); Tue, 5 Mar 2013 05:04:53 -0500 Received: by sipsolutions.net with esmtpsa (TLS1.0:DHE_RSA_CAMELLIA_256_CBC_SHA1:256) (Exim 4.80) (envelope-from ) id 1UCojr-00047B-Fg; Tue, 05 Mar 2013 11:04:51 +0100 Message-ID: <1362477886.8224.0.camel@jlt4.sipsolutions.net> Subject: [PATCH] compat-wireless: fix netlink portid patch for nl80211 From: Johannes Berg To: backports@vger.kernel.org, linux-wireless@vger.kernel.org Date: Tue, 05 Mar 2013 11:04:46 +0100 X-Mailer: Evolution 3.6.1-1 Mime-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Johannes Berg Signed-off-by: Johannes Berg --- patches/0005-netlink-portid.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/patches/0005-netlink-portid.patch b/patches/0005-netlink-portid.patch index ee9bc85..ebf10b6 100644 --- a/patches/0005-netlink-portid.patch +++ b/patches/0005-netlink-portid.patch @@ -70,11 +70,11 @@ this one should other drivers / subsystem need this change. continue; if (++idx <= start) continue; -- if (nl80211_send_wiphy(skb, NETLINK_CB(cb->skb).portid, -+ if (nl80211_send_wiphy(skb, NETLINK_CB_PORTID(skb), - cb->nlh->nlmsg_seq, NLM_F_MULTI, - dev) < 0) { - idx--; +- ret = nl80211_send_wiphy(skb, NETLINK_CB(cb->skb).portid, ++ ret = nl80211_send_wiphy(skb, NETLINK_CB_PORTID(skb), + cb->nlh->nlmsg_seq, NLM_F_MULTI, + dev); + if (ret < 0) { @@ -1300,7 +1300,7 @@ static int nl80211_get_wiphy(struct sk_buff *skb, struct genl_info *info) if (!msg) return -ENOMEM;