Merge 52ad22d48b2e827fc2484d9db3905472e7e292a7 on remote branch
Change-Id: Ife83b02537da65a0dc68e379e40cff8af35b227d
diff --git a/ipanat/inc/ipa_nat_drvi.h b/ipanat/inc/ipa_nat_drvi.h
index 1896a3e..8015c98 100644
--- a/ipanat/inc/ipa_nat_drvi.h
+++ b/ipanat/inc/ipa_nat_drvi.h
@@ -1,5 +1,5 @@
/*
-Copyright (c) 2013 - 2017, The Linux Foundation. All rights reserved.
+Copyright (c) 2013 - 2019, The Linux Foundation. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
@@ -80,7 +80,6 @@
#define IPA_NAT_FLAG_DISABLE_BIT 0
#define IPA_NAT_INVALID_PROTO_FIELD_VALUE 0xFF00
-#define IPA_NAT_INVALID_PROTO_FIELD_CMP 0xFF
#define IPA_NAT_INVALID_INDEX 0xFF
#define IPA_NAT_INVALID_NAT_ENTRY 0x0
diff --git a/ipanat/src/ipa_nat_drvi.c b/ipanat/src/ipa_nat_drvi.c
index 675dcf5..43ceaf5 100644
--- a/ipanat/src/ipa_nat_drvi.c
+++ b/ipanat/src/ipa_nat_drvi.c
@@ -1,5 +1,5 @@
/*
-Copyright (c) 2013 - 2017, The Linux Foundation. All rights reserved.
+Copyright (c) 2013 - 2019, The Linux Foundation. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
@@ -29,6 +29,7 @@
#include "ipa_nat_drv.h"
#include "ipa_nat_drvi.h"
+#include <linux/msm_ipa.h>
#ifdef USE_GLIB
#include <glib.h>
@@ -2201,7 +2202,7 @@
cnt++) {
if (Read8BitFieldValue(tbl_ptr[cnt].ts_proto,
- PROTOCOL_FIELD) == IPA_NAT_INVALID_PROTO_FIELD_CMP
+ PROTOCOL_FIELD) == IPAHAL_NAT_INVALID_PROTOCOL
&&
Read16BitFieldValue(tbl_ptr[cnt].nxt_indx_pub_port,
NEXT_INDEX_FIELD) == IPA_NAT_INVALID_NAT_ENTRY) {