| Message ID | 20180712215545.21410-3-blp@ovn.org |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [ovs-dev,1/5] netdev-dpdk: Fix incorrect byte order conversion in log message. | expand |
Thanks. The code looks much cleaner. Reviewed-by: Yifeng Sun <pkusunyifeng@gmail.com> On Thu, Jul 12, 2018 at 2:55 PM, Ben Pfaff <blp@ovn.org> wrote: > Signed-off-by: Ben Pfaff <blp@ovn.org> > --- > lib/netdev-dpdk.c | 16 ++++------------ > 1 file changed, 4 insertions(+), 12 deletions(-) > > diff --git a/lib/netdev-dpdk.c b/lib/netdev-dpdk.c > index d485a53dacf1..9bf21856075b 100644 > --- a/lib/netdev-dpdk.c > +++ b/lib/netdev-dpdk.c > @@ -4079,12 +4079,8 @@ dump_flow_pattern(struct rte_flow_item *item) > if (eth_spec) { > VLOG_DBG(" Spec: src="ETH_ADDR_FMT", dst="ETH_ADDR_FMT", " > "type=0x%04" PRIx16"\n", > - eth_spec->src.addr_bytes[0], > eth_spec->src.addr_bytes[1], > - eth_spec->src.addr_bytes[2], > eth_spec->src.addr_bytes[3], > - eth_spec->src.addr_bytes[4], > eth_spec->src.addr_bytes[5], > - eth_spec->dst.addr_bytes[0], > eth_spec->dst.addr_bytes[1], > - eth_spec->dst.addr_bytes[2], > eth_spec->dst.addr_bytes[3], > - eth_spec->dst.addr_bytes[4], > eth_spec->dst.addr_bytes[5], > + ETH_ADDR_BYTES_ARGS(eth_spec->src.addr_bytes), > + ETH_ADDR_BYTES_ARGS(eth_spec->dst.addr_bytes), > ntohs(eth_spec->type)); > } else { > VLOG_DBG(" Spec = null\n"); > @@ -4092,12 +4088,8 @@ dump_flow_pattern(struct rte_flow_item *item) > if (eth_mask) { > VLOG_DBG(" Mask: src="ETH_ADDR_FMT", dst="ETH_ADDR_FMT", " > "type=0x%04"PRIx16"\n", > - eth_mask->src.addr_bytes[0], > eth_mask->src.addr_bytes[1], > - eth_mask->src.addr_bytes[2], > eth_mask->src.addr_bytes[3], > - eth_mask->src.addr_bytes[4], > eth_mask->src.addr_bytes[5], > - eth_mask->dst.addr_bytes[0], > eth_mask->dst.addr_bytes[1], > - eth_mask->dst.addr_bytes[2], > eth_mask->dst.addr_bytes[3], > - eth_mask->dst.addr_bytes[4], > eth_mask->dst.addr_bytes[5], > + ETH_ADDR_BYTES_ARGS(eth_mask->src.addr_bytes), > + ETH_ADDR_BYTES_ARGS(eth_mask->dst.addr_bytes), > eth_mask->type); > } else { > VLOG_DBG(" Mask = null\n"); > -- > 2.16.1 > > _______________________________________________ > dev mailing list > dev@openvswitch.org > https://mail.openvswitch.org/mailman/listinfo/ovs-dev >
On 7/12/2018 10:55 PM, Ben Pfaff wrote: > Signed-off-by: Ben Pfaff <blp@ovn.org> I wasn't aware of ETH_ADDR_BYTES_ARGS(), thanks, will add to the next pull request. Ian > --- > lib/netdev-dpdk.c | 16 ++++------------ > 1 file changed, 4 insertions(+), 12 deletions(-) > > diff --git a/lib/netdev-dpdk.c b/lib/netdev-dpdk.c > index d485a53dacf1..9bf21856075b 100644 > --- a/lib/netdev-dpdk.c > +++ b/lib/netdev-dpdk.c > @@ -4079,12 +4079,8 @@ dump_flow_pattern(struct rte_flow_item *item) > if (eth_spec) { > VLOG_DBG(" Spec: src="ETH_ADDR_FMT", dst="ETH_ADDR_FMT", " > "type=0x%04" PRIx16"\n", > - eth_spec->src.addr_bytes[0], eth_spec->src.addr_bytes[1], > - eth_spec->src.addr_bytes[2], eth_spec->src.addr_bytes[3], > - eth_spec->src.addr_bytes[4], eth_spec->src.addr_bytes[5], > - eth_spec->dst.addr_bytes[0], eth_spec->dst.addr_bytes[1], > - eth_spec->dst.addr_bytes[2], eth_spec->dst.addr_bytes[3], > - eth_spec->dst.addr_bytes[4], eth_spec->dst.addr_bytes[5], > + ETH_ADDR_BYTES_ARGS(eth_spec->src.addr_bytes), > + ETH_ADDR_BYTES_ARGS(eth_spec->dst.addr_bytes), > ntohs(eth_spec->type)); > } else { > VLOG_DBG(" Spec = null\n"); > @@ -4092,12 +4088,8 @@ dump_flow_pattern(struct rte_flow_item *item) > if (eth_mask) { > VLOG_DBG(" Mask: src="ETH_ADDR_FMT", dst="ETH_ADDR_FMT", " > "type=0x%04"PRIx16"\n", > - eth_mask->src.addr_bytes[0], eth_mask->src.addr_bytes[1], > - eth_mask->src.addr_bytes[2], eth_mask->src.addr_bytes[3], > - eth_mask->src.addr_bytes[4], eth_mask->src.addr_bytes[5], > - eth_mask->dst.addr_bytes[0], eth_mask->dst.addr_bytes[1], > - eth_mask->dst.addr_bytes[2], eth_mask->dst.addr_bytes[3], > - eth_mask->dst.addr_bytes[4], eth_mask->dst.addr_bytes[5], > + ETH_ADDR_BYTES_ARGS(eth_mask->src.addr_bytes), > + ETH_ADDR_BYTES_ARGS(eth_mask->dst.addr_bytes), > eth_mask->type); > } else { > VLOG_DBG(" Mask = null\n"); >
diff --git a/lib/netdev-dpdk.c b/lib/netdev-dpdk.c index d485a53dacf1..9bf21856075b 100644 --- a/lib/netdev-dpdk.c +++ b/lib/netdev-dpdk.c @@ -4079,12 +4079,8 @@ dump_flow_pattern(struct rte_flow_item *item) if (eth_spec) { VLOG_DBG(" Spec: src="ETH_ADDR_FMT", dst="ETH_ADDR_FMT", " "type=0x%04" PRIx16"\n", - eth_spec->src.addr_bytes[0], eth_spec->src.addr_bytes[1], - eth_spec->src.addr_bytes[2], eth_spec->src.addr_bytes[3], - eth_spec->src.addr_bytes[4], eth_spec->src.addr_bytes[5], - eth_spec->dst.addr_bytes[0], eth_spec->dst.addr_bytes[1], - eth_spec->dst.addr_bytes[2], eth_spec->dst.addr_bytes[3], - eth_spec->dst.addr_bytes[4], eth_spec->dst.addr_bytes[5], + ETH_ADDR_BYTES_ARGS(eth_spec->src.addr_bytes), + ETH_ADDR_BYTES_ARGS(eth_spec->dst.addr_bytes), ntohs(eth_spec->type)); } else { VLOG_DBG(" Spec = null\n"); @@ -4092,12 +4088,8 @@ dump_flow_pattern(struct rte_flow_item *item) if (eth_mask) { VLOG_DBG(" Mask: src="ETH_ADDR_FMT", dst="ETH_ADDR_FMT", " "type=0x%04"PRIx16"\n", - eth_mask->src.addr_bytes[0], eth_mask->src.addr_bytes[1], - eth_mask->src.addr_bytes[2], eth_mask->src.addr_bytes[3], - eth_mask->src.addr_bytes[4], eth_mask->src.addr_bytes[5], - eth_mask->dst.addr_bytes[0], eth_mask->dst.addr_bytes[1], - eth_mask->dst.addr_bytes[2], eth_mask->dst.addr_bytes[3], - eth_mask->dst.addr_bytes[4], eth_mask->dst.addr_bytes[5], + ETH_ADDR_BYTES_ARGS(eth_mask->src.addr_bytes), + ETH_ADDR_BYTES_ARGS(eth_mask->dst.addr_bytes), eth_mask->type); } else { VLOG_DBG(" Mask = null\n");
Signed-off-by: Ben Pfaff <blp@ovn.org> --- lib/netdev-dpdk.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-)