Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f26de110 authored by John Fastabend's avatar John Fastabend Committed by David S. Miller
Browse files

net: early init support for strparser 



It is useful to allow strparser to init sockets before the read_sock
callback has been established.

Signed-off-by: default avatarJohn Fastabend <john.fastabend@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d369bcaf

net/strparser/strparser.c

+4 −6
Original line number Diff line number Diff line
@@ -373,6 +373,9 @@ static int strp_read_sock(struct strparser *strp) 
	struct socket *sock = strp->sk->sk_socket;

	read_descriptor_t desc;



	if (unlikely(!sock || !sock->ops || !sock->ops->read_sock))

		return -EBUSY;



	desc.arg.data = strp;

	desc.error = 0;

	desc.count = 1; /* give more than one skb per call */
@@ -486,12 +489,7 @@ int strp_init(struct strparser *strp, struct sock *sk, 
	 * The upper layer calls strp_process for each skb to be parsed.

	 */



	if (sk) {

		struct socket *sock = sk->sk_socket;



		if (!sock->ops->read_sock || !sock->ops->peek_len)

			return -EAFNOSUPPORT;

	} else {

	if (!sk) {

		if (!cb->lock || !cb->unlock)

			return -EINVAL;

	}