Skip to contentSkip to conversation

openvswitch: meter: Remove unnecessary int

PATCH In review Solomon Tan 2 participants 2 messages Apr 18, 2022 – Apr 21, 2022

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 openvswitch: meter: Remove unnecessary int

This patch addresses the checkpatch.pl warning that long long is preferred over long long int.

---
 net/openvswitch/meter.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
net/openvswitch/meter.c +4 -4
index 04a060ac7fdf..a790920c11d6 100644
@@ -592,8 +592,8 @@ static int ovs_meter_cmd_del(struct sk_buff *skb, struct genl_info *info)
 bool ovs_meter_execute(struct datapath *dp, struct sk_buff *skb,
 		       struct sw_flow_key *key, u32 meter_id)
 {
-	long long int now_ms = div_u64(ktime_get_ns(), 1000 * 1000);
-	long long int long_delta_ms;
+	long long now_ms = div_u64(ktime_get_ns(), 1000 * 1000);
+	long long long_delta_ms;
 	struct dp_meter_band *band;
 	struct dp_meter *meter;
 	int i, band_exceeded_max = -1;
@@ -622,7 +622,7 @@ bool ovs_meter_execute(struct datapath *dp, struct sk_buff *skb,
 	/* Make sure delta_ms will not be too large, so that bucket will not
 	 * wrap around below.
 	 */
-	delta_ms = (long_delta_ms > (long long int)meter->max_delta_t)
+	delta_ms = (long_delta_ms > (long long)meter->max_delta_t)
 		   ? meter->max_delta_t : (u32)long_delta_ms;
 
 	/* Update meter statistics.
@@ -645,7 +645,7 @@ bool ovs_meter_execute(struct datapath *dp, struct sk_buff *skb,
 
 	/* Update all bands and find the one hit with the highest rate. */
 	for (i = 0; i < meter->n_bands; ++i) {
-		long long int max_bucket_size;
+		long long max_bucket_size;
 
 		band = &meter->bands[i];
 		max_bucket_size = band->burst_size * 1000LL;

--
2.35.3

maintainer
#1 lore raw
Quoted 2 lines · Solomon Tan

This patch addresses the checkpatch.pl warning that long long is preferred over long long int.

Please don't do that. This kind of changes cause e.g. backporting issue for any later relevant bugfix touching the same area, for no real benefit.

Documentation/process/2.Process.rst

explicltly states to avoid this kind of patches.

Quoted 11 lines
---
 net/openvswitch/meter.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
net/openvswitch/meter.c +0 -0
index 04a060ac7fdf..a790920c11d6 100644

net/openvswitch/meter.c static int ovs_meter_cmd_del(struct sk_buff *skb, struct genl_info *info) · line 599

Quoted 10 lines
net/openvswitch/meter.c +2 -2
@@ -592,8 +592,8 @@ static int ovs_meter_cmd_del(struct sk_buff *skb, struct genl_info *info)
 bool ovs_meter_execute(struct datapath *dp, struct sk_buff *skb,
 		       struct sw_flow_key *key, u32 meter_id)
 {
-	long long int now_ms = div_u64(ktime_get_ns(), 1000 * 1000);
-	long long int long_delta_ms;
+	long long now_ms = div_u64(ktime_get_ns(), 1000 * 1000);
+	long long long_delta_ms;
 	struct dp_meter_band *band;
 	struct dp_meter *meter;
 	int i, band_exceeded_max = -1;

Additionally the patch is mangled by non plain-text encoding.

For any later submissions (regarding some other different topic) please ensure that your client/mailer send purely plain-text messages,

Thanks,

Paolo