Wed, Apr 12, 2017 at 02:34:08PM CEST, johannes@xxxxxxxxxxxxxxxx wrote: >From: Johannes Berg <johannes.berg@xxxxxxxxx> > >This is an add-on to the previous patch that passes >the extended ACK structure where it's already available >by existing genl_info or extack function arguments. > >This was done with this spatch (with some manual >adjustment of indentation): > >@@ >expression A, B, C, D, E; >identifier fn, info; >@@ >fn(..., struct genl_info *info, ...) { >... >-nlmsg_parse(A, B, C, D, E, NULL) >+nlmsg_parse(A, B, C, D, E, info->extack) >... >} > >@@ >expression A, B, C, D, E; >identifier fn, info; >@@ >fn(..., struct genl_info *info, ...) { ><... >-nla_parse_nested(A, B, C, D, NULL) >+nla_parse_nested(A, B, C, D, info->extack) >...> >} > >@@ >expression A, B, C, D, E; >identifier fn, extack; >@@ >fn(..., struct netlink_ext_ack *extack, ...) { ><... >-nlmsg_parse(A, B, C, D, E, NULL) >+nlmsg_parse(A, B, C, D, E, extack) >...> >} > >@@ >expression A, B, C, D, E; >identifier fn, extack; >@@ >fn(..., struct netlink_ext_ack *extack, ...) { ><... >-nla_parse(A, B, C, D, E, NULL) >+nla_parse(A, B, C, D, E, extack) >...> >} > >@@ >expression A, B, C, D, E; >identifier fn, extack; >@@ >fn(..., struct netlink_ext_ack *extack, ...) { >... >-nlmsg_parse(A, B, C, D, E, NULL) >+nlmsg_parse(A, B, C, D, E, extack) >... >} > >@@ >expression A, B, C, D; >identifier fn, extack; >@@ >fn(..., struct netlink_ext_ack *extack, ...) { ><... >-nla_parse_nested(A, B, C, D, NULL) >+nla_parse_nested(A, B, C, D, extack) >...> >} > >@@ >expression A, B, C, D; >identifier fn, extack; >@@ >fn(..., struct netlink_ext_ack *extack, ...) { ><... >-nlmsg_validate(A, B, C, D, NULL) >+nlmsg_validate(A, B, C, D, extack) >...> >} > >@@ >expression A, B, C, D; >identifier fn, extack; >@@ >fn(..., struct netlink_ext_ack *extack, ...) { ><... >-nla_validate(A, B, C, D, NULL) >+nla_validate(A, B, C, D, extack) >...> >} > >@@ >expression A, B, C; >identifier fn, extack; >@@ >fn(..., struct netlink_ext_ack *extack, ...) { ><... >-nla_validate_nested(A, B, C, NULL) >+nla_validate_nested(A, B, C, extack) >...> >} > >Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx> >--- > crypto/crypto_user.c | 2 +- > drivers/net/team/team.c | 3 ++- > net/ieee802154/nl802154.c | 10 +++++----- > net/netfilter/ipvs/ip_vs_ctl.c | 2 +- > net/netfilter/nfnetlink.c | 2 +- > net/netlink/genetlink.c | 2 +- > net/nfc/netlink.c | 2 +- > net/tipc/bearer.c | 14 +++++++------- > net/tipc/net.c | 2 +- > net/tipc/node.c | 8 ++++---- > net/wireless/nl80211.c | 33 ++++++++++++++++++--------------- > net/xfrm/xfrm_user.c | 2 +- > 12 files changed, 43 insertions(+), 39 deletions(-) Aside from the tinyfication of desc lines, this looks good to me Reviewed-by: Jiri Pirko <jiri@xxxxxxxxxxxx>