diff options
| author | Ben Pfaff <blp@ovn.org> | 2018-07-09 16:47:03 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@ovn.org> | 2018-07-09 20:53:06 -0700 |
| commit | f5129153e3b12c0b9ca6b355f9062d91a67d2942 (patch) | |
| tree | c9ec5091c6d84622d6258c4bc38c27c9589abc46 /lib | |
| parent | a9f55784c347c3a4081d3fdfe0330c62b08270fe (diff) | |
| download | openvswitch-f5129153e3b12c0b9ca6b355f9062d91a67d2942.tar.gz | |
treewide: Remove pointless "return;" at ends of functions.
Found with:
git ls-files | xargs pcregrep -n -M 'return;\n*}'
Signed-off-by: Ben Pfaff <blp@ovn.org>
Acked-by: Darrell Ball <dlu998@gmail.com>
Tested-by: Darrell Ball <dlu998@gmail.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/conntrack.c | 4 | ||||
| -rw-r--r-- | lib/lldp/lldpd.c | 2 | ||||
| -rw-r--r-- | lib/netdev-native-tnl.c | 1 |
3 files changed, 0 insertions, 7 deletions
diff --git a/lib/conntrack.c b/lib/conntrack.c index 97fd46a5e..333f5d41a 100644 --- a/lib/conntrack.c +++ b/lib/conntrack.c @@ -2085,8 +2085,6 @@ nat_ipv6_addr_increment(struct in6_addr *ipv6_aligned, uint32_t increment) memcpy(ipv6_hi, &addr6_64_hi, sizeof addr6_64_hi); memcpy(ipv6_lo, &addr6_64_lo, sizeof addr6_64_lo); - - return; } static uint32_t @@ -3282,7 +3280,6 @@ handle_ftp_ctl(struct conntrack *ct, const struct conn_lookup_ctx *ctx, uint8_t pad = dp_packet_l2_pad_size(pkt); th->tcp_csum = csum_finish( csum_continue(tcp_csum, th, tail - (char *) th - pad)); - return; } static void @@ -3296,5 +3293,4 @@ handle_tftp_ctl(struct conntrack *ct, expectation_create(ct, conn_for_expectation->key.src.port, conn_for_expectation, !!(pkt->md.ct_state & CS_REPLY_DIR), false, false); - return; } diff --git a/lib/lldp/lldpd.c b/lib/lldp/lldpd.c index 036ff4f4c..19e930526 100644 --- a/lib/lldp/lldpd.c +++ b/lib/lldp/lldpd.c @@ -408,8 +408,6 @@ lldpd_decode(struct lldpd *cfg, char *frame, int s, if (!oport) { hw->h_insert_cnt++; } - - return; } static void diff --git a/lib/netdev-native-tnl.c b/lib/netdev-native-tnl.c index a63fe2419..56baaa217 100644 --- a/lib/netdev-native-tnl.c +++ b/lib/netdev-native-tnl.c @@ -614,7 +614,6 @@ netdev_erspan_push_header(const struct netdev *netdev, md2 = ALIGNED_CAST(struct erspan_md2 *, ersh + 1); put_16aligned_be32(&md2->timestamp, get_erspan_ts(ERSPAN_100US)); } - return; } int |