pdcp header size was not correct, since it changed in PDCP defs.

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4932 818b1a75-f10b-46b9-bf7c-635c3b92a50f

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]);

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
 

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;