Skip to contentSkip to conversation

netlink: do not store start function in netlink_cb

PATCH In review Florian Westphal 2 participants 2 messages Jul 24, 2018

Subsystems (2)
Networking Network drivers
lore
Share & tools
lore

Florian Westphal

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
---
 include/linux/netlink.h  | 1 -
 net/netlink/af_netlink.c | 5 ++---
 2 files changed, 2 insertions(+), 4 deletions(-)
include/linux/netlink.h +0 -1
index f3075d6c7e82..71f121b66ca8 100644
@@ -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);
net/netlink/af_netlink.c +2 -3
index 393573a99a5a..f6ac7693d2cc 100644
@@ -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;
 	}
Signature · 1 line
2.16.4