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

Commit 5bb2d8a2 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "pppolac: pull udp header before sock enqueue"

parents 44ce0ec9 c2f249d6

drivers/net/ppp/pppolac.c

+4 −3
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ static int pppolac_recv_core(struct sock *sk_udp, struct sk_buff *skb) 


	/* Put it back if it is a control packet. */

	if (skb->data[sizeof(struct udphdr)] & L2TP_CONTROL_BIT)

		return opt->backlog_rcv(sk_udp, skb);

		return 2;



	/* Skip UDP header. */

	skb_pull(skb, sizeof(struct udphdr));
@@ -190,9 +190,10 @@ static int pppolac_recv_core(struct sock *sk_udp, struct sk_buff *skb) 


static int pppolac_recv(struct sock *sk_udp, struct sk_buff *skb)

{

	int retval;

	sock_hold(sk_udp);

	sk_receive_skb(sk_udp, skb, 0);

	return 0;

	retval =  sk_receive_skb(sk_udp, skb, 0);

	return (retval >> 1);

}



static struct sk_buff_head delivery_queue;