| Message ID | 1362477886.8224.0.camel@jlt4.sipsolutions.net (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
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 -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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;