diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2017-04-12 14:34:07 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-04-13 13:58:22 -0400 |
| commit | fceb6435e85298f747fee938415057af837f5a8a (patch) | |
| tree | 45bceaf19df703caa5e7ea839f7b35a7f9ebc332 /net/netfilter/nfnetlink.c | |
| parent | ba0dc5f6e0ba5a5d2f575bcdb35e5d1960cf7c04 (diff) | |
| download | op-kernel-dev-fceb6435e85298f747fee938415057af837f5a8a.zip op-kernel-dev-fceb6435e85298f747fee938415057af837f5a8a.tar.gz | |
netlink: pass extended ACK struct to parsing functions
Pass the new extended ACK reporting struct to all of the generic
netlink parsing functions. For now, pass NULL in almost all callers
(except for some in the core.)
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter/nfnetlink.c')
| -rw-r--r-- | net/netfilter/nfnetlink.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/net/netfilter/nfnetlink.c b/net/netfilter/nfnetlink.c index 181d3bb..792def0 100644 --- a/net/netfilter/nfnetlink.c +++ b/net/netfilter/nfnetlink.c @@ -192,8 +192,8 @@ replay: int attrlen = nlh->nlmsg_len - min_len; __u8 subsys_id = NFNL_SUBSYS_ID(type); - err = nla_parse(cda, ss->cb[cb_id].attr_count, - attr, attrlen, ss->cb[cb_id].policy); + err = nla_parse(cda, ss->cb[cb_id].attr_count, attr, attrlen, + ss->cb[cb_id].policy, NULL); if (err < 0) { rcu_read_unlock(); return err; @@ -377,8 +377,8 @@ replay: struct nlattr *attr = (void *)nlh + min_len; int attrlen = nlh->nlmsg_len - min_len; - err = nla_parse(cda, ss->cb[cb_id].attr_count, - attr, attrlen, ss->cb[cb_id].policy); + err = nla_parse(cda, ss->cb[cb_id].attr_count, attr, + attrlen, ss->cb[cb_id].policy, NULL); if (err < 0) goto ack; @@ -467,7 +467,8 @@ static void nfnetlink_rcv_skb_batch(struct sk_buff *skb, struct nlmsghdr *nlh) skb->len < NLMSG_HDRLEN + sizeof(struct nfgenmsg)) return; - err = nla_parse(cda, NFNL_BATCH_MAX, attr, attrlen, nfnl_batch_policy); + err = nla_parse(cda, NFNL_BATCH_MAX, attr, attrlen, nfnl_batch_policy, + NULL); if (err < 0) { netlink_ack(skb, nlh, err, NULL); return; |
