diff --git a/openair2/LAYER2/RLC/mac_primitives.h b/openair2/LAYER2/RLC/mac_primitives.h
index 0f2d3bf69116ca45513f155ae6da75b57bf79a44..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/openair2/LAYER2/RLC/mac_primitives.h
+++ b/openair2/LAYER2/RLC/mac_primitives.h
@@ -1,196 +0,0 @@
-/***************************************************************************
- mac_primitives.h - description
- -------------------
- ***************************************************************************/
-#ifndef __MAC_PRIMITIVES_H__
-# define __MAC_PRIMITIVES_H__
-
-/#warning including mac_primitives.h
-//
-//# include "platform_types.h"
-//# include "platform_constants.h"
-//# include "list.h"
-//# include "mem_block.h"
-//
-//# define MAC_DCCH 0xCC
-//# define MAC_DTCH 0xDC
-////----------------------------------------------------------
-//// primitives
-////----------------------------------------------------------
-//# define MAC_DATA_REQ 0x01
-//# define MAC_DATA_IND 0x02
-//# define MAC_STATUS_IND 0x04
-//# define MAC_STATUS_RESP 0x08
-////----------------------------------------------------------
-//// primitives definition
-////----------------------------------------------------------
-//# define UE_ID_TYPE_U_RNTI 0xFF
-// // should not be used ?
-//# define UE_ID_TYPE_C_RNTI 0xCC
-//
-//# define MAC_TX_STATUS_SUCCESSFUL 0x0F
-//# define MAC_TX_STATUS_UNSUCCESSFUL 0xF0
-//
-//# define MAC_HEADER_MAX_SIZE 6
-// from 3GPP TS 25.321 V4.2.0
-// MAC-DATA-Req/Ind:
-// - MAC-DATA-Req primitive is used to request that an upper layer PDU be sent using the
-// procedures for the information transfer service;
-// - MAC-DATA-Ind primitive indicates the arrival of upper layer PDUs received within one
-// transmission time interval by means of the information transfer service.
-// MAC-STATUS-Ind/Resp:
-// - MAC-STATUS-Ind primitive indicates to RLC for each logical channel the rate at which
-// it may transfer data to MAC. Parameters are the number of PDUs that can be transferred
-// in each transmission time interval and the PDU size; it is possible that MAC would use
-// this primitive to indicate that it expects the current buffer occupancy of the addressed
-// logical channel in order to provide for optimised TFC selection on transport channels
-// with long transmission time interval. At the UE, MAC-STATUS-Ind primitive is also used
-// to indicate from MAC to RLC that MAC has requested data transmission by PHY
-// (i.e. PHY-DATA-REQ has been submitted, see Fig. 11.2.2.1), or that transmission of an
-// RLC PDU on RACH or CPCH has failed due to exceeded preamble ramping cycle counter.
-// - MAC-STATUS-Resp primitive enables RLC to acknowledge a MAC-STATUS-Ind. It is possible
-// that RLC would use this primitive to indicate that it has nothing to send or that it is
-// in a suspended state or to indicate the current buffer occupancy to MAC.
-
-// Parameters:
-// a) data:
-// - it contains the RLC layer messages (RLC-PDU) to be transmitted, or the RLC layer messages
-// that have been received by the MAC sub-layer.
-//
-// b) no_tb :
-// - indicates the number of transport blocks transmitted by the peer entity within the
-// transmission time interval, based on the TFI value.
-//
-// c) buffer_occupancy :
-// - the parameter Buffer Occupancy (BO) indicates for each logical channel the amount of data
-// in number of bytes that is available for transmission and retransmission in RLC layer.
-// When MAC is connected to an AM RLC entity, control PDUs to be transmitted and RLC PDUs
-// outside the RLC Tx window shall also be included in the BO. RLC PDUs that have been
-// transmitted but not negatively acknowledged by the peer entity shall not be included in the BO.
-//
-// d) rx_timing_deviation, TDD only:
-// - it contains the RX Timing Deviation as measured by the physical layer for the physical
-// resources carrying the data of the Message Unit. This parameter is optional and only for
-// Indication. It is needed for the transfer of the RX Timing Deviation measurement of RACH
-// transmissions carrying CCCH data to RRC.
-//
-// e) no_pdu:
-// - specifies the number of PDUs that the RLC is permitted to transfer to MAC within a
-// transmission time interval.
-//
-// f) pdu_size:
-// - specifies the size of PDU that can be transferred to MAC within a transmission time interval.
-//
-// g) UE-ID Type Indicator:
-// - indicates the UE-ID type to be included in MAC for a DCCH when it is mapped onto a common
-// transport channel (i.e. FACH, RACH, DSCH in FDD or CPCH). On the UE side UE-ID Type Indicator
-// shall always be set to C-RNTI.
-//
-// h) tx_status:
-// - when set to value "transmission unsuccessful" this parameter indicates to RLC that transmission
-// of an RLC PDU failed in the previous Transmission Time Interval, when set to value
-// "transmission successful" this parameter indicates to RLC that the requested RLC PDU(s)
-// has been submitted for transmission by the physical layer.
-//
-// i) rlc_info
-// - indicates to MAC the configuration parameters that are critical to TFC selection depending
-// on its mode and the amount of data that could be transmitted at the next TTI. This primitive
-// is meant to insure that MAC can perform TFC selection.
-
-//#ifdef USER_MODE
-//struct rlc_entity_info {
-// uint8_t rlc_protocol_state;
-//};
-//
-//struct mac_tx_tb_management {
-// // BE CAREFULL TO KEEP THE SAME MAPPING FOR THE 6 FIELDS BELLOW AS FOR struct mac_tb_req
-// uint8_t *data_ptr;
-// uint8_t first_bit; // 0 if data starts on byte boundary(b7), 1 if b6, 2 if b5, etc.
-// // Previously designed for interlayers optimizations, (avoid aligning on byte boundary)
-// // but not used by L1 !, so extra cost for alignement in MAC.
-// uint16_t tb_size_in_bits; // L1H does not care of the field first bit any more, so in order to byte
-// // align the tb we have to know its size
-//
-// // for reporting tx status to upper layers
-// void *rlc;
-// void (*rlc_callback) (void *rlcP, uint16_t rlc_tb_type);
-// uint16_t rlc_tb_type;
-//
-// uint16_t log_ch_interface_src; // index of the logical channel interface from which the tb was submitted
-// uint8_t mac_header[MAC_HEADER_MAX_SIZE]; // worst case : tctf(5bits)+UE-Id type(2bits)+UE-Id(16 or 32bits)+C/T(4bits)=43bits max
-//};
-//
-//struct mac_rx_tb_management {
-// uint8_t *data_ptr;
-// uint16_t tb_size; // in bits
-// uint8_t valid_checksum;
-// uint8_t first_bit; // 0 if data starts on byte boundary(b7), 1 if b6, 2 if b5, etc
-//};
-//
-//struct mac_tb_req {
-// // BE CAREFULL TO KEEP THE SAME MAPPING FOR THE 6 FIELDS BELLOW AS FOR struct mac_tx_tb_management
-// uint8_t *data_ptr;
-// uint8_t first_bit;
-// uint16_t tb_size_in_bits; // L1H does not care of the field first bit any more, so in order to byte
-// // align the tb we have to know its size
-//
-// // for reporting tx status to upper layers
-// void *rlc;
-// void (*rlc_callback) (void *rlcP, uint16_t rlc_tb_type);
-// uint16_t rlc_tb_type;
-//
-// uint8_t mac_header[MAC_HEADER_MAX_SIZE]; // worst case : tctf(5bits)+UE-Id type(2bits)+UE-Id(16 or 32bits)+C/T(4bits)=43bits max
-//};
-//
-//struct mac_status_ind {
-// uint16_t no_pdu;
-// uint16_t tx_status; // successful, unsuccessful
-//};
-//
-//struct mac_tb_ind {
-// uint8_t *data_ptr;
-// uint16_t size;
-// uint8_t error_indication;
-// //uint8_t first_bit; // 0 if data starts on byte boundary(b7), 1 if b6, 2 if b5, etc
-//};
-////---------------------
-//struct mac_data_req {
-// list_t data;
-// uint32_t buffer_occupancy_in_bytes;
-// uint16_t buffer_occupancy_in_pdus;
-// struct rlc_entity_info rlc_info;
-// uint8_t ue_id_type_indicator;
-//};
-////---------------------
-//struct mac_data_ind {
-// list_t data;
-// uint16_t no_tb;
-// uint16_t tb_size; // in bits
-// //uint8_t error_indication;
-// //uint8_t rx_timing_deviation;
-//};
-////---------------------
-//struct mac_status_resp {
-// uint32_t buffer_occupancy_in_bytes;
-// uint32_t buffer_occupancy_in_pdus;
-// struct rlc_entity_info rlc_info;
-//};
-////---------------------
-//struct mac_primitive {
-// uint8_t primitive_type;
-// union {
-// struct mac_data_req data_req;
-// struct mac_status_resp status_resp;
-// struct mac_data_ind data_ind;
-// //struct mac_status_ind status_ind;
-// } primitive;
-//};
-
-#endif //USER_MODE
-
-
-
-
-
-# endif
-#endif
diff --git a/openair2/LAYER2/RLC/rlc.h b/openair2/LAYER2/RLC/rlc.h
index d27b01199482f4fce5c244a60a86a6f86a77188a..919a95181d6f92b70d868f134d0be11d5d809fa5 100755
--- a/openair2/LAYER2/RLC/rlc.h
+++ b/openair2/LAYER2/RLC/rlc.h
@@ -1,7 +1,6 @@
/*******************************************************************************
-
Eurecom OpenAirInterface 2
-Copyright(c) 1999 - 2010 Eurecom
+Copyright(c) 1999 - 2014 Eurecom
This program is free software; you can redistribute it and/or modify it
under the terms and conditions of the GNU General Public License,
@@ -23,8 +22,12 @@ Contact Information
Openair Admin: openair_admin@eurecom.fr
Openair Tech : openair_tech@eurecom.fr
Forums : http://forums.eurecom.fsr/openairinterface
-Address : Eurecom, 2229, route des crêtes, 06560 Valbonne Sophia Antipolis, France
-
+Address : EURECOM,
+ Campus SophiaTech,
+ 450 Route des Chappes,
+ CS 50193
+ 06904 Biot Sophia Antipolis cedex,
+ FRANCE
*******************************************************************************/
/*! \file rlc.h
* \brief This file, and only this file must be included by external code that interact with RLC layer.
diff --git a/openair2/LAYER2/RLC/rlc_def.h b/openair2/LAYER2/RLC/rlc_def.h
index d4df1185260b57ecfafea58949ce4f15fd6f4357..29dfbfbe5d10d342b3697e81bd7657fb9f50e05a 100755
--- a/openair2/LAYER2/RLC/rlc_def.h
+++ b/openair2/LAYER2/RLC/rlc_def.h
@@ -1,7 +1,6 @@
/*******************************************************************************
-
Eurecom OpenAirInterface 2
-Copyright(c) 1999 - 2010 Eurecom
+Copyright(c) 1999 - 2014 Eurecom
This program is free software; you can redistribute it and/or modify it
under the terms and conditions of the GNU General Public License,
@@ -23,8 +22,12 @@ Contact Information
Openair Admin: openair_admin@eurecom.fr
Openair Tech : openair_tech@eurecom.fr
Forums : http://forums.eurecom.fsr/openairinterface
-Address : Eurecom, 2229, route des crêtes, 06560 Valbonne Sophia Antipolis, France
-
+Address : EURECOM,
+ Campus SophiaTech,
+ 450 Route des Chappes,
+ CS 50193
+ 06904 Biot Sophia Antipolis cedex,
+ FRANCE
*******************************************************************************/
/*! \file rlc_def.h
* \brief This file contains constants for RLC internal use.
diff --git a/openair2/LAYER2/RLC/rlc_def_lte.h b/openair2/LAYER2/RLC/rlc_def_lte.h
index 5f7fab304fd15328d908cbe88faeb9b321b5ec66..5e8ecc371ea19bb647d45bab5ce4b4fe7304481c 100644
--- a/openair2/LAYER2/RLC/rlc_def_lte.h
+++ b/openair2/LAYER2/RLC/rlc_def_lte.h
@@ -1,7 +1,6 @@
/*******************************************************************************
-
Eurecom OpenAirInterface 2
-Copyright(c) 1999 - 2010 Eurecom
+Copyright(c) 1999 - 2014 Eurecom
This program is free software; you can redistribute it and/or modify it
under the terms and conditions of the GNU General Public License,
@@ -23,8 +22,12 @@ Contact Information
Openair Admin: openair_admin@eurecom.fr
Openair Tech : openair_tech@eurecom.fr
Forums : http://forums.eurecom.fsr/openairinterface
-Address : Eurecom, 2229, route des crêtes, 06560 Valbonne Sophia Antipolis, France
-
+Address : EURECOM,
+ Campus SophiaTech,
+ 450 Route des Chappes,
+ CS 50193
+ 06904 Biot Sophia Antipolis cedex,
+ FRANCE
*******************************************************************************/
/*! \file rlc_def_lte.h
* \brief This file contains LTE constants for RLC internal use.
diff --git a/openair2/LAYER2/RLC/rlc_mpls.c b/openair2/LAYER2/RLC/rlc_mpls.c
index b46144bd74bb15fc393bb9b6311f6b0c0bebd96e..f32f65690b275697592c8cfbca71961a23777c12 100644
--- a/openair2/LAYER2/RLC/rlc_mpls.c
+++ b/openair2/LAYER2/RLC/rlc_mpls.c
@@ -1,3 +1,34 @@
+/*******************************************************************************
+Eurecom OpenAirInterface 2
+Copyright(c) 1999 - 2014 Eurecom
+
+This program is free software; you can redistribute it and/or modify it
+under the terms and conditions of the GNU General Public License,
+version 2, as published by the Free Software Foundation.
+
+This program is distributed in the hope it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+more details.
+
+You should have received a copy of the GNU General Public License along with
+this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+
+The full GNU General Public License is included in this distribution in
+the file called "COPYING".
+
+Contact Information
+Openair Admin: openair_admin@eurecom.fr
+Openair Tech : openair_tech@eurecom.fr
+Forums : http://forums.eurecom.fsr/openairinterface
+Address : EURECOM,
+ Campus SophiaTech,
+ 450 Route des Chappes,
+ CS 50193
+ 06904 Biot Sophia Antipolis cedex,
+ FRANCE
+*******************************************************************************/
/*
rlc_mpls.c
-------------------
diff --git a/openair2/LAYER2/RLC/rlc_primitives.h b/openair2/LAYER2/RLC/rlc_primitives.h
index cabf31d6f91861539af751a86fc25449ae311773..16275ecebb96b8dc94f6972a0bf06c7e1dac111c 100755
--- a/openair2/LAYER2/RLC/rlc_primitives.h
+++ b/openair2/LAYER2/RLC/rlc_primitives.h
@@ -1,7 +1,6 @@
/*******************************************************************************
-
Eurecom OpenAirInterface 2
-Copyright(c) 1999 - 2010 Eurecom
+Copyright(c) 1999 - 2014 Eurecom
This program is free software; you can redistribute it and/or modify it
under the terms and conditions of the GNU General Public License,
@@ -23,8 +22,12 @@ Contact Information
Openair Admin: openair_admin@eurecom.fr
Openair Tech : openair_tech@eurecom.fr
Forums : http://forums.eurecom.fsr/openairinterface
-Address : Eurecom, 2229, route des crêtes, 06560 Valbonne Sophia Antipolis, France
-
+Address : EURECOM,
+ Campus SophiaTech,
+ 450 Route des Chappes,
+ CS 50193
+ 06904 Biot Sophia Antipolis cedex,
+ FRANCE
*******************************************************************************/
/*! \file rlc_primitives.h
* \brief This file contains constants definition for RLC primitives.