Merge "diag: Add a new data type for delayed response"

This commit is contained in:
Linux Build Service Account 2015-03-20 08:19:07 -07:00 committed by Gerrit - the friendly Code Review server
commit b48f6f91fe
2 changed files with 3 additions and 0 deletions

View file

@ -1641,6 +1641,7 @@ static int diag_user_process_apps_data(const char __user *buf, int len,
case DATA_TYPE_F3:
case DATA_TYPE_LOG:
case DATA_TYPE_RESPONSE:
case DATA_TYPE_DELAYED_RESPONSE:
break;
default:
pr_err_ratelimited("diag: In %s, invalid pkt_type: %d\n",
@ -2023,6 +2024,7 @@ static ssize_t diagchar_write(struct file *file, const char __user *buf,
case DATA_TYPE_EVENT:
case DATA_TYPE_F3:
case DATA_TYPE_LOG:
case DATA_TYPE_DELAYED_RESPONSE:
case DATA_TYPE_RESPONSE:
return diag_user_process_apps_data(payload_buf, payload_len,
pkt_type);

View file

@ -38,6 +38,7 @@
#define DATA_TYPE_F3 1
#define DATA_TYPE_LOG 2
#define DATA_TYPE_RESPONSE 3
#define DATA_TYPE_DELAYED_RESPONSE 4
#define DATA_TYPE_DCI_LOG 0x00000100
#define DATA_TYPE_DCI_EVENT 0x00000200