This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "".
The branch, master has been updated via d742f6e7c93b9c17e138e4dad403934aebad6e2e (commit) via f6d90f60520bcb3f082fab55bc9d2140c22e5742 (commit) from b9002efa6e12fafc901794aa5f6a99ef306d944b (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit d742f6e7c93b9c17e138e4dad403934aebad6e2e Author: Matias Elo matias.elo@nokia.com Date: Thu Nov 28 11:00:29 2019 +0200
example: switch: disable IPv4 hashing
Pure IPv4 hashing is not supported by all DPDK pktio drivers.
Signed-off-by: Matias Elo matias.elo@nokia.com Reviewed-by: Petri Savolainen petri.savolainen@nokia.com
diff --git a/example/switch/odp_switch.c b/example/switch/odp_switch.c index 616bb43b9..b73d8a50c 100644 --- a/example/switch/odp_switch.c +++ b/example/switch/odp_switch.c @@ -263,7 +263,6 @@ static int create_pktio(const char *dev, int idx, int num_rx, int num_tx, }
pktin_param.hash_enable = 1; - pktin_param.hash_proto.proto.ipv4 = 1; pktin_param.hash_proto.proto.ipv4_tcp = 1; pktin_param.hash_proto.proto.ipv4_udp = 1; pktin_param.num_queues = num_rx;
commit f6d90f60520bcb3f082fab55bc9d2140c22e5742 Author: Matias Elo matias.elo@nokia.com Date: Thu Nov 28 10:49:56 2019 +0200
example: switch: change 'unsigned' variables to 'unsigned int'
Fixes checkpatch's prefer 'unsigned int' to bare use of 'unsigned' warnings.
Signed-off-by: Matias Elo matias.elo@nokia.com Reviewed-by: Petri Savolainen petri.savolainen@nokia.com
diff --git a/example/switch/odp_switch.c b/example/switch/odp_switch.c index 026af6ec8..616bb43b9 100644 --- a/example/switch/odp_switch.c +++ b/example/switch/odp_switch.c @@ -53,7 +53,7 @@ typedef union { */ typedef struct { unsigned int cpu_count; /**< Number of CPUs to be used */ - unsigned if_count; /**< Number of interfaces to be used */ + unsigned int if_count; /**< Number of interfaces to be used */ int num_workers; /**< Number of worker threads */ char **if_names; /**< Array of pointers to interface names */ int time; /**< Time in seconds to run */ @@ -84,7 +84,7 @@ typedef union ODP_ALIGNED_CACHE { */ typedef struct pkt_buf_t { odp_packet_t pkt[MAX_PKT_BURST]; /**< Array of packet handles */ - unsigned len; /**< Number of packets in buffer */ + unsigned int len; /**< Number of packets in buffer */ } pkt_buf_t;
/** @@ -438,7 +438,7 @@ static inline void broadcast_packet(odp_packet_t pkt, thread_args_t *thr_arg, { odp_bool_t first = 1; uint8_t port_out; - unsigned buf_len; + unsigned int buf_len;
for (port_out = 0; port_out < gbl_args->appl.if_count; port_out++) { if (port_out == port_in) @@ -476,13 +476,13 @@ static inline void broadcast_packet(odp_packet_t pkt, thread_args_t *thr_arg, * @param thr_arg Thread arguments * @param port_in Input port index */ -static inline void forward_packets(odp_packet_t pkt_tbl[], unsigned num, +static inline void forward_packets(odp_packet_t pkt_tbl[], unsigned int num, thread_args_t *thr_arg, uint8_t port_in) { odp_packet_t pkt; odph_ethhdr_t *eth; - unsigned i; - unsigned buf_id; + unsigned int i; + unsigned int buf_id; int ret; uint8_t port_out = 0;
@@ -584,8 +584,8 @@ static int run_worker(void *arg) odp_packet_t pkt_tbl[MAX_PKT_BURST]; odp_pktin_queue_t pktin; odp_pktout_queue_t pktout; - unsigned num_pktio; - unsigned pktio = 0; + unsigned int num_pktio; + unsigned int pktio = 0; uint8_t port_in; uint8_t port_out; int pkts; @@ -598,7 +598,7 @@ static int run_worker(void *arg)
while (!gbl_args->exit_threads) { int sent; - unsigned drops; + unsigned int drops;
if (num_pktio > 1) { pktin = thr_args->rx_pktio[pktio].pktin; @@ -620,7 +620,7 @@ static int run_worker(void *arg) /* Empty all thread local tx buffers */ for (port_out = 0; port_out < gbl_args->appl.if_count; port_out++) { - unsigned tx_pkts; + unsigned int tx_pkts; odp_packet_t *tx_pkt_tbl;
if (port_out == port_in || @@ -642,7 +642,7 @@ static int run_worker(void *arg) drops = tx_pkts - sent;
if (odp_unlikely(drops)) { - unsigned i; + unsigned int i;
thr_args->stats[port_out]->s.tx_drops += drops;
@@ -746,7 +746,7 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) int long_index; char *token; size_t len; - unsigned i; + unsigned int i; static const struct option longopts[] = { {"count", required_argument, NULL, 'c'}, {"time", required_argument, NULL, 't'}, @@ -840,7 +840,7 @@ static void parse_args(int argc, char *argv[], appl_args_t *appl_args) */ static void print_info(char *progname, appl_args_t *appl_args) { - unsigned i; + unsigned int i;
odp_sys_info_print();
@@ -922,7 +922,7 @@ int main(int argc, char **argv) } gbl_args_init(gbl_args);
- for (i = 0; (unsigned)i < MAC_TBL_SIZE; i++) + for (i = 0; (unsigned int)i < MAC_TBL_SIZE; i++) odp_atomic_init_u64(&gbl_args->mac_tbl[i], 0);
/* Parse and store the application arguments */
-----------------------------------------------------------------------
Summary of changes: example/switch/odp_switch.c | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-)
hooks/post-receive