3396a3395,3398
> 	/* Will keep the value that will be returned
> 	 * */
> 	int		retval = 0;
> 	
3402a3405,3406
> 			offset++;
> 			retval = length + 1;
3409c3413,3414
< 			type++;		/* +1 because of first 0x86 byte for UMTS QoS */
---
> 			offset += 3;		/* +1 because of first 0x86 byte for UMTS QoS */
> 			retval = length + 3;
3426c3431,3432
< 			offset--;
---
> 			offset += 2;
> 			retval = length + 3;      /* Actually, will be ignored. */
3430a3437
> 			retval = 0;
3435,3436d3441
< 	offset += type;
< 
3564,3565c3569
< 	return length + type;
< 
---
> 	return retval;