Skip to contentSkip to conversation

compat-wireless: fix netlink portid patch for nl80211

PATCH Applied Johannes Berg 2 participants 2 messages Mar 5, 2013 – Mar 7, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 compat-wireless: fix netlink portid patch for nl80211

From: Johannes Berg <[email protected]>

---
 patches/0005-netlink-portid.patch | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
patches/0005-netlink-portid.patch +5 -5
index ee9bc85..ebf10b6 100644
@@ -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;
Signature · 1 line
1.8.0
#1 lore raw

patches/0005-netlink-portid.patch

Quoted 11 lines · Johannes Berg

From: Johannes Berg <[email protected]>

---
 patches/0005-netlink-portid.patch | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
patches/0005-netlink-portid.patch +0 -0
index ee9bc85..ebf10b6 100644

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