EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
f1ef0b92be
Openwrt/target/linux/generic/patches-3.6/a02-swconfig-revert-portid-snd_portid-usage.patch

31 lines
1002 B
Diff
Raw Normal View History

swconfig: make it compatible with 3.7 swconfig does not compile with 3.7 because struct netlink_notify->pid has been renamed to struct netlink_notify->portid and struct genl_info->snd_pid has been renamed to struct genl_info->snd_portid Use the new names and add compatibility patches to 3.3 and 3.6. Signed-off-by: Gabor Juhos <juhosg@openwrt.org> SVN-Revision: 34288
2012-11-21 17:38:11 +00:00
reverted:
--- a/drivers/net/phy/swconfig.c
+++ b/drivers/net/phy/swconfig.c
kernel: backport switch user API changes after r36283 3.3 and 3.6 kernels do not make use of the UAPI headers, still they need to provide an up-to-date switch.h copy for swconfig to build. Signed-off-by: Florian Fainelli <florian@openwrt.org> SVN-Revision: 36295
2013-04-09 15:47:01 +00:00
@@ -377,7 +377,7 @@ swconfig_dump_attr(struct swconfig_callb
swconfig: make it compatible with 3.7 swconfig does not compile with 3.7 because struct netlink_notify->pid has been renamed to struct netlink_notify->portid and struct genl_info->snd_pid has been renamed to struct genl_info->snd_portid Use the new names and add compatibility patches to 3.3 and 3.6. Signed-off-by: Gabor Juhos <juhosg@openwrt.org> SVN-Revision: 34288
2012-11-21 17:38:11 +00:00
int id = cb->args[0];
void *hdr;
- hdr = genlmsg_put(msg, info->snd_portid, info->snd_seq, &switch_fam,
+ hdr = genlmsg_put(msg, info->snd_pid, info->snd_seq, &switch_fam,
NLM_F_MULTI, SWITCH_CMD_NEW_ATTR);
if (IS_ERR(hdr))
return -1;
kernel: backport switch user API changes after r36283 3.3 and 3.6 kernels do not make use of the UAPI headers, still they need to provide an up-to-date switch.h copy for swconfig to build. Signed-off-by: Florian Fainelli <florian@openwrt.org> SVN-Revision: 36295
2013-04-09 15:47:01 +00:00
@@ -799,7 +799,7 @@ swconfig_get_attr(struct sk_buff *skb, s
swconfig: make it compatible with 3.7 swconfig does not compile with 3.7 because struct netlink_notify->pid has been renamed to struct netlink_notify->portid and struct genl_info->snd_pid has been renamed to struct genl_info->snd_portid Use the new names and add compatibility patches to 3.3 and 3.6. Signed-off-by: Gabor Juhos <juhosg@openwrt.org> SVN-Revision: 34288
2012-11-21 17:38:11 +00:00
if (!msg)
goto error;
- hdr = genlmsg_put(msg, info->snd_portid, info->snd_seq, &switch_fam,
+ hdr = genlmsg_put(msg, info->snd_pid, info->snd_seq, &switch_fam,
0, cmd);
if (IS_ERR(hdr))
goto nla_put_failure;
kernel: backport switch user API changes after r36283 3.3 and 3.6 kernels do not make use of the UAPI headers, still they need to provide an up-to-date switch.h copy for swconfig to build. Signed-off-by: Florian Fainelli <florian@openwrt.org> SVN-Revision: 36295
2013-04-09 15:47:01 +00:00
@@ -902,7 +902,7 @@ static int swconfig_dump_switches(struct
swconfig: make it compatible with 3.7 swconfig does not compile with 3.7 because struct netlink_notify->pid has been renamed to struct netlink_notify->portid and struct genl_info->snd_pid has been renamed to struct genl_info->snd_portid Use the new names and add compatibility patches to 3.3 and 3.6. Signed-off-by: Gabor Juhos <juhosg@openwrt.org> SVN-Revision: 34288
2012-11-21 17:38:11 +00:00
list_for_each_entry(dev, &swdevs, dev_list) {
if (++idx <= start)
continue;
- if (swconfig_send_switch(skb, NETLINK_CB(cb->skb).portid,
+ if (swconfig_send_switch(skb, NETLINK_CB(cb->skb).pid,
cb->nlh->nlmsg_seq, NLM_F_MULTI,
dev) < 0)
break;
Reference in New Issue Copy Permalink