From 4f14199e645ce71771e8268e9412aec9cc98c4e6 Mon Sep 17 00:00:00 2001
From: "aikaterini.trilyraki" <aikaterini.trilyraki@eurecom.fr>
Date: Fri, 20 Nov 2015 16:09:08 +0100
Subject: [PATCH] minor change to eth_raw.c
---
targets/ARCH/ETHERNET/USERSPACE/LIB/eth_raw.c | 4 ++--
targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c | 2 +-
targets/RT/USER/lte-softmodem.c | 12 ++++++------
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/targets/ARCH/ETHERNET/USERSPACE/LIB/eth_raw.c b/targets/ARCH/ETHERNET/USERSPACE/LIB/eth_raw.c
index f8d1a31462..91b2b7f03e 100644
--- a/targets/ARCH/ETHERNET/USERSPACE/LIB/eth_raw.c
+++ b/targets/ARCH/ETHERNET/USERSPACE/LIB/eth_raw.c
@@ -119,8 +119,8 @@ int eth_socket_init_raw(openair0_device *device) {
}
/* Construct the Ethernet header */
- ether_aton_r(device->openair0_cfg.my_addr, (struct ether_addr *)(&(eh.ether_shost)));
- ether_aton_r(device->openair0_cfg.remote_addr, (struct ether_addr *)(&(eh.ether_dhost)));
+ ether_aton_r(local_mac, (struct ether_addr *)(&(eh.ether_shost)));
+ ether_aton_r(remote_mac, (struct ether_addr *)(&(eh.ether_dhost)));
eh.ether_type = htons((short)device->openair0_cfg.my_port);
printf("[%s] binding mod_%d to hardware address %x:%x:%x:%x:%x:%x\n",((device->host_type == BBU_HOST) ? "BBU": "RRH"),Mod_id,eh.ether_shost[0],eh.ether_shost[1],eh.ether_shost[2],eh.ether_shost[3],eh.ether_shost[4],eh.ether_shost[5]);
diff --git a/targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c b/targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c
index 6d3bfc8205..634018f6e1 100644
--- a/targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c
+++ b/targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c
@@ -343,7 +343,7 @@ int transport_init(openair0_device *device, openair0_config_t *openair0_cfg, cha
int card = 0;
/*hoedcoded!!!!*/
- eth->flags = ETH_UDP_MODE;
+ eth->flags = ETH_RAW_MODE;
eth->buffer_size = (unsigned int)openair0_cfg[card].samples_per_packet*sizeof(int32_t); // buffer size = 4096 for sample_len of 1024
printf("[ETHERNET]: Initializing openair0_device for %s ...\n", ((device->host_type == BBU_HOST) ? "BBU": "RRH"));
diff --git a/targets/RT/USER/lte-softmodem.c b/targets/RT/USER/lte-softmodem.c
index ebd9e85a32..e915925fe8 100644
--- a/targets/RT/USER/lte-softmodem.c
+++ b/targets/RT/USER/lte-softmodem.c
@@ -369,8 +369,8 @@ int16_t osa_log_verbosity = LOG_MED;
#ifdef ETHERNET
-//char *rrh_UE_ip = "127.0.0.1";
-//int rrh_UE_port = 51000;
+char *rrh_UE_ip = "127.0.0.1";
+int rrh_UE_port = 51000;
#endif
/* flag given in runtime to specify if the RF head is local or remote*/
uint8_t local_remote_RF;
@@ -2977,13 +2977,13 @@ int main( int argc, char **argv )
openair0_cfg[card].remote_addr = "192.168.12.242";
//openair0_cfg[card].remote_addr = "127.0.0.1";
-// openair0_cfg[card].remote_addr = "74:d4:35:cc:88:45";
+ openair0_cfg[card].remote_addr = "74:d4:35:cc:88:45";
openair0_cfg[card].remote_port = 50000;
openair0_cfg[card].my_addr = "192.168.12.31";
//openair0_cfg[card].my_addr = "127.0.0.1";
- //openair0_cfg[card].my_addr = "d4:be:d9:22:0a:ac";
- openair0_cfg[card].my_port = 50001;
- openair0_cfg[card].tx_delay = 5;
+ openair0_cfg[card].my_addr = "d4:be:d9:22:0a:ac";
+ openair0_cfg[card].my_port = 50000;
+ openair0_cfg[card].tx_delay = 10;
openair0_cfg[card].tx_forward_nsamps = 0;
openair0_cfg[card].txlaunch_wait = 0;
openair0_cfg[card].txlaunch_wait_slotcount = 0;
--
GitLab