Signed-off-by: Darrell Ball <dlu...@gmail.com>
---
lib/ipf.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/lib/ipf.c b/lib/ipf.c
index df5196f..125a815 100644
--- a/lib/ipf.c
+++ b/lib/ipf.c
@@ -456,7 +456,7 @@ ipf_reassemble_v6_frags(struct ipf_list *ipf_list)
int rest_len = frag_list[ipf_list->last_inuse_idx].end_data_byte -
frag_list[1].start_data_byte + 1;
- if (pl + rest_len > IPV4_PACKET_MAX_SIZE) {
+ if (pl + rest_len > IPV6_PACKET_MAX_DATA) {
ipf_print_reass_packet(
"Unsupported big reassembled v6 packet; v6 hdr:", l3);
dp_packet_delete(pkt);
@@ -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
_______________________________________________
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
