Merge "msm: ipa: fix the ipa inactivity timer issue"

#define IPV4_HDR_NAME "rndis_eth_ipv4"

#define IPV6_HDR_NAME "rndis_eth_ipv6"

#define IPA_TO_USB_CLIENT IPA_CLIENT_USB_CONS

#define INACTIVITY_MSEC_DELAY 1000

#define INACTIVITY_MSEC_DELAY 100

#define DEFAULT_OUTSTANDING_HIGH 64

#define DEFAULT_OUTSTANDING_LOW 32

#define DEBUGFS_TEMP_BUF_SIZE 4

#define WWAN_METADATA_SHFT 24

#define WWAN_METADATA_MASK 0xFF000000

#define WWAN_DATA_LEN 2000

#define IPA_RM_INACTIVITY_TIMER 1000 /* IPA_RM */

#define IPA_RM_INACTIVITY_TIMER 100 /* IPA_RM */

#define HEADROOM_FOR_QMAP   8 /* for mux header */

#define TAILROOM            0 /* for padding by mux layer */

#define MAX_NUM_OF_MUX_CHANNEL  10 /* max mux channels */