linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] compat-wireless: fix netlink portid patch for nl80211
@ 2013-03-05 10:04 Johannes Berg
  2013-03-07 22:12 ` Luis R. Rodriguez
  0 siblings, 1 reply; 2+ messages in thread
From: Johannes Berg @ 2013-03-05 10:04 UTC (permalink / raw)
  To: backports, linux-wireless

From: Johannes Berg <johannes.berg@intel.com>

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
 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;
-- 
1.8.0




^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] compat-wireless: fix netlink portid patch for nl80211
  2013-03-05 10:04 [PATCH] compat-wireless: fix netlink portid patch for nl80211 Johannes Berg
@ 2013-03-07 22:12 ` Luis R. Rodriguez
  0 siblings, 0 replies; 2+ messages in thread
From: Luis R. Rodriguez @ 2013-03-07 22:12 UTC (permalink / raw)
  To: Johannes Berg; +Cc: backports, linux-wireless

On Tue, Mar 5, 2013 at 2:04 AM, Johannes Berg <johannes@sipsolutions.net> wrote:
> From: Johannes Berg <johannes.berg@intel.com>
>
> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
> ---
>  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

Seems you are running on an old branch where patches were just under
patches. I've massaged this to conform to the new layout on the master
branch. I also modified the subject to indicate compat-drivers instead
of compat-wireless.

Thanks, applied and pushed!

  Luis

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2013-03-07 22:13 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-05 10:04 [PATCH] compat-wireless: fix netlink portid patch for nl80211 Johannes Berg
2013-03-07 22:12 ` Luis R. Rodriguez

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).