diff options
| author | Stephen Hemminger <shemminger@vyatta.com> | 2008-01-23 20:54:07 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-28 15:11:27 -0800 |
| commit | 3c582b30bc2592081e9b23e253ca098fa7d57dc2 (patch) | |
| tree | 258f0191bb66aee5de4fb2d19bf71d7c716bee87 /drivers/net | |
| parent | ac97f75faae2a18648145bc6bbcdd326bac6a1c2 (diff) | |
| download | linux-3c582b30bc2592081e9b23e253ca098fa7d57dc2.tar.gz | |
[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: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ppp_deflate.c | 4 | ||||
| -rw-r--r-- | drivers/net/ppp_generic.c | 2 | ||||
| -rw-r--r-- | drivers/net/ppp_synctty.c | 2 | ||||
| -rw-r--r-- | drivers/net/pppoe.c | 2 | ||||
| -rw-r--r-- | drivers/net/slhc.c | 4 |
5 files changed, 8 insertions, 6 deletions
diff --git a/drivers/net/ppp_deflate.c b/drivers/net/ppp_deflate.c index eb98b661efba..034c1c650bcb 100644 --- a/drivers/net/ppp_deflate.c +++ b/drivers/net/ppp_deflate.c @@ -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; diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c index 4f690378bb77..4dc5b4b7a561 100644 --- a/drivers/net/ppp_generic.c +++ b/drivers/net/ppp_generic.c @@ -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; diff --git a/drivers/net/ppp_synctty.c b/drivers/net/ppp_synctty.c index f7472c8505f0..0d80fa546719 100644 --- a/drivers/net/ppp_synctty.c +++ b/drivers/net/ppp_synctty.c @@ -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; diff --git a/drivers/net/pppoe.c b/drivers/net/pppoe.c index a005d8f4c38e..ac0ac98b19cd 100644 --- a/drivers/net/pppoe.c +++ b/drivers/net/pppoe.c @@ -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); } diff --git a/drivers/net/slhc.c b/drivers/net/slhc.c index 163469739db2..d640c0f5470b 100644 --- a/drivers/net/slhc.c +++ b/drivers/net/slhc.c @@ -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; |