a02-swconfig-revert-portid-snd_portid-usage.patch 1002 B

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