2013-03-05 10:04:53

by Johannes Berg

Subject: [PATCH] compat-wireless: fix netlink portid patch for nl80211

From: Johannes Berg <[email protected]>

Signed-off-by: Johannes Berg <[email protected]>
---
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

2013-03-07 22:13:04

by Luis R. Rodriguez

Subject: Re: [PATCH] compat-wireless: fix netlink portid patch for nl80211

On Tue, Mar 5, 2013 at 2:04 AM, Johannes Berg <[email protected]> wrote:
> From: Johannes Berg <[email protected]>
>
> Signed-off-by: Johannes Berg <[email protected]>
> ---
> 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