swconfig: make it compatible with 3.7
[openwrt.git] / target / linux / generic / patches-3.6 / a02-swconfig-revert-portid-snd_portid-usage.patch
1 reverted:
2 --- a/drivers/net/phy/swconfig.c
3 +++ b/drivers/net/phy/swconfig.c
4 @@ -376,7 +376,7 @@ swconfig_dump_attr(struct swconfig_callb
5         int id = cb->args[0];
6         void *hdr;
7  
8 -       hdr = genlmsg_put(msg, info->snd_portid, info->snd_seq, &switch_fam,
9 +       hdr = genlmsg_put(msg, info->snd_pid, info->snd_seq, &switch_fam,
10                         NLM_F_MULTI, SWITCH_CMD_NEW_ATTR);
11         if (IS_ERR(hdr))
12                 return -1;
13 @@ -798,7 +798,7 @@ swconfig_get_attr(struct sk_buff *skb, s
14         if (!msg)
15                 goto error;
16  
17 -       hdr = genlmsg_put(msg, info->snd_portid, info->snd_seq, &switch_fam,
18 +       hdr = genlmsg_put(msg, info->snd_pid, info->snd_seq, &switch_fam,
19                         0, cmd);
20         if (IS_ERR(hdr))
21                 goto nla_put_failure;
22 @@ -883,7 +883,7 @@ static int swconfig_dump_switches(struct
23         list_for_each_entry(dev, &swdevs, dev_list) {
24                 if (++idx <= start)
25                         continue;
26 -               if (swconfig_send_switch(skb, NETLINK_CB(cb->skb).portid,
27 +               if (swconfig_send_switch(skb, NETLINK_CB(cb->skb).pid,
28                                 cb->nlh->nlmsg_seq, NLM_F_MULTI,
29                                 dev) < 0)
30                         break;