ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

docs: fix merge damage in nat.h

Browse Source 
Type: fix
Fixes: b5a575b09

Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
Change-Id: I22d35159a923075243df9760f1a74e2ca74e30e1
This commit is contained in:
Dave Wallace
2020-05-08 15:58:24 +00:00
committed by Dave Barach
parent a5436ae251
commit 9921091690
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/nat/nat.h
View File

@@ -1261,7 +1261,6 @@ void nat_free_session_data (snat_main_t * sm, snat_session_t * s,
u32 thread_index, u8 is_ha); u32 thread_index, u8 is_ha);
/** /**
<<<<<<< bdfe5955f59a735fd8d70e9026f8c1867a4c8cc6
* @brief Set NAT44 session limit (session limit, vrf id) * @brief Set NAT44 session limit (session limit, vrf id)
* *
* @param session_limit Session limit * @param session_limit Session limit
@@ -1271,10 +1270,7 @@ void nat_free_session_data (snat_main_t * sm, snat_session_t * s,
int nat44_set_session_limit (u32 session_limit, u32 vrf_id); int nat44_set_session_limit (u32 session_limit, u32 vrf_id);
/** /**
* @brief Free NAT44 ED session data (lookup keys, external addrres port)
=======
* @brief Free NAT44 ED session data (lookup keys, external address port) * @brief Free NAT44 ED session data (lookup keys, external address port)
>>>>>>> docs: clean up make docs job
* *
* @param s NAT session * @param s NAT session
* @param thread_index thread index * @param thread_index thread index