diff --git a/openair2/NETWORK_DRIVER/UE_IP/common.c b/openair2/NETWORK_DRIVER/UE_IP/common.c
index 6568363db3e85fc1b0faf063c4a52ef17ea2a201..821263531963176bb9c00cdd89a5e1410fe02035 100755
--- a/openair2/NETWORK_DRIVER/UE_IP/common.c
+++ b/openair2/NETWORK_DRIVER/UE_IP/common.c
@@ -28,7 +28,7 @@
 *******************************************************************************/
 
 /*! \file common.c
-* \brief 
+* \brief
 * \author Navid Nikaein and Raymond Knopp, Lionel GAUTHIER
 * \date 2013
 * \version 1.0
@@ -226,7 +226,7 @@ void ue_ip_common_ip2wireless_drop(struct sk_buff *skb,  int inst){
 // Request the transfer of data (QoS SAP)
 void ue_ip_common_ip2wireless(struct sk_buff *skb, int inst){
   //---------------------------------------------------------------------------
-  struct pdcp_data_req_header_t     pdcph;
+  struct pdcp_data_req_header_s     pdcph;
   struct ue_ip_priv *priv=netdev_priv(ue_ip_dev[inst]);
 #ifdef LOOPBACK_TEST
   int i;
@@ -306,7 +306,7 @@ void ue_ip_common_ip2wireless(struct sk_buff *skb, int inst){
 void ue_ip_common_wireless2ip(struct nlmsghdr *nlh) {
 //---------------------------------------------------------------------------
 
-  struct pdcp_data_ind_header_t     *pdcph = (struct pdcp_data_ind_header_t *)NLMSG_DATA(nlh);
+  struct pdcp_data_ind_header_s     *pdcph = (struct pdcp_data_ind_header_s *)NLMSG_DATA(nlh);
   struct ue_ip_priv *priv;
 
   priv = netdev_priv(ue_ip_dev[pdcph->inst]);
diff --git a/openair2/NETWORK_DRIVER/UE_IP/constant.h b/openair2/NETWORK_DRIVER/UE_IP/constant.h
index eab1cbe012fb08a91b7a760f06b35124feb7b800..ab960e06d0183043c53c9a932abcba4c090de1ba 100755
--- a/openair2/NETWORK_DRIVER/UE_IP/constant.h
+++ b/openair2/NETWORK_DRIVER/UE_IP/constant.h
@@ -53,7 +53,7 @@
 #define UE_IP_TIMER_IDLE                  UINT_MAX
 #define UE_IP_TIMER_TICK                  HZ
 
-#define UE_IP_PDCPH_SIZE                  sizeof(struct pdcp_data_req_header_t)
+#define UE_IP_PDCPH_SIZE                  sizeof(struct pdcp_data_req_header_s)
 #define UE_IP_IPV4_SIZE                   20
 #define UE_IP_IPV6_SIZE                   40
 
diff --git a/openair2/NETWORK_DRIVER/UE_IP/local.h b/openair2/NETWORK_DRIVER/UE_IP/local.h
index 516ec51ab8b5e652822971bae5535e6f907a8223..6277162d800bbc7f0951621e1a39efc5c7cdf152 100755
--- a/openair2/NETWORK_DRIVER/UE_IP/local.h
+++ b/openair2/NETWORK_DRIVER/UE_IP/local.h
@@ -91,16 +91,21 @@ struct ipversion {
 #endif
 };
 
-typedef struct pdcp_data_req_header_t {
+typedef int traffic_type_t;
+
+
+typedef struct pdcp_data_req_header_s {
   unsigned int           rb_id;
   unsigned int           data_size;
   int                    inst;
+  traffic_type_t         traffic_type;
 } pdcp_data_req_header_t;
 
-typedef struct pdcp_data_ind_header_t {
+typedef struct pdcp_data_ind_header_s {
   unsigned int           rb_id;
   unsigned int           data_size;
   int                    inst;
+  int                    dummy;
 } pdcp_data_ind_header_t;