shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 11:26:02 +09:00
Code Issues Packages Projects Releases Wiki Activity

ANDROID: net: PPPoPNS: Remove length argument from data_ready

Browse Source 
The argument was removed by commit 676d23690f ("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>
This commit is contained in:
Jon Medhurst
2015-08-19 13:43:16 +01:00
committed by Dmitry Shmidt
parent 19205d2ca0
commit 30cd6394b8
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/ppp/pppopns.c
View File

@@ -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))) {

2
include/linux/if_pppox.h
View File

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