Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

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

diff --git a/drivers/net/skfp/fplustm.c b/drivers/net/skfp/fplustm.c
index 76e7844..0784f55 100644 (file)
--- a/drivers/net/skfp/fplustm.c
+++ b/drivers/net/skfp/fplustm.c
@@ -89,21 +89,21 @@ static const u_short my_sagp = 0xffff ;     /* short group address (n.u.) */
 /*
  * useful interrupt bits
  */
-static int mac_imsk1u = FM_STXABRS | FM_STXABRA0 | FM_SXMTABT ;
-static int mac_imsk1l = FM_SQLCKS | FM_SQLCKA0 | FM_SPCEPDS | FM_SPCEPDA0|
+static const int mac_imsk1u = FM_STXABRS | FM_STXABRA0 | FM_SXMTABT ;
+static const int mac_imsk1l = FM_SQLCKS | FM_SQLCKA0 | FM_SPCEPDS | FM_SPCEPDA0|
                        FM_STBURS | FM_STBURA0 ;
 
        /* delete FM_SRBFL after tests */
-static int mac_imsk2u = FM_SERRSF | FM_SNFSLD | FM_SRCVOVR | FM_SRBFL |
+static const int mac_imsk2u = FM_SERRSF | FM_SNFSLD | FM_SRCVOVR | FM_SRBFL |
                        FM_SMYCLM ;
-static int mac_imsk2l = FM_STRTEXR | FM_SDUPCLM | FM_SFRMCTR |
+static const int mac_imsk2l = FM_STRTEXR | FM_SDUPCLM | FM_SFRMCTR |
                        FM_SERRCTR | FM_SLSTCTR |
                        FM_STRTEXP | FM_SMULTDA | FM_SRNGOP ;
 
-static int mac_imsk3u = FM_SRCVOVR2 | FM_SRBFL2 ;
-static int mac_imsk3l = FM_SRPERRQ2 | FM_SRPERRQ1 ;
+static const int mac_imsk3u = FM_SRCVOVR2 | FM_SRBFL2 ;
+static const int mac_imsk3l = FM_SRPERRQ2 | FM_SRPERRQ1 ;
 
-static int mac_beacon_imsk2u = FM_SOTRBEC | FM_SMYBEC | FM_SBEC |
+static const int mac_beacon_imsk2u = FM_SOTRBEC | FM_SMYBEC | FM_SBEC |
                        FM_SLOCLM | FM_SHICLM | FM_SMYCLM | FM_SCLM ;
 
 
@@ -549,12 +549,12 @@ void formac_tx_restart(struct s_smc *smc)
 static void enable_formac(struct s_smc *smc)
 {
        /* set formac IMSK : 0 enables irq */
-       outpw(FM_A(FM_IMSK1U),~mac_imsk1u) ;
-       outpw(FM_A(FM_IMSK1L),~mac_imsk1l) ;
-       outpw(FM_A(FM_IMSK2U),~mac_imsk2u) ;
-       outpw(FM_A(FM_IMSK2L),~mac_imsk2l) ;
-       outpw(FM_A(FM_IMSK3U),~mac_imsk3u) ;
-       outpw(FM_A(FM_IMSK3L),~mac_imsk3l) ;
+       outpw(FM_A(FM_IMSK1U),(unsigned short)~mac_imsk1u);
+       outpw(FM_A(FM_IMSK1L),(unsigned short)~mac_imsk1l);
+       outpw(FM_A(FM_IMSK2U),(unsigned short)~mac_imsk2u);
+       outpw(FM_A(FM_IMSK2L),(unsigned short)~mac_imsk2l);
+       outpw(FM_A(FM_IMSK3U),(unsigned short)~mac_imsk3u);
+       outpw(FM_A(FM_IMSK3L),(unsigned short)~mac_imsk3l);
 }
 
 #if 0  /* Removed because the driver should use the ASICs TX complete IRQ. */
@@ -1114,30 +1114,6 @@ void mac_clear_multicast(struct s_smc *smc)
        }
 }
 
-/*
-       BEGIN_MANUAL_ENTRY(if,func;others;2)
-
-       int mac_set_func_addr(smc,f_addr)
-       struct s_smc *smc ;
-       u_long f_addr ;
-
-Function       DOWNCALL        (SMT, fplustm.c)
-               Set a Token-Ring functional address, the address will
-               be activated after calling mac_update_multicast()
-
-Para   f_addr  functional bits in non-canonical format
-
-Returns        0: always success
-
-       END_MANUAL_ENTRY()
- */
-int mac_set_func_addr(struct s_smc *smc, u_long f_addr)
-{
-       smc->hw.fp.func_addr = f_addr ;
-       return(0) ;
-}
-
-
 /*
        BEGIN_MANUAL_ENTRY(if,func;others;2)
 
@@ -1202,52 +1178,6 @@ int mac_add_multicast(struct s_smc *smc, struct fddi_addr *addr, int can)
        return(0) ;
 }
 
-/*
-       BEGIN_MANUAL_ENTRY(if,func;others;2)
-
-       void mac_del_multicast(smc,addr,can)
-       struct s_smc *smc ;
-       struct fddi_addr *addr ;
-       int can ;
-
-Function       DOWNCALL        (SMT, fplustm.c)
-               Delete an entry from the multicast table
-
-Para   addr    pointer to a multicast address
-       can     = 0:    the multicast address has the physical format
-               = 1:    the multicast address has the canonical format
-               | 0x80  permanent
-
-       END_MANUAL_ENTRY()
- */
-void mac_del_multicast(struct s_smc *smc, struct fddi_addr *addr, int can)
-{
-       SK_LOC_DECL(struct fddi_addr,own) ;
-       struct s_fpmc   *tb ;
-
-       if (!(tb = mac_get_mc_table(smc,addr,&own,1,can & ~0x80)))
-               return ;
-       /*
-        * permanent addresses must be deleted with perm bit
-        * and vice versa
-        */
-       if (( tb->perm &&  (can & 0x80)) ||
-           (!tb->perm && !(can & 0x80))) {
-               /*
-                * delete it
-                */
-               if (tb->n) {
-                       tb->n-- ;
-                       if (tb->perm) {
-                               smc->hw.fp.smt_slots_used-- ;
-                       }
-                       else {
-                               smc->hw.fp.os_slots_used-- ;
-                       }
-               }
-       }
-}
-
 /*
  * mode
  */