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

Commit 0f8248fb authored by Jon Medhurst's avatar Jon Medhurst Committed by Amit Pundir
Browse files

net: PPPoPNS: Remove length argument from data_ready 



The argument was removed by commit 676d2369 ("net: Fix use after free by
removing length arg from sk_data_ready callbacks") and it's presence causes
warnings like:

drivers/net/ppp/pppopns.c:296:27: warning: assignment from incompatible pointer type
  po->proto.pns.data_ready = sk_raw->sk_data_ready;

Signed-off-by: default avatarJon Medhurst <tixy@linaro.org>
parent 1f550878

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);

};