diff options
| author | Florian Westphal <fw@strlen.de> | 2018-07-24 12:47:56 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-07-24 10:04:49 -0700 |
| commit | 3730cf4dd70b6a36e48d58a862120311411b77f5 (patch) | |
| tree | 2c3f8b40770c5296d58e7e3e85135edcf7e071aa | |
| parent | c93622b53e7ab41baab2563df0ac425afd1b45c3 (diff) | |
| download | linux-3730cf4dd70b6a36e48d58a862120311411b77f5.tar.gz | |
netlink: do not store start function in netlink_cb
->start() is called once when dump is being initialized, there is no need to store it in netlink_cb. Signed-off-by: Florian Westphal <fw@strlen.de> Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/linux/netlink.h | 1 | ||||
| -rw-r--r-- | net/netlink/af_netlink.c | 5 |
2 files changed, 2 insertions, 4 deletions
diff --git a/include/linux/netlink.h b/include/linux/netlink.h index f3075d6c7e82..71f121b66ca8 100644 --- a/include/linux/netlink.h +++ b/include/linux/netlink.h @@ -170,7 +170,6 @@ netlink_skb_clone(struct sk_buff *skb, gfp_t gfp_mask) struct netlink_callback { struct sk_buff *skb; const struct nlmsghdr *nlh; - int (*start)(struct netlink_callback *); int (*dump)(struct sk_buff * skb, struct netlink_callback *cb); int (*done)(struct netlink_callback *cb); diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c index 393573a99a5a..f6ac7693d2cc 100644 --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c @@ -2300,7 +2300,6 @@ int __netlink_dump_start(struct sock *ssk, struct sk_buff *skb, cb = &nlk->cb; memset(cb, 0, sizeof(*cb)); - cb->start = control->start; cb->dump = control->dump; cb->done = control->done; cb->nlh = nlh; @@ -2309,8 +2308,8 @@ int __netlink_dump_start(struct sock *ssk, struct sk_buff *skb, cb->min_dump_alloc = control->min_dump_alloc; cb->skb = skb; - if (cb->start) { - ret = cb->start(cb); + if (control->start) { + ret = control->start(cb); if (ret) goto error_put; } |