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

Commit 3c582b30 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller
Browse files

[PPP]: Sparse warning fixes. 



Fix a bunch of warnings in PPP and related drivers. Mostly because
sparse doesn't like it when the the function is only marked private in
the forward declaration.

Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ac97f75f

drivers/net/ppp_deflate.c

+2 −2
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ static void z_comp_reset(void *arg) 
 *	Returns the length of the compressed packet, or 0 if the

 *	packet is incompressible.

 */

int z_compress(void *arg, unsigned char *rptr, unsigned char *obuf,

static int z_compress(void *arg, unsigned char *rptr, unsigned char *obuf,

	       int isize, int osize)

{

	struct ppp_deflate_state *state = (struct ppp_deflate_state *) arg;
@@ -435,7 +435,7 @@ static void z_decomp_reset(void *arg) 
 * bug, so we return DECOMP_FATALERROR for them in order to turn off

 * compression, even though they are detected by inspecting the input.

 */

int z_decompress(void *arg, unsigned char *ibuf, int isize,

static int z_decompress(void *arg, unsigned char *ibuf, int isize,

		 unsigned char *obuf, int osize)

{

	struct ppp_deflate_state *state = (struct ppp_deflate_state *) arg;

drivers/net/ppp_generic.c

+1 −1
Original line number Diff line number Diff line
@@ -1871,7 +1871,7 @@ ppp_mp_insert(struct ppp *ppp, struct sk_buff *skb) 
 * complete packet, or we get to the sequence number for a fragment

 * which hasn't arrived but might still do so.

 */

struct sk_buff *

static struct sk_buff *

ppp_mp_reconstruct(struct ppp *ppp)

{

	u32 seq = ppp->nextseq;

drivers/net/ppp_synctty.c

+1 −1
Original line number Diff line number Diff line
@@ -560,7 +560,7 @@ static void ppp_sync_process(unsigned long arg) 
 * Procedures for encapsulation and framing.

 */



struct sk_buff*

static struct sk_buff*

ppp_sync_txmunge(struct syncppp *ap, struct sk_buff *skb)

{

	int proto;

drivers/net/pppoe.c

+2 −0
Original line number Diff line number Diff line
@@ -989,6 +989,7 @@ out: 
}



static void *pppoe_seq_start(struct seq_file *seq, loff_t *pos)

	__acquires(pppoe_hash_lock)

{

	loff_t l = *pos;
@@ -1022,6 +1023,7 @@ out: 
}



static void pppoe_seq_stop(struct seq_file *seq, void *v)

	__releases(pppoe_hash_lock)

{

	read_unlock_bh(&pppoe_hash_lock);

}

drivers/net/slhc.c

+2 −2
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ put16(unsigned char *cp, unsigned short x) 




/* Encode a number */

unsigned char *

static unsigned char *

encode(unsigned char *cp, unsigned short n)

{

	if(n >= 256 || n == 0){
@@ -199,7 +199,7 @@ pull16(unsigned char **cpp) 
}



/* Decode a number */

long

static long

decode(unsigned char **cpp)

{

	register int x;