summaryrefslogtreecommitdiffstats
path: root/net/strparser
diff options
context:
space:
mode:
authorJohn Fastabend <john.fastabend@gmail.com>2017-08-16 01:30:47 -0400
committerDavid S. Miller <davem@davemloft.net>2017-08-16 14:27:52 -0400
commitf26de110f4f1d8d2490d1f9f003d5abbde030f03 (patch)
tree32fc03dceb672f28fb7f098799d92451ae817681 /net/strparser
parentd369bcaf7dcbe1a5d09ed2e519f35e4841303003 (diff)
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: John Fastabend <john.fastabend@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/strparser')
-rw-r--r--net/strparser/strparser.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/net/strparser/strparser.c b/net/strparser/strparser.c
index 0d18fbc6f870..434aa6637a52 100644
--- a/net/strparser/strparser.c
+++ b/net/strparser/strparser.c
@@ -373,6 +373,9 @@ static int strp_read_sock(struct strparser *strp)
373 struct socket *sock = strp->sk->sk_socket; 373 struct socket *sock = strp->sk->sk_socket;
374 read_descriptor_t desc; 374 read_descriptor_t desc;
375 375
376 if (unlikely(!sock || !sock->ops || !sock->ops->read_sock))
377 return -EBUSY;
378
376 desc.arg.data = strp; 379 desc.arg.data = strp;
377 desc.error = 0; 380 desc.error = 0;
378 desc.count = 1; /* give more than one skb per call */ 381 desc.count = 1; /* give more than one skb per call */
@@ -486,12 +489,7 @@ int strp_init(struct strparser *strp, struct sock *sk,
486 * The upper layer calls strp_process for each skb to be parsed. 489 * The upper layer calls strp_process for each skb to be parsed.
487 */ 490 */
488 491
489 if (sk) { 492 if (!sk) {
490 struct socket *sock = sk->sk_socket;
491
492 if (!sock->ops->read_sock || !sock->ops->peek_len)
493 return -EAFNOSUPPORT;
494 } else {
495 if (!cb->lock || !cb->unlock) 493 if (!cb->lock || !cb->unlock)
496 return -EINVAL; 494 return -EINVAL;
497 } 495 }