serial167: prepare to push BKL down into drivers

[linux-2.6-omap-h63xx.git] / drivers / net / skfp / fplustm.c

diff --git a/drivers/net/skfp/fplustm.c b/drivers/net/skfp/fplustm.c
index 0784f558ca9a395e2f36b22fa5e802b16376e9ae..6028bbb3b28a5f9c1e1ff36de421bb0066e62e18 100644 (file)
--- a/drivers/net/skfp/fplustm.c
+++ b/drivers/net/skfp/fplustm.c
@@ -22,7 +22,7 @@
 #include "h/fddi.h"
 #include "h/smc.h"
 #include "h/supern_2.h"
-#include "can.c"
+#include <linux/bitrev.h>
 
 #ifndef        lint
 static const char ID_sccs[] = "@(#)fplustm.c   1.32 99/02/23 (C) SK " ;
@@ -398,21 +398,21 @@ static void copy_tx_mac(struct s_smc *smc, u_long td, struct fddi_mac *mac,
 /* u_long td;           transmit descriptor */
 /* struct fddi_mac *mac; mac frame pointer */
 /* unsigned off;        start address within buffer memory */
-/* int len ;            lenght of the frame including the FC */
+/* int len ;            length of the frame including the FC */
 {
        int     i ;
-       u_int   *p ;
+       __le32  *p ;
 
        CHECK_NPP() ;
        MARW(off) ;             /* set memory address reg for writes */
 
-       p = (u_int *) mac ;
+       p = (__le32 *) mac ;
        for (i = (len + 3)/4 ; i ; i--) {
                if (i == 1) {
                        /* last word, set the tag bit */
                        outpw(FM_A(FM_CMDREG2),FM_ISTTB) ;
                }
-               write_mdr(smc,MDR_REVERSE(*p)) ;
+               write_mdr(smc,le32_to_cpu(*p)) ;
                p++ ;
        }
 
@@ -444,7 +444,7 @@ static void copy_tx_mac(struct s_smc *smc, u_long td, struct fddi_mac *mac,
  */
 static void directed_beacon(struct s_smc *smc)
 {
-       SK_LOC_DECL(u_int,a[2]) ;
+       SK_LOC_DECL(__le32,a[2]) ;
 
        /*
         * set UNA in frame
@@ -458,9 +458,9 @@ static void directed_beacon(struct s_smc *smc)
        CHECK_NPP() ;
         /* set memory address reg for writes */
        MARW(smc->hw.fp.fifo.rbc_ram_start+DBEACON_FRAME_OFF+4) ;
-       write_mdr(smc,MDR_REVERSE(a[0])) ;
+       write_mdr(smc,le32_to_cpu(a[0])) ;
        outpw(FM_A(FM_CMDREG2),FM_ISTTB) ;      /* set the tag bit */
-       write_mdr(smc,MDR_REVERSE(a[1])) ;
+       write_mdr(smc,le32_to_cpu(a[1])) ;
 
        outpw(FM_A(FM_SABC),smc->hw.fp.fifo.rbc_ram_start + DBEACON_FRAME_OFF) ;
 }
@@ -1073,7 +1073,7 @@ static struct s_fpmc* mac_get_mc_table(struct s_smc *smc,
        if (can) {
                p = own->a ;
                for (i = 0 ; i < 6 ; i++, p++)
-                       *p = canonical[*p] ;
+                       *p = bitrev8(*p);
        }
        slot = NULL;
        for (i = 0, tb = smc->hw.fp.mc.table ; i < FPMAX_MULTICAST ; i++, tb++){