From: Jon Medhurst Date: Wed, 19 Aug 2015 12:43:16 +0000 (+0100) Subject: ANDROID: net: PPPoPNS: Remove length argument from data_ready X-Git-Tag: android-x86-7.1-r1~142^2~1059 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=30cd6394b8e1ae6f751b746ea24779fa812db170;p=android-x86%2Fkernel.git ANDROID: net: PPPoPNS: Remove length argument from data_ready The argument was removed by commit 676d23690fb6 ("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: Jon Medhurst Signed-off-by: Amit Pundir --- diff --git a/drivers/net/ppp/pppopns.c b/drivers/net/ppp/pppopns.c index 6016d29c0660..dc15f978c922 100644 --- a/drivers/net/ppp/pppopns.c +++ b/drivers/net/ppp/pppopns.c @@ -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))) { diff --git a/include/linux/if_pppox.h b/include/linux/if_pppox.h index 960ad12d042b..325727a7096a 100644 --- a/include/linux/if_pppox.h +++ b/include/linux/if_pppox.h @@ -58,7 +58,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); };