diff options
| author |   Ido Barnea <ibarnea@cisco.com> | 2016-10-13 16:52:56 +0300 |
|---|---|---|
| committer | Ido Barnea <ibarnea@cisco.com> | 2016-10-13 16:52:56 +0300 |
| commit | d94450a962cbd016f616e29a21dfd1930f8ed520 (patch) | |
| tree | e33eaedf35165c49d6af92f8f3281a577ee7a524 | |
| parent | 7e953084e99c95c67f8e76edc893fca4c8e14cc9 (diff) | |
Revert "Fix bundeling in file names to bundling"
This reverts commit 9ed37dfeed71c3adac59f02e08ee08627bd7924c.
Signed-off-by: Ido Barnea <ibarnea@cisco.com>
| -rw-r--r-- | scripts/cfg/simple_cfg.yaml | 19 | ||||
| -rw-r--r-- | src/dpdk/lib/librte_mbuf/rte_mbuf.h | 2 |
2 files changed, 11 insertions, 10 deletions
diff --git a/scripts/cfg/simple_cfg.yaml b/scripts/cfg/simple_cfg.yaml index 867bcb2f..7b1dc393 100644 --- a/scripts/cfg/simple_cfg.yaml +++ b/scripts/cfg/simple_cfg.yaml @@ -1,9 +1,10 @@ -- port_limit : 2 - version : 2 - # Change below line. Use sudo ./dpdk_setup_ports.py -s to see list of interfaces on your machine - interfaces : ["03:00.0", "03:00.1"] - port_info : - - default_gw : "1.1.1.1" - ip : "2.2.2.2" - - default_gw : "2.2.2.2" - ip : "1.1.1.1" +- port_limit : 2 # this option can limit the number of port of the platform + version : 2 + interfaces : ["03:00.0","03:00.1"] #the interfaces using ./dpdk_setup_ports.py -s + port_info : # set eh mac addr + - dest_mac : [0x00,0x00,0x00,0x01,0x00,0x00] # router mac addr should be taken from router + src_mac : [0x00,0x00,0x00,0x02,0x00,0x00] # source mac-addr - taken from ifconfig + - dest_mac : [0x00,0x00,0x00,0x03,0x00,0x00] # router mac addr taken from router + src_mac : [0x00,0x00,0x00,0x04,0x00,0x00] #source mac-addr taken from ifconfig + + diff --git a/src/dpdk/lib/librte_mbuf/rte_mbuf.h b/src/dpdk/lib/librte_mbuf/rte_mbuf.h index 0f1fcbcf..9e607992 100644 --- a/src/dpdk/lib/librte_mbuf/rte_mbuf.h +++ b/src/dpdk/lib/librte_mbuf/rte_mbuf.h @@ -1060,7 +1060,7 @@ static inline uint16_t rte_mbuf_refcnt_update(struct rte_mbuf *m, int16_t value) { // TREX_PATCH - The code in #if 0 caused tx queue to hang when running: - // sudo ./t-rex-64-o -f avl/sfr_delay_10_1g_no_bundling.yaml -m 35 -p -d 100 + // sudo ./t-rex-64-o -f avl/sfr_delay_10_1g_no_bundeling.yaml -m 35 -p -d 100 #if 0 /* * The atomic_add is an expensive operation, so we don't want to |