diff mbox series

[ovs-dev,v1] ipf: Misc Cleanup.

Message ID 1550195044-11936-1-git-send-email-dlu998@gmail.com
State Superseded
Headers show
Series [ovs-dev,v1] ipf: Misc Cleanup. | expand

Commit Message

Darrell Ball Feb. 15, 2019, 1:44 a.m. UTC 
Signed-off-by: Darrell Ball <dlu998@gmail.com>
---
 lib/ipf.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

Comments

Darrell Ball Feb. 15, 2019, 9:03 a.m. UTC | #1 
I resent this patch with an addition as part of a series



On Thu, Feb 14, 2019 at 5:44 PM Darrell Ball <dlu998@gmail.com> wrote:

> Signed-off-by: Darrell Ball <dlu998@gmail.com>
> ---
>  lib/ipf.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/lib/ipf.c b/lib/ipf.c
> index df5196f..c91afd3 100644
> --- a/lib/ipf.c
> +++ b/lib/ipf.c
> @@ -530,8 +530,6 @@ ipf_list_state_transition(struct ipf *ipf, struct
> ipf_list *ipf_list,
>      case IPF_LIST_STATE_LAST_SEEN:
>          if (ff) {
>              next_state = IPF_LIST_STATE_FIRST_LAST_SEEN;
> -        } else if (lf) {
> -            next_state = IPF_LIST_STATE_LAST_SEEN;
>          } else {
>              next_state = IPF_LIST_STATE_LAST_SEEN;
>          }
> @@ -765,7 +763,7 @@ ipf_list_key_eq(const struct ipf_list_key *key1,
>  static struct ipf_list *
>  ipf_list_key_lookup(struct ipf *ipf, const struct ipf_list_key *key,
>                      uint32_t hash)
> -    /* OVS_REQUIRES(ipf->ipf_lock) */
> +    OVS_REQUIRES(ipf->ipf_lock)
>  {
>      struct ipf_list *ipf_list;
>      HMAP_FOR_EACH_WITH_HASH (ipf_list, node, hash, &ipf->frag_lists) {
> --
> 1.9.1
>
>
diff mbox series

Patch

diff --git a/lib/ipf.c b/lib/ipf.c
index df5196f..c91afd3 100644
--- a/lib/ipf.c
+++ b/lib/ipf.c
@@ -530,8 +530,6 @@  ipf_list_state_transition(struct ipf *ipf, struct ipf_list *ipf_list,
     case IPF_LIST_STATE_LAST_SEEN:
         if (ff) {
             next_state = IPF_LIST_STATE_FIRST_LAST_SEEN;
-        } else if (lf) {
-            next_state = IPF_LIST_STATE_LAST_SEEN;
         } else {
             next_state = IPF_LIST_STATE_LAST_SEEN;
         }
@@ -765,7 +763,7 @@  ipf_list_key_eq(const struct ipf_list_key *key1,
 static struct ipf_list *
 ipf_list_key_lookup(struct ipf *ipf, const struct ipf_list_key *key,
                     uint32_t hash)
-    /* OVS_REQUIRES(ipf->ipf_lock) */
+    OVS_REQUIRES(ipf->ipf_lock)
 {
     struct ipf_list *ipf_list;
     HMAP_FOR_EACH_WITH_HASH (ipf_list, node, hash, &ipf->frag_lists) {