10d30f2d2d
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
31 lines
1002 B
Diff
31 lines
1002 B
Diff
reverted:
|
|
--- a/drivers/net/phy/swconfig.c
|
|
+++ b/drivers/net/phy/swconfig.c
|
|
@@ -376,7 +376,7 @@ swconfig_dump_attr(struct swconfig_callb
|
|
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;
|
|
@@ -798,7 +798,7 @@ swconfig_get_attr(struct sk_buff *skb, s
|
|
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;
|
|
@@ -883,7 +883,7 @@ static int swconfig_dump_switches(struct
|
|
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;
|