diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-06-28 02:34:28 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-06-28 02:34:27 -0700 |
| commit | 14efecefa760800fa4d6974054b52e3e7ca91d3f (patch) | |
| tree | e1d877bcca0ed1ab28fc6f6f897fafb964953545 /include/uapi | |
| parent | 66c519deb658ad6c8395d681bc6123a8098a7752 (diff) | |
| parent | f9cff13b5d3e04e897a495168da90933b503a6cc (diff) | |
Merge "Merge android-4.4.135 (c9d74f2) into msm-4.4"
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/drm/virtgpu_drm.h | 1 | ||||
| -rw-r--r-- | include/uapi/linux/if_ether.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/include/uapi/drm/virtgpu_drm.h b/include/uapi/drm/virtgpu_drm.h index fc9e2d6e5e2f..232367124712 100644 --- a/include/uapi/drm/virtgpu_drm.h +++ b/include/uapi/drm/virtgpu_drm.h @@ -60,6 +60,7 @@ struct drm_virtgpu_execbuffer { }; #define VIRTGPU_PARAM_3D_FEATURES 1 /* do we have 3D features in the hw */ +#define VIRTGPU_PARAM_CAPSET_QUERY_FIX 2 /* do we have the capset fix */ struct drm_virtgpu_getparam { uint64_t param; diff --git a/include/uapi/linux/if_ether.h b/include/uapi/linux/if_ether.h index a3e44bc9889b..602aca385a27 100644 --- a/include/uapi/linux/if_ether.h +++ b/include/uapi/linux/if_ether.h @@ -29,6 +29,7 @@ */ #define ETH_ALEN 6 /* Octets in one ethernet addr */ +#define ETH_TLEN 2 /* Octets in ethernet type field */ #define ETH_HLEN 14 /* Total octets in header. */ #define ETH_ZLEN 60 /* Min. octets in frame sans FCS */ #define ETH_DATA_LEN 1500 /* Max. octets in payload */ |