patch-2.4.3 linux/drivers/net/skfp/srf.c

Next file: linux/drivers/net/slhc.c
Previous file: linux/drivers/net/skfp/skfddi.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.2/linux/drivers/net/skfp/srf.c linux/drivers/net/skfp/srf.c
@@ -197,7 +197,7 @@
 	struct s_srf_evc	*evc ;
 	int			cond_asserted = 0 ;
 	int			cond_deasserted = 0 ;
-	int			event_occured = 0 ;
+	int			event_occurred = 0 ;
 	int			tsr ;
 	int			T_Limit = 2*TICKS_PER_SECOND ;
 
@@ -246,7 +246,7 @@
 				*evc->evc_multiple  = FALSE ;
 			}
 			smc->srf.any_report = TRUE ;
-			event_occured = TRUE ;
+			event_occurred = TRUE ;
 		}
 #ifdef	FDDI_MIB
 		snmp_srf_event(smc,evc) ;
@@ -268,7 +268,7 @@
 			break ;
 		}
 		/* SR01c */
-		if (event_occured && tsr < T_Limit) {
+		if (event_occurred && tsr < T_Limit) {
 			smc->srf.sr_state = SR1_HOLDOFF ;
 			break ;
 		}
@@ -286,7 +286,7 @@
 			break ;
 		}
 		/* SR00d */
-		if (event_occured && tsr >= T_Limit) {
+		if (event_occurred && tsr >= T_Limit) {
 			smc->srf.TSR = smt_get_time() ;
 			smt_send_srf(smc) ;
 			break ;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)