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 <tixy@linaro.org>
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>

diff --git a/drivers/net/ppp/pppopns.c b/drivers/net/ppp/pppopns.c
index 6016d29..dc15f97 100644 (file)
--- 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 960ad12..325727a 100644 (file)
--- 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);
 };