Merge to Fedora kernel-2.6.7-1.492

[linux-2.6.git] / drivers / net / skfp / smtdef.c

diff --git a/drivers/net/skfp/smtdef.c b/drivers/net/skfp/smtdef.c
index beaed26..91fa855 100644 (file)
--- a/drivers/net/skfp/smtdef.c
+++ b/drivers/net/skfp/smtdef.c
@@ -72,13 +72,11 @@ static const char ID_sccs[] = "@(#)smtdef.c 2.53 99/08/11 (C) SK " ;
 #define DEFAULT_LCT_EXTEND     50
 
 /* Forward declarations */
-extern  void   smt_reset_defaults ();
-static void    smt_init_mib ();
+void smt_reset_defaults(struct s_smc *smc, int level);
+static void smt_init_mib(struct s_smc *smc, int level);
+static int set_min_max(int maxflag, u_long mib, u_long limit, u_long *oper);
 
-static int set_min_max() ;
-
-void smt_set_defaults(smc)
-struct s_smc *smc ;
+void smt_set_defaults(struct s_smc *smc)
 {
        smt_reset_defaults(smc,0) ;
 }
@@ -86,9 +84,7 @@ struct s_smc *smc ;
 #define MS2BCLK(x)     ((x)*12500L)
 #define US2BCLK(x)     ((x)*1250L)
 
-void smt_reset_defaults(smc,level)
-struct s_smc *smc ;
-int level ;
+void smt_reset_defaults(struct s_smc *smc, int level)
 {
        struct smt_config       *smt ;
        int                     i ;
@@ -170,9 +166,7 @@ static const char man_data[32] =
 /*      01234567890123456789012345678901       */
        "xxxSK-NET FDDI SMT 7.3 - V2.8.8" ;
 
-static void smt_init_mib(smc,level)
-struct s_smc *smc ;
-int level ;
+static void smt_init_mib(struct s_smc *smc, int level)
 {
        struct fddi_mib         *mib ;
        struct fddi_mib_p       *pm ;
@@ -292,8 +286,7 @@ int level ;
        (void) smt_set_mac_opvalues(smc) ;
 }
 
-int smt_set_mac_opvalues(smc)
-struct s_smc *smc ;
+int smt_set_mac_opvalues(struct s_smc *smc)
 {
        int     st ;
        int     st2 ;
@@ -318,8 +311,7 @@ struct s_smc *smc ;
        return(st) ;
 }
 
-void smt_fixup_mib(smc)
-struct s_smc *smc ;
+void smt_fixup_mib(struct s_smc *smc)
 {
 #ifdef CONCENTRATOR
        switch (smc->s.sas) {
@@ -355,11 +347,7 @@ struct s_smc *smc ;
  *     use mib
  * NOTE : numbers are negative, negate comparison !
  */
-static int set_min_max(maxflag,mib,limit,oper)
-int maxflag ;
-u_long mib ;
-u_long limit ;
-u_long *oper ;
+static int set_min_max(int maxflag, u_long mib, u_long limit, u_long *oper)
 {
        u_long  old ;
        old = *oper ;
@@ -369,3 +357,4 @@ u_long *oper ;
                *oper = mib ;
        return(old != *oper) ;
 }
+