Skip to content

Commit

Permalink
[PPP]: Sparse warning fixes.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Stephen Hemminger authored and David S. Miller committed Jan 28, 2008
1 parent ac97f75 commit 3c582b3
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 6 deletions.
4 changes: 2 additions & 2 deletions drivers/net/ppp_deflate.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/ppp_generic.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/ppp_synctty.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 2 additions & 0 deletions drivers/net/pppoe.c
Original file line number Diff line number Diff line change
Expand Up @@ -989,6 +989,7 @@ static __inline__ struct pppox_sock *pppoe_get_idx(loff_t pos)
}

static void *pppoe_seq_start(struct seq_file *seq, loff_t *pos)
__acquires(pppoe_hash_lock)
{
loff_t l = *pos;

Expand Down Expand Up @@ -1022,6 +1023,7 @@ static void *pppoe_seq_next(struct seq_file *seq, void *v, loff_t *pos)
}

static void pppoe_seq_stop(struct seq_file *seq, void *v)
__releases(pppoe_hash_lock)
{
read_unlock_bh(&pppoe_hash_lock);
}
Expand Down
4 changes: 2 additions & 2 deletions drivers/net/slhc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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){
Expand All @@ -199,7 +199,7 @@ pull16(unsigned char **cpp)
}

/* Decode a number */
long
static long
decode(unsigned char **cpp)
{
register int x;
Expand Down

0 comments on commit 3c582b3

Please sign in to comment.