Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

[linux-2.6] / drivers / net / skfp / smt.c

diff --git a/drivers/net/skfp/smt.c b/drivers/net/skfp/smt.c
index fe847800acdcd85ac2a962668d6a0b19eadd7415..ffbfb1b79f97360975cd8da31d198591fde55037 100644 (file)
--- a/drivers/net/skfp/smt.c
+++ b/drivers/net/skfp/smt.c
@@ -712,7 +712,7 @@ void smt_received_pack(struct s_smc *smc, SMbuf *mb, int fs)
                        smc->mib.priv.fddiPRIVECF_Reply_Rx++ ;
                        DB_SMT("SMT: received ECF reply from %s\n",
                                addr_to_string(&sm->smt_source),0) ;
-                       if (sm_to_para(smc,sm,SMT_P_ECHODATA) == 0) {
+                       if (sm_to_para(smc,sm,SMT_P_ECHODATA) == NULL) {
                                DB_SMT("SMT: ECHODATA missing\n",0,0) ;
                                break ;
                        }
@@ -1654,7 +1654,7 @@ static const struct smt_pdef {
        { SMT_P4053,    0,      SWAP_SMT_P4053                  } ,
 } ;
 
-#define N_SMT_PLEN     (sizeof(smt_pdef)/sizeof(smt_pdef[0]))
+#define N_SMT_PLEN     ARRAY_SIZE(smt_pdef)
 
 int smt_check_para(struct s_smc *smc, struct smt_header        *sm,
                   const u_short list[])
@@ -1748,7 +1748,7 @@ char *addr_to_string(struct fddi_addr *addr)
 #endif
 
 #ifdef AM29K
-smt_ifconfig(int argc, char *argv[])
+int smt_ifconfig(int argc, char *argv[])
 {
        if (argc >= 2 && !strcmp(argv[0],"opt_bypass") &&
            !strcmp(argv[1],"yes")) {