83 lines
3.0 KiB
Diff
83 lines
3.0 KiB
Diff
|
From e04f6a64f158a2163fc47000b19d33d20a23e299 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Panu Matilainen <pmatilai@redhat.com>
|
||
|
|
Date: Thu, 10 Mar 2016 15:49:55 +0200
|
||
|
|
Subject: [PATCH] examples/ip_pipeline: use unsigned constants for left shift
|
||
|
|
operations
|
||
|
|
|
||
|
|
Tell the compiler to use unsigned constants for left shift ops,
|
||
|
|
otherwise building with gcc >= 6.0 fails due to multiple warnings like:
|
||
|
|
warning: left shift of negative value [-Wshift-negative-value]
|
||
|
|
|
||
|
|
Signed-off-by: Panu Matilainen <pmatilai@redhat.com>
|
||
|
|
Acked-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
|
||
|
|
---
|
||
|
|
examples/ip_pipeline/pipeline/pipeline_common_fe.c | 4 ++--
|
||
|
|
examples/ip_pipeline/pipeline/pipeline_firewall.c | 4 ++--
|
||
|
|
examples/ip_pipeline/pipeline/pipeline_routing.c | 4 ++--
|
||
|
|
3 files changed, 6 insertions(+), 6 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/examples/ip_pipeline/pipeline/pipeline_common_fe.c b/examples/ip_pipeline/pipeline/pipeline_common_fe.c
|
||
|
|
index bffc9a4..a691d42 100644
|
||
|
|
--- a/examples/ip_pipeline/pipeline/pipeline_common_fe.c
|
||
|
|
+++ b/examples/ip_pipeline/pipeline/pipeline_common_fe.c
|
||
|
|
@@ -337,7 +337,7 @@ app_link_config(struct app_params *app,
|
||
|
|
return -1;
|
||
|
|
}
|
||
|
|
|
||
|
|
- netmask = (~0) << (32 - depth);
|
||
|
|
+ netmask = (~0U) << (32 - depth);
|
||
|
|
host = ip & netmask;
|
||
|
|
bcast = host | (~netmask);
|
||
|
|
|
||
|
|
@@ -889,7 +889,7 @@ print_link_info(struct app_link_params *p)
|
||
|
|
{
|
||
|
|
struct rte_eth_stats stats;
|
||
|
|
struct ether_addr *mac_addr;
|
||
|
|
- uint32_t netmask = (~0) << (32 - p->depth);
|
||
|
|
+ uint32_t netmask = (~0U) << (32 - p->depth);
|
||
|
|
uint32_t host = p->ip & netmask;
|
||
|
|
uint32_t bcast = host | (~netmask);
|
||
|
|
|
||
|
|
diff --git a/examples/ip_pipeline/pipeline/pipeline_firewall.c b/examples/ip_pipeline/pipeline/pipeline_firewall.c
|
||
|
|
index 3d7ea7a..320b25d 100644
|
||
|
|
--- a/examples/ip_pipeline/pipeline/pipeline_firewall.c
|
||
|
|
+++ b/examples/ip_pipeline/pipeline/pipeline_firewall.c
|
||
|
|
@@ -256,10 +256,10 @@ app_pipeline_firewall_key_check_and_normalize(struct pipeline_firewall_key *key)
|
||
|
|
return -1;
|
||
|
|
|
||
|
|
if (src_ip_depth)
|
||
|
|
- src_ip_netmask = (~0) << (32 - src_ip_depth);
|
||
|
|
+ src_ip_netmask = (~0U) << (32 - src_ip_depth);
|
||
|
|
|
||
|
|
if (dst_ip_depth)
|
||
|
|
- dst_ip_netmask = ((~0) << (32 - dst_ip_depth));
|
||
|
|
+ dst_ip_netmask = ((~0U) << (32 - dst_ip_depth));
|
||
|
|
|
||
|
|
key->key.ipv4_5tuple.src_ip &= src_ip_netmask;
|
||
|
|
key->key.ipv4_5tuple.dst_ip &= dst_ip_netmask;
|
||
|
|
diff --git a/examples/ip_pipeline/pipeline/pipeline_routing.c b/examples/ip_pipeline/pipeline/pipeline_routing.c
|
||
|
|
index 6354730..eab89f2 100644
|
||
|
|
--- a/examples/ip_pipeline/pipeline/pipeline_routing.c
|
||
|
|
+++ b/examples/ip_pipeline/pipeline/pipeline_routing.c
|
||
|
|
@@ -319,7 +319,7 @@ app_pipeline_routing_add_route(struct app_params *app,
|
||
|
|
if ((depth == 0) || (depth > 32))
|
||
|
|
return -1;
|
||
|
|
|
||
|
|
- netmask = (~0) << (32 - depth);
|
||
|
|
+ netmask = (~0U) << (32 - depth);
|
||
|
|
key->key.ipv4.ip &= netmask;
|
||
|
|
|
||
|
|
/* data */
|
||
|
|
@@ -421,7 +421,7 @@ app_pipeline_routing_delete_route(struct app_params *app,
|
||
|
|
if ((depth == 0) || (depth > 32))
|
||
|
|
return -1;
|
||
|
|
|
||
|
|
- netmask = (~0) << (32 - depth);
|
||
|
|
+ netmask = (~0U) << (32 - depth);
|
||
|
|
key->key.ipv4.ip &= netmask;
|
||
|
|
}
|
||
|
|
break;
|
||
|
|
--
|
||
|
|
2.8.4
|
||
|
|
|