fddi: Use a more more typical logging style
Subsystems (3)
PATCH 1/1 fddi: Use a more more typical logging style
Use macros that don't require fixed argument counts so format and arguments can be verified by the compiler.
Miscellanea:
o Remove a few #if uses to allow dynamic debug to always work
o whitespace neatening
Signed-off-by Joe Perches <[email protected]>
--- drivers/net/fddi/skfp/cfm.c | 16 +++---- drivers/net/fddi/skfp/drvfbi.c | 2 +- drivers/net/fddi/skfp/ecm.c | 16 +++---- drivers/net/fddi/skfp/ess.c | 51 ++++++++++---------- drivers/net/fddi/skfp/fplustm.c | 10 ++-- drivers/net/fddi/skfp/h/cmtdef.h | 95 +++++++++++++++++++++++++------------- drivers/net/fddi/skfp/h/osdef1st.h | 2 + drivers/net/fddi/skfp/pcmplc.c | 29 ++++++------ drivers/net/fddi/skfp/pmf.c | 2 +- drivers/net/fddi/skfp/rmt.c | 28 ++++++----- drivers/net/fddi/skfp/smt.c | 72 ++++++++++++++--------------- drivers/net/fddi/skfp/srf.c | 12 ++--- 12 files changed, 179 insertions(+), 156 deletions(-)
drivers/net/fddi/skfp/cfm.c +7 -9
@@ -52,7 +52,6 @@ static const char ID_sccs[] = "@(#)cfm.c 2.18 98/10/06 (C) SK " ;#define ACTIONS_DONE () (smc->mib.fddiSMTCF_State &= ~AFLAG)#define ACTIONS (x) (x|AFLAG) -#ifdef DEBUG /* * symbolic state names */
@@ -68,7 +67,6 @@ static const char * const cfm_states[] = {static const char *const cfm_events[] = {"NONE" ,"CF_LOOP_A" ,"CF_LOOP_B" ,"CF_JOIN_A" ,"CF_JOIN_B" } ; -#endif /* * map from state to downstream port type
@@ -233,7 +231,7 @@ void cfm(struct s_smc *smc, int event)DB_CFM ("CFM : state %s%s" , (smc->mib.fddiSMTCF_State &AFLAG ) ?"ACTIONS " :"" , cfm_states[smc->mib.fddiSMTCF_State & ~AFLAG ]) ; -DB_CFM (" event %s\n" ,cfm_events[event],0 ) ; +DB_CFM (" event %s\n" , cfm_events[event]); state = smc->mib.fddiSMTCF_State ;cfm_fsm (smc,event) ; event =0 ;
@@ -297,7 +295,7 @@ static void cfm_fsm(struct s_smc *smc, int cmd)queue_event (smc,EVENT_RMT ,RM_JOIN ) ;/* signal RMT */ /* Don't do the WC-Flag changing here */ ACTIONS_DONE () ; -DB_CFMN (1 ,"CFM : %s\n" ,cfm_states[smc->mib.fddiSMTCF_State],0 ) ; +DB_CFMN (1 ,"CFM : %s\n" , cfm_states[smc->mib.fddiSMTCF_State]);break ;case SC0_ISOLATED :/*SC07*/
@@ -338,7 +336,7 @@ static void cfm_fsm(struct s_smc *smc, int cmd)queue_event (smc,EVENT_RMT ,RM_JOIN ) ;/* signal RMT */ }ACTIONS_DONE () ; -DB_CFMN (1 ,"CFM : %s\n" ,cfm_states[smc->mib.fddiSMTCF_State],0 ) ; +DB_CFMN (1 ,"CFM : %s\n" , cfm_states[smc->mib.fddiSMTCF_State]);break ;case SC9_C_WRAP_A :/*SC10*/
@@ -403,7 +401,7 @@ static void cfm_fsm(struct s_smc *smc, int cmd)queue_event (smc,EVENT_RMT ,RM_JOIN ) ;/* signal RMT */ }ACTIONS_DONE () ; -DB_CFMN (1 ,"CFM : %s\n" ,cfm_states[smc->mib.fddiSMTCF_State],0 ) ; +DB_CFMN (1 ,"CFM : %s\n" , cfm_states[smc->mib.fddiSMTCF_State]);break ;case SC10_C_WRAP_B :/*SC20*/
@@ -448,7 +446,7 @@ static void cfm_fsm(struct s_smc *smc, int cmd) smc->r.rm_join = TRUE ;queue_event (smc,EVENT_RMT ,RM_JOIN ) ;/* signal RMT */ ACTIONS_DONE () ; -DB_CFMN (1 ,"CFM : %s\n" ,cfm_states[smc->mib.fddiSMTCF_State],0 ) ; +DB_CFMN (1 ,"CFM : %s\n" , cfm_states[smc->mib.fddiSMTCF_State]);break ;case SC4_THRU_A :/*SC41*/
@@ -481,7 +479,7 @@ static void cfm_fsm(struct s_smc *smc, int cmd) smc->r.rm_join = TRUE ;queue_event (smc,EVENT_RMT ,RM_JOIN ) ;/* signal RMT */ ACTIONS_DONE () ; -DB_CFMN (1 ,"CFM : %s\n" ,cfm_states[smc->mib.fddiSMTCF_State],0 ) ; +DB_CFMN (1 ,"CFM : %s\n" , cfm_states[smc->mib.fddiSMTCF_State]);break ;case SC5_THRU_B :/*SC51*/
@@ -519,7 +517,7 @@ static void cfm_fsm(struct s_smc *smc, int cmd)queue_event (smc,EVENT_RMT ,RM_JOIN ) ;/* signal RMT */ }ACTIONS_DONE () ; -DB_CFMN (1 ,"CFM : %s\n" ,cfm_states[smc->mib.fddiSMTCF_State],0 ) ; +DB_CFMN (1 ,"CFM : %s\n" , cfm_states[smc->mib.fddiSMTCF_State]);break ;case SC11_C_WRAP_S :/*SC70*/
drivers/net/fddi/skfp/drvfbi.c +1 -1
@@ -344,7 +344,7 @@ void init_board(struct s_smc *smc, u_char *mac_addr)void sm_pm_bypass_req (struct s_smc *smc,int mode) {DB_ECMN (1 ,"ECM : sm_pm_bypass_req(%s)\n" ,(mode ==BP_INSERT ) ? -"BP_INSERT" :"BP_DEINSERT" ,0 ) ; +"BP_INSERT" :"BP_DEINSERT" );if (smc->s.sas !=SMT_DAS )return ;
drivers/net/fddi/skfp/ecm.c +7 -9
@@ -66,7 +66,6 @@ static const char ID_sccs[] = "@(#)ecm.c 2.7 99/08/05 (C) SK " ;#define EC6_CHECK 6/* checking bypass */ #define EC7_DEINSERT 7/* bypass being turnde off */ -#ifdef DEBUG /* * symbolic state names */
@@ -83,7 +82,6 @@ static const char * const ecm_events[] = {"EC_TIMEOUT_TD" ,"EC_TIMEOUT_TMAX" , "EC_TIMEOUT_IMAX","EC_TIMEOUT_INMAX","EC_TEST_DONE" } ; -#endif /* * all Globals are defined in smc.h
@@ -129,7 +127,7 @@ void ecm(struct s_smc *smc, int event)DB_ECM ("ECM : state %s%s" , (smc->mib.fddiSMTECMState &AFLAG ) ?"ACTIONS " :"" , ecm_states[smc->mib.fddiSMTECMState & ~AFLAG ]) ; -DB_ECM (" event %s\n" ,ecm_events[event],0 ) ; +DB_ECM (" event %s\n" , ecm_events[event]); state = smc->mib.fddiSMTECMState ;ecm_fsm (smc,event) ; event =0 ;
@@ -379,7 +377,7 @@ static void ecm_fsm(struct s_smc *smc, int cmd) (((ls_a == PC_ILS) && (ls_b == PC_QLS)) || ((ls_a == PC_QLS) && (ls_b == PC_ILS)))){ smc->e.sb_flag = TRUE ; -DB_ECMN (1 ,"ECM : EC6_CHECK - stuck bypass\n" ,0 ,0 ) ; +DB_ECMN (1 ,"ECM : EC6_CHECK - stuck bypass\n" );AIX_EVENT (smc, (u_long )FDDI_RING_STATUS , (u_long )FDDI_SMT_ERROR , (u_long )FDDI_BYPASS_STUCK ,smt_get_error_word (smc));
@@ -443,29 +441,29 @@ static void prop_actions(struct s_smc *smc)return ; } -DB_ECM ("ECM : prop_actions - trace_prop %d\n" , smc->e.trace_prop,0 ) ; +DB_ECM ("ECM : prop_actions - trace_prop %lu\n" , smc->e.trace_prop);DB_ECM ("ECM : prop_actions - in %d out %d\n" , port_in,port_out) ;if (smc->e.trace_prop &ENTITY_BIT (ENTITY_MAC )) {/* trace initiatior */ -DB_ECM ("ECM : initiate TRACE on PHY %c\n" ,'A' +port_in-PA ,0 ) ; +DB_ECM ("ECM : initiate TRACE on PHY %c\n" ,'A' + port_in -PA );queue_event (smc,EVENT_PCM +port_in,PC_TRACE ) ; }else if ((smc->e.trace_prop &ENTITY_BIT (ENTITY_PHY (PA ))) && port_out !=PA ) {/* trace propagate upstream */ -DB_ECM ("ECM : propagate TRACE on PHY B\n" ,0 ,0 ) ; +DB_ECM ("ECM : propagate TRACE on PHY B\n" );queue_event (smc,EVENT_PCMB ,PC_TRACE ) ; }else if ((smc->e.trace_prop &ENTITY_BIT (ENTITY_PHY (PB ))) && port_out !=PB ) {/* trace propagate upstream */ -DB_ECM ("ECM : propagate TRACE on PHY A\n" ,0 ,0 ) ; +DB_ECM ("ECM : propagate TRACE on PHY A\n" );queue_event (smc,EVENT_PCMA ,PC_TRACE ) ; }else {/* signal trace termination */ -DB_ECM ("ECM : TRACE terminated\n" ,0 ,0 ) ; +DB_ECM ("ECM : TRACE terminated\n" ); smc->e.path_test =PT_PENDING ; } smc->e.trace_prop =0 ;
drivers/net/fddi/skfp/ess.c +26 -25
176 lines not on this page · raw message
drivers/net/fddi/skfp/fplustm.c +5 -5
@@ -726,7 +726,7 @@ void mac2_irq(struct s_smc *smc, u_short code_s2u, u_short code_s2l)if (code_s2u &FM_SMYBEC )queue_event (smc,EVENT_RMT ,RM_MY_BEACON ) ;if (change_s2u & code_s2u &FM_SLOCLM ) { -DB_RMTN (2 ,"RMT : lower claim received\n" ,0 ,0 ) ; +DB_RMTN (2 ,"RMT : lower claim received\n" ); }if ((code_s2u &FM_SMYCLM ) && !(code_s2l &FM_SDUPCLM )) {/*
@@ -746,7 +746,7 @@ void mac2_irq(struct s_smc *smc, u_short code_s2u, u_short code_s2l)queue_event (smc,EVENT_RMT ,RM_VALID_CLAIM ) ; }if (change_s2u & code_s2u &FM_SHICLM ) { -DB_RMTN (2 ,"RMT : higher claim received\n" ,0 ,0 ) ; +DB_RMTN (2 ,"RMT : higher claim received\n" ); }if ( (code_s2l &FM_STRTEXP ) || (code_s2l &FM_STRTEXR ) )
@@ -1334,7 +1334,7 @@ void rtm_irq(struct s_smc *smc)outpw (ADDR (B2_RTM_CRTL ),TIM_CL_IRQ ) ;/* clear IRQ */ if (inpw (ADDR (B2_RTM_CRTL )) &TIM_RES_TOK ) {outpw (FM_A (FM_CMDREG1 ),FM_ICL ) ;/* force claim */ -DB_RMT ("RMT: fddiPATHT_Rmode expired\n" ,0 ,0 ) ; +DB_RMT ("RMT: fddiPATHT_Rmode expired\n" );AIX_EVENT (smc, (u_long )FDDI_RING_STATUS , (u_long )FDDI_SMT_EVENT , (u_long )FDDI_RTT ,smt_get_event_word (smc));
@@ -1354,7 +1354,7 @@ void rtm_set_timer(struct s_smc *smc)* MIB timer and hardware timer have the same resolution of 80nS */ DB_RMT ("RMT: setting new fddiPATHT_Rmode, t = %d ns\n" , - (int ) smc->mib.a[PATH0 ].fddiPATHT_Rmode,0 ) ; + (int )smc->mib.a[PATH0 ].fddiPATHT_Rmode);outpd (ADDR (B2_RTM_INI ),smc->mib.a[PATH0 ].fddiPATHT_Rmode) ; }
@@ -1469,7 +1469,7 @@ static void smt_split_up_fifo(struct s_smc *smc) smc->hw.fp.fifo.rx2_fifo_start = smc->hw.fp.fifo.tx_a0_start + smc->hw.fp.fifo.tx_a0_size ; -DB_SMT ("FIFO split: mode = %x\n" ,smc->hw.fp.fifo.fifo_config_mode,0 ) ; +DB_SMT ("FIFO split: mode = %x\n" , smc->hw.fp.fifo.fifo_config_mode);DB_SMT ("rbc_ram_start = %x rbc_ram_end = %x\n" , smc->hw.fp.fifo.rbc_ram_start, smc->hw.fp.fifo.rbc_ram_end) ; DB_SMT("rx1_fifo_start = %x tx_s_start = %x\n",
drivers/net/fddi/skfp/h/cmtdef.h +64 -31
114 lines not on this page · raw message
drivers/net/fddi/skfp/h/osdef1st.h +2 -0
@@ -54,6 +54,8 @@#ifdef DEBUG #define printf(s,args...) printk(KERN_INFO s, ## args) +#else +#define printf(s, args...) do { if (0) printk(KERN_INFO s, ## args); } while (0)#endif // #define HW_PTR u_long
drivers/net/fddi/skfp/pcmplc.c +13 -16
@@ -91,7 +91,6 @@ int p#define PC8_ACTIVE 8#define PC9_MAINT 9 -#ifdef DEBUG /* * symbolic state names */
@@ -113,7 +112,6 @@ static const char * const pcm_events[] = {"PC_TIMEOUT_TL_MIN" ,"PC_TIMEOUT_T_NEXT" ,"PC_TIMEOUT_LCT" , "PC_NSE","PC_LEM" } ; -#endif #ifdef MOT_ELM /*
@@ -1017,7 +1015,7 @@ static void pcm_fsm(struct s_smc *smc, struct s_phy *phy, int cmd)ACTIONS_DONE () ;break ;case PC9_MAINT : -DB_PCMN (1 ,"PCM %c : MAINT\n" ,phy->phy_name,0 ) ; +DB_PCMN (1 ,"PCM %c : MAINT\n" , phy->phy_name);/*PC90*/ if (cmd ==PC_ENABLE ) {GO_STATE (PC0_OFF ) ;
@@ -1126,13 +1124,12 @@ static void lem_evaluate(struct s_smc *smc, struct s_phy *phy) }if (lem->lem_errors) { -DB_PCMN (1 ,"LEM %c :\n" ,phy->np ==PB ?'B' :'A' ,0 ) ; -DB_PCMN (1 ,"errors : %ld\n" ,lem->lem_errors,0 ) ; -DB_PCMN (1 ,"sum_errors : %ld\n" ,mib->fddiPORTLem_Ct,0 ) ; -DB_PCMN (1 ,"current BER : 10E-%d\n" ,ber/100 ,0 ) ; -DB_PCMN (1 ,"float BER : 10E-(%d/100)\n" ,lem->lem_float_ber,0 ) ; -DB_PCMN (1 ,"avg. BER : 10E-%d\n" , - mib->fddiPORTLer_Estimate,0 ) ; +DB_PCMN (1 ,"LEM %c :\n" , phy->np ==PB ?'B' :'A' ); +DB_PCMN (1 ,"errors : %ld\n" , lem->lem_errors); +DB_PCMN (1 ,"sum_errors : %ld\n" , mib->fddiPORTLem_Ct); +DB_PCMN (1 ,"current BER : 10E-%d\n" , ber /100 ); +DB_PCMN (1 ,"float BER : 10E-(%d/100)\n" , lem->lem_float_ber); +DB_PCMN (1 ,"avg. BER : 10E-%d\n" , mib->fddiPORTLer_Estimate); } lem->lem_errors =0L ;
@@ -1213,7 +1210,7 @@ static void lem_check_lct(struct s_smc *smc, struct s_phy *phy) phy->pc_lem_fail = TRUE ;break ; } -DB_PCMN (1 ," >>errors : %d\n" ,lem->lem_errors,0 ) ; +DB_PCMN (1 ," >>errors : %lu\n" , lem->lem_errors); }if (phy->pc_lem_fail) { mib->fddiPORTLCTFail_Ct++ ;
@@ -1299,7 +1296,7 @@ static void pc_rcode_actions(struct s_smc *smc, int bit, struct s_phy *phy)if (mib->fddiPORTMy_Type ==TM && mib->fddiPORTNeighborType ==TM ) {DB_PCMN (1 ,"PCM %c : E100 withhold M-M\n" , - phy->phy_name,0 ) ; + phy->phy_name); mib->fddiPORTPC_Withhold =PC_WH_M_M ;RS_SET (smc,RS_EVENT ) ; }
@@ -1322,7 +1319,7 @@ static void pc_rcode_actions(struct s_smc *smc, int bit, struct s_phy *phy) mib->fddiPORTPC_Withhold =PC_WH_OTHER ;RS_SET (smc,RS_EVENT ) ;DB_PCMN (1 ,"PCM %c : E101 withhold other\n" , - phy->phy_name,0 ) ; + phy->phy_name); } phy->twisted = ((mib->fddiPORTMy_Type != TS) && (mib->fddiPORTMy_Type != TM) &&
@@ -1330,7 +1327,7 @@ static void pc_rcode_actions(struct s_smc *smc, int bit, struct s_phy *phy) mib->fddiPORTMy_Type)) ;if (phy->twisted) {DB_PCMN (1 ,"PCM %c : E102 !!! TWISTED !!!\n" , - phy->phy_name,0 ) ; + phy->phy_name); }break ;case 5 :
@@ -1368,7 +1365,7 @@ static void pc_rcode_actions(struct s_smc *smc, int bit, struct s_phy *phy)if (phy->t_next[7 ] > smc->s.pcm_lc_medium) {start_pcm_timer0 (smc,phy->t_next[7 ],PC_TIMEOUT_LCT ,phy); } -DB_PCMN (1 ,"LCT timer = %ld us\n" , phy->t_next[7 ],0 ) ; +DB_PCMN (1 ,"LCT timer = %ld us\n" , phy->t_next[7 ]); phy->t_next[9 ] = smc->s.pcm_t_next_9 ;break ;case 7 :
@@ -1530,7 +1527,7 @@ static void pc_tcode_actions(struct s_smc *smc, const int bit, struct s_phy *phylem_check_lct (smc,phy) ;if (phy->pc_lem_fail) {DB_PCMN (1 ,"PCM %c : E104 LCT failed\n" , - phy->phy_name,0 ) ; + phy->phy_name); phy->t_val[7 ] =1 ; }else
drivers/net/fddi/skfp/pmf.c +1 -1
@@ -284,7 +284,7 @@ void smt_pmf_received_pack(struct s_smc *smc, SMbuf *mb, int local)SMbuf *reply ; sm = smtod(mb,struct smt_header *) ; -DB_SMT ("SMT: processing PMF frame at %x len %d\n" ,sm,mb->sm_len) ; +DB_SMT ("SMT: processing PMF frame at %p len %d\n" , sm, mb->sm_len);#ifdef DEBUG dump_smt (smc,sm,"PMF Received" ) ;#endif
drivers/net/fddi/skfp/rmt.c +13 -15
@@ -70,7 +70,6 @@ static const char ID_sccs[] = "@(#)rmt.c 2.13 99/07/02 (C) SK " ;#define RM6_DIRECTED 6/* sending directed beacons */ #define RM7_TRACE 7/* trace initiated */ -#ifdef DEBUG /* * symbolic state names */
@@ -91,7 +90,6 @@ static const char * const rmt_events[] = {"RM_TIMEOUT_ANNOUNCE" ,"RM_TIMEOUT_T_DIRECT" , "RM_TIMEOUT_D_MAX","RM_TIMEOUT_POLL","RM_TX_STATE_CHANGE" } ; -#endif /* * Globals
@@ -150,9 +148,9 @@ void rmt(struct s_smc *smc, int event) do { DB_RMT("RMT : state %s%s", - (smc->mib.m[MAC0].fddiMACRMTState & AFLAG) ? "ACTIONS " : "", - rmt_states[smc->mib.m[MAC0].fddiMACRMTState & ~AFLAG]) ; - DB_RMT(" event %s\n",rmt_events[event],0) ; + (smc->mib.m[MAC0].fddiMACRMTState & AFLAG) ? "ACTIONS " : "", + rmt_states[smc->mib.m[MAC0].fddiMACRMTState & ~AFLAG]); + DB_RMT(" event %s\n", rmt_events[event]); state = smc->mib.m[MAC0].fddiMACRMTState ; rmt_fsm(smc,event) ; event = 0 ;
@@ -191,7 +189,7 @@ static void rmt_fsm(struct s_smc *smc, int cmd) smc->r.loop_avail = FALSE ; smc->r.sm_ma_avail = FALSE ; smc->r.no_flag = TRUE ; -DB_RMTN (1 ,"RMT : ISOLATED\n" ,0 ,0 ) ; +DB_RMTN (1 ,"RMT : ISOLATED\n" );ACTIONS_DONE () ;break ;case RM0_ISOLATED :
@@ -213,7 +211,7 @@ static void rmt_fsm(struct s_smc *smc, int cmd)stop_rmt_timer1 (smc) ;stop_rmt_timer2 (smc) ;sm_ma_control (smc,MA_BEACON ) ; -DB_RMTN (1 ,"RMT : RING DOWN\n" ,0 ,0 ) ; +DB_RMTN (1 ,"RMT : RING DOWN\n" );RS_SET (smc,RS_NORINGOP ) ; smc->r.sm_ma_avail = FALSE ;rmt_indication (smc,0 ) ;
@@ -248,7 +246,7 @@ static void rmt_fsm(struct s_smc *smc, int cmd)else smc->mib.m[MAC0 ].fddiMACMA_UnitdataAvailable = FALSE ; } -DB_RMTN (1 ,"RMT : RING UP\n" ,0 ,0 ) ; +DB_RMTN (1 ,"RMT : RING UP\n" );RS_CLEAR (smc,RS_NORINGOP ) ;RS_SET (smc,RS_RINGOPCHANGE ) ;rmt_indication (smc,1 ) ;
@@ -285,7 +283,7 @@ static void rmt_fsm(struct s_smc *smc, int cmd)start_rmt_timer1 (smc,smc->s.rmt_t_stuck,RM_TIMEOUT_T_STUCK ) ;start_rmt_timer2 (smc,smc->s.rmt_t_poll,RM_TIMEOUT_POLL ) ;sm_mac_check_beacon_claim (smc) ; -DB_RMTN (1 ,"RMT : RM3_DETECT\n" ,0 ,0 ) ; +DB_RMTN (1 ,"RMT : RM3_DETECT\n" );ACTIONS_DONE () ;break ;case RM3_DETECT :
@@ -327,7 +325,7 @@ static void rmt_fsm(struct s_smc *smc, int cmd)* trace ! */ if ((tx =sm_mac_get_tx_state (smc)) ==4 || tx ==5 ) { -DB_RMTN (2 ,"RMT : DETECT && TRT_EXPIRED && T4/T5\n" ,0 ,0 ); +DB_RMTN (2 ,"RMT : DETECT && TRT_EXPIRED && T4/T5\n" ); smc->r.bn_flag = TRUE ;/* * If one of the upstream stations beaconed
@@ -378,7 +376,7 @@ static void rmt_fsm(struct s_smc *smc, int cmd)start_rmt_timer1 (smc,smc->s.rmt_t_stuck,RM_TIMEOUT_T_STUCK ) ;start_rmt_timer2 (smc,smc->s.rmt_t_poll,RM_TIMEOUT_POLL ) ;sm_mac_check_beacon_claim (smc) ; -DB_RMTN (1 ,"RMT : RM4_NON_OP_DUP\n" ,0 ,0 ) ; +DB_RMTN (1 ,"RMT : RM4_NON_OP_DUP\n" );ACTIONS_DONE () ;break ;case RM4_NON_OP_DUP :
@@ -406,7 +404,7 @@ static void rmt_fsm(struct s_smc *smc, int cmd)* trace ! */ if ((tx =sm_mac_get_tx_state (smc)) ==4 || tx ==5 ) { -DB_RMTN (2 ,"RMT : NOPDUP && TRT_EXPIRED && T4/T5\n" ,0 ,0 ); +DB_RMTN (2 ,"RMT : NOPDUP && TRT_EXPIRED && T4/T5\n" ); smc->r.bn_flag = TRUE ;/* * If one of the upstream stations beaconed
@@ -448,7 +446,7 @@ static void rmt_fsm(struct s_smc *smc, int cmd)stop_rmt_timer0 (smc) ;stop_rmt_timer1 (smc) ;stop_rmt_timer2 (smc) ; -DB_RMTN (1 ,"RMT : RM5_RING_OP_DUP\n" ,0 ,0 ) ; +DB_RMTN (1 ,"RMT : RM5_RING_OP_DUP\n" );ACTIONS_DONE () ;break ;case RM5_RING_OP_DUP :
@@ -472,7 +470,7 @@ static void rmt_fsm(struct s_smc *smc, int cmd)start_rmt_timer2 (smc,smc->s.rmt_t_poll,RM_TIMEOUT_POLL ) ;sm_ma_control (smc,MA_DIRECTED ) ;RS_SET (smc,RS_BEACON ) ; -DB_RMTN (1 ,"RMT : RM6_DIRECTED\n" ,0 ,0 ) ; +DB_RMTN (1 ,"RMT : RM6_DIRECTED\n" );ACTIONS_DONE () ;break ;case RM6_DIRECTED :
@@ -515,7 +513,7 @@ static void rmt_fsm(struct s_smc *smc, int cmd)stop_rmt_timer2 (smc) ; smc->e.trace_prop |=ENTITY_BIT (ENTITY_MAC ) ;queue_event (smc,EVENT_ECM ,EC_TRACE_PROP ) ; -DB_RMTN (1 ,"RMT : RM7_TRACE\n" ,0 ,0 ) ; +DB_RMTN (1 ,"RMT : RM7_TRACE\n" );ACTIONS_DONE () ;break ;case RM7_TRACE :
drivers/net/fddi/skfp/smt.c +35 -37
238 lines not on this page · raw message
drivers/net/fddi/skfp/srf.c +5 -7
@@ -173,7 +173,6 @@ static struct s_srf_evc *smt_get_evc(struct s_smc *smc, int code, int index)#define THRESHOLD_2 (2*TICKS_PER_SECOND)#define THRESHOLD_32 (32*TICKS_PER_SECOND) -#ifdef DEBUG static const char *const srf_names[] = {"None" ,"MACPathChangeEvent" ,"MACNeighborChangeEvent" ,"PORTPathChangeEvent" ,"PORTUndesiredConnectionAttemptEvent" ,
@@ -182,7 +181,6 @@ static const char * const srf_names[] = {"MACNotCopiedCondition" ,"PORTEBErrorCondition" , "PORTLerCondition" } ; -#endif void smt_srf_event (struct s_smc *smc,int code,int index,int cond) {
@@ -201,7 +199,7 @@ void smt_srf_event(struct s_smc *smc, int code, int index, int cond)DB_SMT ("SRF: %s index %d\n" ,srf_names[code],index) ;if (!(evc =smt_get_evc (smc,code,index))) { -DB_SMT ("SRF : smt_get_evc() failed\n" ,0 ,0 ) ; +DB_SMT ("SRF : smt_get_evc() failed\n" );return ; }/*
@@ -217,7 +215,7 @@ void smt_srf_event(struct s_smc *smc, int code, int index, int cond)*/ smt_set_timestamp (smc,smc->mib.fddiSMTTransitionTimeStamp) ;if (SMT_IS_CONDITION (code)) { -DB_SMT ("SRF: condition is %s\n" ,cond ?"ON" :"OFF" ,0 ) ; +DB_SMT ("SRF: condition is %s\n" , cond ?"ON" :"OFF" );if (cond) { *evc->evc_cond_state = TRUE ; evc->evc_rep_required = TRUE ;
@@ -414,9 +412,9 @@ static void smt_send_srf(struct s_smc *smc) smt->smt_len =SMT_MAX_INFO_LEN - pcon.pc_len ; mb->sm_len = smt->smt_len +sizeof (struct smt_header ) ; -DB_SMT ("SRF: sending SRF at %p, len %d\n" ,smt,mb->sm_len) ; -DB_SMT ("SRF: state SR%d Threshold %d\n" , - smc->srf.sr_state,smc->srf.SRThreshold/TICKS_PER_SECOND ) ; +DB_SMT ("SRF: sending SRF at %p, len %d\n" , smt, mb->sm_len); +DB_SMT ("SRF: state SR%d Threshold %lu\n" , + smc->srf.sr_state, smc->srf.SRThreshold /TICKS_PER_SECOND );#ifdef DEBUG dump_smt (smc,smt,"SRF Send" ) ;#endif
David Miller
maintainerFrom: Joe Perches <[email protected]>
Date: Sun, 02 Aug 2015 21:27:45 -0700
Quoted 9 lines
Use macros that don't require fixed argument counts so format and arguments can be verified by the compiler.
Miscellanea:
o Remove a few #if uses to allow dynamic debug to always work
o whitespace neateningSigned-off-by Joe Perches <[email protected]>
This doesn't apply cleanly to net-next, please respin.
Quoted 6 lines · David Miller
From: Joe Perches <[email protected]>
Date: Sun, 02 Aug 2015 21:27:45 -0700Quoted 3 lines
Use macros that don't require fixed argument counts so format and arguments can be verified by the compiler.
Quoted 8 lines
Quoted 6 lines
Miscellanea:
o Remove a few #if uses to allow dynamic debug to always work
o whitespace neateningSigned-off-by Joe Perches <[email protected]>This doesn't apply cleanly to net-next, please respin.
Apologies for that. I used a newer version of the Evolution email client (3.16.0) which corrupts tabs. 3.16.3 doesn't seem to do that.
I'll probably downgrade back to the old 3.12 version though. It doesn't send some attachments properly, but the editor at least works well.