diff options
| author | Jon Medhurst <tixy@linaro.org> | 2015-08-19 13:43:16 +0100 |
|---|---|---|
| committer | Amit Pundir <amit.pundir@linaro.org> | 2015-09-10 22:08:04 +0530 |
| commit | 0f8248fb0227260c0f5f154f5ce3822a7930b42e (patch) | |
| tree | b5f1cf5a902f807abd8943b6c74579748097498f | |
| parent | 1f550878003f4e75b7820973f5dae1422b065f64 (diff) | |
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>
| -rw-r--r-- | drivers/net/ppp/pppopns.c | 2 | ||||
| -rw-r--r-- | include/linux/if_pppox.h | 2 |
2 files changed, 2 insertions, 2 deletions
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 dccd621d6377..070ec7d0df43 100644 --- a/include/linux/if_pppox.h +++ b/include/linux/if_pppox.h @@ -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); }; |