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

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

Merge "net: PPPoPNS: use updated data_ready API definition"

parents b9ae0269 631c06e7

drivers/net/ppp/pppopns.c

+1 −1
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ drop: 
	return NET_RX_DROP;

}



static void pppopns_recv(struct sock *sk_raw, int length)

static void pppopns_recv(struct sock *sk_raw)

{

	struct sk_buff *skb;

	while ((skb = skb_dequeue(&sk_raw->sk_receive_queue))) {

include/linux/if_pppox.h

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ struct pppopns_opt { 
	__u16		remote;

	__u32		recv_sequence;

	__u32		xmit_sequence;

	void		(*data_ready)(struct sock *sk_raw, int length);

	void		(*data_ready)(struct sock *sk_raw);

	int		(*backlog_rcv)(struct sock *sk_raw, struct sk_buff *skb);

};