diff options
| author | Jiri Kosina <jkosina@suse.com> | 2025-06-03 09:23:09 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.com> | 2025-06-03 09:23:09 +0200 |
| commit | 6f96598984a0e4ba7d4e92566b25dbf30ab1f387 (patch) | |
| tree | d417927409957d03ce6b7f32191b031fcfad65ab /include/linux | |
| parent | ad78d7e364a7f26ceed91d2e3b2b3f6bd19ef557 (diff) | |
| parent | a058002358b7aaf14674b2a0daa5194bfa5720a1 (diff) | |
Merge branch 'for-6.16/core' into for-linus
- make it possible to set hid_mouse_ignore_list dynamically (the same way we
handle other quirks) (Aditya Garg)
- fix potential OOB in usbhid_parse() (Terry Junge)
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/hid.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/hid.h b/include/linux/hid.h index ef9a90ca0fbd..a1305210b2fd 100644 --- a/include/linux/hid.h +++ b/include/linux/hid.h @@ -357,6 +357,7 @@ struct hid_item { * | @HID_QUIRK_INPUT_PER_APP: * | @HID_QUIRK_X_INVERT: * | @HID_QUIRK_Y_INVERT: + * | @HID_QUIRK_IGNORE_MOUSE: * | @HID_QUIRK_SKIP_OUTPUT_REPORTS: * | @HID_QUIRK_SKIP_OUTPUT_REPORT_ID: * | @HID_QUIRK_NO_OUTPUT_REPORTS_ON_INTR_EP: @@ -382,6 +383,7 @@ struct hid_item { #define HID_QUIRK_INPUT_PER_APP BIT(11) #define HID_QUIRK_X_INVERT BIT(12) #define HID_QUIRK_Y_INVERT BIT(13) +#define HID_QUIRK_IGNORE_MOUSE BIT(14) #define HID_QUIRK_SKIP_OUTPUT_REPORTS BIT(16) #define HID_QUIRK_SKIP_OUTPUT_REPORT_ID BIT(17) #define HID_QUIRK_NO_OUTPUT_REPORTS_ON_INTR_EP BIT(18) @@ -740,8 +742,9 @@ struct hid_descriptor { __le16 bcdHID; __u8 bCountryCode; __u8 bNumDescriptors; + struct hid_class_descriptor rpt_desc; - struct hid_class_descriptor desc[1]; + struct hid_class_descriptor opt_descs[]; } __attribute__ ((packed)); #define HID_DEVICE(b, g, ven, prod) \ |