@@ -2515,9 +2515,9 @@ ff_rss_tbl_init(void)
25152515 ff_rss_tbl [idx ].sport != sport ))) {
25162516 printf ("There are too many 2-tuble(> %d) of saddrs(max %d) * sport(max %d),"
25172517 " this 4-tuple rss_tbl config will be ignored,"
2518- " idx %d, port_id %u, daddr %u , saddr %u , sport %u\n" ,
2518+ " idx %d, port_id %u, daddr " NIPQUAD_FMT " , saddr " NIPQUAD_FMT " , sport %u\n" ,
25192519 FF_RSS_TBL_MAX_SADDR_SPORT_ENTRIES , FF_RSS_TBL_MAX_SADDR , FF_RSS_TBL_MAX_SPORT ,
2520- i , ctx .port_id , daddr , saddr , sport );
2520+ i , ctx .port_id , NIPQUAD ( daddr ), NIPQUAD ( saddr ), ntohs ( sport ) );
25212521 goto IGNORE ;
25222522 //ff_veth_free_softc(sc);
25232523 //return -1;
@@ -2535,17 +2535,18 @@ ff_rss_tbl_init(void)
25352535 /* Dup 3-tuple */
25362536 printf ("Duplicate ff rss table 3-tuple,"
25372537 " this 4-tuple rss_tbl config will be ignored,"
2538- " port_id %u, daddr %u , saddr %u , sport %u\n" ,
2539- ctx .port_id , daddr , saddr , sport );
2538+ " port_id %u, daddr " NIPQUAD_FMT " , saddr " NIPQUAD_FMT " , sport %u\n" ,
2539+ ctx .port_id , NIPQUAD ( daddr ), NIPQUAD ( saddr ), ntohs ( sport ) );
25402540 goto IGNORE ;
25412541 }
25422542 } while (daddr_idx != ori_daddr_idx );
25432543
25442544 if (daddr_idx == ori_daddr_idx && ff_rss_tbl [idx ].dip_tbl [daddr_idx ].daddr != INADDR_ANY ) {
25452545 printf ("There are too many daddrs(> %d) with same saddr and sport,"
25462546 " this 4-tuple rss_tbl config will be ignored,"
2547- " idx %d, port_id %u, daddr %u, saddr %u, sport %u\n" ,
2548- i , FF_RSS_TBL_MAX_DADDR , ctx .port_id , daddr , saddr , sport );
2547+ " idx %d, port_id %u, daddr " NIPQUAD_FMT ", saddr " NIPQUAD_FMT ", sport %u\n" ,
2548+ i , FF_RSS_TBL_MAX_DADDR , ctx .port_id ,
2549+ NIPQUAD (daddr ), NIPQUAD (saddr ), ntohs (sport ));
25492550 goto IGNORE ;
25502551 //return -1; /* Not used now */
25512552 }
@@ -2586,7 +2587,7 @@ ff_rss_tbl_init(void)
25862587 printf ("Inited one ff_rss_tbl success, port_id %u, daddr " NIPQUAD_FMT
25872588 ", saddr " NIPQUAD_FMT ", sport %u,"
25882589 " last idx %u, available lport num %u\n" ,
2589- ctx .port_id , NIPQUAD (daddr ), NIPQUAD (saddr ), htons (sport ),
2590+ ctx .port_id , NIPQUAD (daddr ), NIPQUAD (saddr ), ntohs (sport ),
25902591 ff_rss_tbl [idx ].dip_tbl [daddr_idx ].last_idx ,
25912592 ff_rss_tbl [idx ].dip_tbl [daddr_idx ].num );
25922593
@@ -2650,7 +2651,7 @@ ff_rss_tbl_set_portrange(uint16_t first, uint16_t last)
26502651
26512652 if (ff_rss_tbl [i ].dip_tbl [j ].first_idx == 0 ||
26522653 ff_rss_tbl [i ].dip_tbl [j ].last_idx < ff_rss_tbl [i ].dip_tbl [j ].first_idx ) {
2653- fprintf ( stderr , "ff_rss_tbl_set_portrange failed, first %u, last %u\n" ,
2654+ printf ( "ff_rss_tbl_set_portrange failed, first %u, last %u\n" ,
26542655 first , last );
26552656 return -1 ;
26562657 }
0 commit comments