aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/ppp_deflate.c4
-rw-r--r--drivers/net/ppp_generic.c2
-rw-r--r--drivers/net/ppp_synctty.c2
-rw-r--r--drivers/net/pppoe.c2
-rw-r--r--drivers/net/slhc.c4
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)
206 * Returns the length of the compressed packet, or 0 if the 206 * Returns the length of the compressed packet, or 0 if the
207 * packet is incompressible. 207 * packet is incompressible.
208 */ 208 */
209int z_compress(void *arg, unsigned char *rptr, unsigned char *obuf, 209static int z_compress(void *arg, unsigned char *rptr, unsigned char *obuf,
210 int isize, int osize) 210 int isize, int osize)
211{ 211{
212 struct ppp_deflate_state *state = (struct ppp_deflate_state *) arg; 212 struct ppp_deflate_state *state = (struct ppp_deflate_state *) arg;
@@ -435,7 +435,7 @@ static void z_decomp_reset(void *arg)
435 * bug, so we return DECOMP_FATALERROR for them in order to turn off 435 * bug, so we return DECOMP_FATALERROR for them in order to turn off
436 * compression, even though they are detected by inspecting the input. 436 * compression, even though they are detected by inspecting the input.
437 */ 437 */
438int z_decompress(void *arg, unsigned char *ibuf, int isize, 438static int z_decompress(void *arg, unsigned char *ibuf, int isize,
439 unsigned char *obuf, int osize) 439 unsigned char *obuf, int osize)
440{ 440{
441 struct ppp_deflate_state *state = (struct ppp_deflate_state *) arg; 441 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)
1871 * complete packet, or we get to the sequence number for a fragment 1871 * complete packet, or we get to the sequence number for a fragment
1872 * which hasn't arrived but might still do so. 1872 * which hasn't arrived but might still do so.
1873 */ 1873 */
1874struct sk_buff * 1874static struct sk_buff *
1875ppp_mp_reconstruct(struct ppp *ppp) 1875ppp_mp_reconstruct(struct ppp *ppp)
1876{ 1876{
1877 u32 seq = ppp->nextseq; 1877 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)
560 * Procedures for encapsulation and framing. 560 * Procedures for encapsulation and framing.
561 */ 561 */
562 562
563struct sk_buff* 563static struct sk_buff*
564ppp_sync_txmunge(struct syncppp *ap, struct sk_buff *skb) 564ppp_sync_txmunge(struct syncppp *ap, struct sk_buff *skb)
565{ 565{
566 int proto; 566 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:
989} 989}
990 990
991static void *pppoe_seq_start(struct seq_file *seq, loff_t *pos) 991static void *pppoe_seq_start(struct seq_file *seq, loff_t *pos)
992 __acquires(pppoe_hash_lock)
992{ 993{
993 loff_t l = *pos; 994 loff_t l = *pos;
994 995
@@ -1022,6 +1023,7 @@ out:
1022} 1023}
1023 1024
1024static void pppoe_seq_stop(struct seq_file *seq, void *v) 1025static void pppoe_seq_stop(struct seq_file *seq, void *v)
1026 __releases(pppoe_hash_lock)
1025{ 1027{
1026 read_unlock_bh(&pppoe_hash_lock); 1028 read_unlock_bh(&pppoe_hash_lock);
1027} 1029}
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)
174 174
175 175
176/* Encode a number */ 176/* Encode a number */
177unsigned char * 177static unsigned char *
178encode(unsigned char *cp, unsigned short n) 178encode(unsigned char *cp, unsigned short n)
179{ 179{
180 if(n >= 256 || n == 0){ 180 if(n >= 256 || n == 0){
@@ -199,7 +199,7 @@ pull16(unsigned char **cpp)
199} 199}
200 200
201/* Decode a number */ 201/* Decode a number */
202long 202static long
203decode(unsigned char **cpp) 203decode(unsigned char **cpp)
204{ 204{
205 register int x; 205 register int x;