code review comments

Author: Nieuwejaar

dpd/p4/sidecar.p4

@@ -1183,6 +1183,10 @@ control Router4 (
 		fwd.idx = 0;
 		fwd.slots = 0;
 		fwd.slot = 0;
+		// Our route selection table is 11 bits wide, and we need 5 bits
+		// of that for our "slot count" index.  Thus, we only need 6
+		// bits of the 8-bit hash calculated here to complete the 11-bit
+		// index.
 		fwd.ecmp_hash = index_hash.get({
 			hdr.ipv4.dst_addr,
 			hdr.ipv4.src_addr,
@@ -1320,6 +1324,10 @@ control Router6 (
 		fwd.idx = 0;
 		fwd.slots = 0;
 		fwd.slot = 0;
+		// Our route selection table is 11 bits wide, and we need 5 bits
+		// of that for our "slot count" index.  Thus, we only need 6
+		// bits of the 8-bit hash calculated here to complete the 11-bit
+		// index.
 		fwd.ecmp_hash = index_hash.get({
 			hdr.ipv6.dst_addr,
 			hdr.ipv6.src_addr,

dpd/src/table/route_ipv6.rs

@@ -69,17 +69,17 @@ pub fn add_route_index(
     match s.table_entry_add(TableType::RouteIdxIpv6, &match_key, &action_data) {
         Ok(()) => {
             info!(s.log, "added ipv6 route index";
-		    "route" => %cidr,
-		    "index" => %idx,
-            "slots" => %slots);
+                "route" => %cidr,
+                "index" => %idx,
+                "slots" => %slots);
             Ok(())
         }
         Err(e) => {
             error!(s.log, "failed to add ipv6 route index";
-		    "route" => %cidr,
-		    "index" => %idx,
-		    "slots" => %slots,
-		    "error" => %e);
+                "route" => %cidr,
+                "index" => %idx,
+                "slots" => %slots,
+                "error" => %e);
             Err(e)
         }
     }
@@ -93,8 +93,8 @@ pub fn delete_route_index(s: &Switch, cidr: &Ipv6Net) -> DpdResult<()> {
         .map(|_| info!(s.log, "deleted ipv6 index"; "route" => %cidr))
         .map_err(|e| {
             error!(s.log, "failed to delete ipv6 index";
-		"route" => %cidr,
-		"error" => %e);
+                "route" => %cidr,
+                "error" => %e);
             e
         })
 }
@@ -123,18 +123,18 @@ pub fn add_route_target(
     match s.table_entry_add(TableType::RouteFwdIpv6, &match_key, &action_data) {
         Ok(()) => {
             info!(s.log, "added ipv6 route entry";
-		    "index" => idx,
-		    "port" => port,
-		    "nexthop" => %nexthop,
-		    "vlan_id" => ?vlan_id);
+                "index" => idx,
+                "port" => port,
+                "nexthop" => %nexthop,
+                "vlan_id" => ?vlan_id);
             Ok(())
         }
         Err(e) => {
             error!(s.log, "failed to add ipv6 route entry";
-		    "index" => idx,
-		    "port" => port,
-		    "nexthop" => %nexthop,
-		    "error" => %e);
+                "index" => idx,
+                "port" => port,
+                "nexthop" => %nexthop,
+                "error" => %e);
             Err(e)
         }
     }
@@ -148,8 +148,8 @@ pub fn delete_route_target(s: &Switch, idx: u16) -> DpdResult<()> {
         .map(|_| info!(s.log, "deleted ipv6 route entry"; "index" => %idx))
         .map_err(|e| {
             error!(s.log, "failed to delete ipv6 route entry";
-		"index" => %idx,
-		"error" => %e);
+                "index" => %idx,
+                "error" => %e);
             e
         })
 }
@@ -181,14 +181,14 @@ pub fn reset(s: &Switch) -> DpdResult<()> {
         .map(|_| info!(s.log, "reset ipv6 route-index table"))
         .map_err(|e| {
             error!(s.log, "failed to clear ipv6 route-index table";
-		"error" => %e);
+                "error" => %e);
             e
         })?;
     s.table_clear(TableType::RouteFwdIpv6)
         .map(|_| info!(s.log, "reset ipv6 route-data table"))
         .map_err(|e| {
             error!(s.log, "failed to clear ipv6 route-data table";
-		"error" => %e);
+                "error" => %e);
             e
         })
 }