From 08ff03ff42e8853185b476fe3e363784415626f5 Mon Sep 17 00:00:00 2001
From: fengbojiang <fengbojiang@tencent.com>
Date: Tue, 13 Nov 2018 22:11:05 +0800
Subject: [PATCH] Modify config.ini

---
 config.ini | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/config.ini b/config.ini
index 5b202128..5b1ee877 100644
--- a/config.ini
+++ b/config.ini
@@ -39,10 +39,10 @@ port_list=0
 # Port config section
 # Correspond to dpdk.port_list's index: port0, port1...
 [port0]
-addr=10.139.144.123
-netmask=255.255.224.0
-broadcast=10.139.159.255
-gateway=10.139.128.1
+addr=192.168.1.2
+netmask=255.255.225.0
+broadcast=192.168.1.255
+gateway=192.168.1.1
 
 # lcore list used to handle this port
 # the format is same as port_list
@@ -55,21 +55,12 @@ gateway=10.139.128.1
 # all packets that do not belong to the following tcp_port and udp_port
 # will transmit to kernel; if method=accept, all packets that belong to
 # the following tcp_port and udp_port will transmit to kernel.
-<<<<<<< HEAD
 #[kni]
 #enable=1
 #method=reject
 # The format is same as port_list
 #tcp_port=80,443
 #udp_port=53
-=======
-[kni]
-enable=1
-method=reject
-# The format is same as port_list
-tcp_port=80,443
-udp_port=53
->>>>>>> 387425b16df2b02c99c1583c2f9c376c1fb05ca4
 
 # FreeBSD network performance tuning configurations.
 # Most native FreeBSD configurations are supported.