diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2014-02-21 20:39:27 +0100 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2014-02-24 01:35:23 +0100 |
commit | 8e946501aef6e3dd5bac12eb45d24df8248672b0 (patch) | |
tree | 5acad1bbc1f71ad268585a96c1168c7ceed1de06 /patches/collateral-evolutions/network/85-hid_ll_driver/net_bluetooth_hidp_core.patch | |
parent | 38009d04f323751d21d01857d3df7dd4571408f4 (diff) |
backports: refresh patches on next-20140221backports-20140221
manual changes were needed on these files:
* patches/backport-adjustments/flow_dissector.patch
* patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hidp_core.patch
* patches/collateral-evolutions/network/83-select_queue/mac80211.patch
* patches/collateral-evolutions/network/83-select_queue/mwifiex.patch
* patches/collateral-evolutions/network/85-hid_ll_driver/net_bluetooth_hidp_core.patch
1 2.6.25 [ OK ]
2 2.6.26 [ OK ]
3 2.6.27 [ OK ]
4 2.6.28 [ OK ]
5 2.6.29 [ OK ]
6 2.6.30 [ OK ]
7 2.6.31 [ OK ]
8 2.6.32 [ OK ]
9 2.6.33 [ OK ]
10 2.6.34 [ OK ]
11 2.6.35 [ OK ]
12 2.6.36 [ OK ]
13 2.6.37 [ OK ]
14 2.6.38 [ OK ]
15 2.6.39 [ OK ]
16 3.0.101 [ OK ]
17 3.1.10 [ OK ]
18 3.2.54 [ OK ]
19 3.3.8 [ OK ]
20 3.4.79 [ OK ]
21 3.5.7 [ OK ]
22 3.6.11 [ OK ]
23 3.7.10 [ OK ]
24 3.8.13 [ OK ]
25 3.9.11 [ OK ]
26 3.10.29 [ OK ]
27 3.11.10 [ OK ]
28 3.12.10 [ OK ]
29 3.13.2 [ OK ]
30 3.14-rc1 [ OK ]
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'patches/collateral-evolutions/network/85-hid_ll_driver/net_bluetooth_hidp_core.patch')
-rw-r--r-- | patches/collateral-evolutions/network/85-hid_ll_driver/net_bluetooth_hidp_core.patch | 36 |
1 files changed, 13 insertions, 23 deletions
diff --git a/patches/collateral-evolutions/network/85-hid_ll_driver/net_bluetooth_hidp_core.patch b/patches/collateral-evolutions/network/85-hid_ll_driver/net_bluetooth_hidp_core.patch index 81d742b2..19b3b854 100644 --- a/patches/collateral-evolutions/network/85-hid_ll_driver/net_bluetooth_hidp_core.patch +++ b/patches/collateral-evolutions/network/85-hid_ll_driver/net_bluetooth_hidp_core.patch @@ -1,48 +1,38 @@ --- a/net/bluetooth/hidp/core.c +++ b/net/bluetooth/hidp/core.c -@@ -355,6 +355,7 @@ err: +@@ -223,6 +223,7 @@ static void hidp_input_report(struct hid + input_sync(dev); } - #endif /* (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,38)) */ +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,15,0) - static int hidp_set_raw_report(struct hid_device *hid, unsigned char reportnum, - unsigned char *data, size_t count, - unsigned char report_type) -@@ -419,6 +420,7 @@ err: + static int hidp_get_raw_report(struct hid_device *hid, + unsigned char report_number, + unsigned char *data, size_t count, +@@ -307,6 +308,7 @@ err: mutex_unlock(&session->report_mutex); return ret; } +#endif - #if defined(CPTCFG_BACKPORT_OPTION_BT_SOCK_CREATE_NEEDS_KERN) - static int hidp_output_raw_report(struct hid_device *hid, unsigned char *data, size_t count, -@@ -489,6 +491,7 @@ static int hidp_output_raw_report(struct + static int hidp_set_raw_report(struct hid_device *hid, unsigned char reportnum, + unsigned char *data, size_t count, +@@ -394,6 +396,7 @@ static int hidp_output_raw_report(struct + return hidp_set_raw_report(hid, data[0], data, count, report_type); } - #endif +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,15,0) static int hidp_raw_request(struct hid_device *hid, unsigned char reportnum, __u8 *buf, size_t len, unsigned char rtype, int reqtype) -@@ -502,7 +505,9 @@ static int hidp_raw_request(struct hid_d +@@ -407,6 +410,7 @@ static int hidp_raw_request(struct hid_d return -EIO; } } +#endif -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,15,0) - static int hidp_output_report(struct hid_device *hid, __u8 *data, size_t count) - { - struct hidp_session *session = hid->driver_data; -@@ -511,6 +516,7 @@ static int hidp_output_report(struct hid - HIDP_TRANS_DATA | HIDP_DATA_RTYPE_OUPUT, - data, count); - } -+#endif - static void hidp_idle_timeout(unsigned long arg) { -@@ -909,8 +915,10 @@ static struct hid_ll_driver hidp_hid_dri +@@ -736,8 +740,10 @@ static struct hid_ll_driver hidp_hid_dri .stop = hidp_stop, .open = hidp_open, .close = hidp_close, @@ -50,6 +40,6 @@ .raw_request = hidp_raw_request, .output_report = hidp_output_report, +#endif - .hidinput_input_event = hidp_hidinput_event, }; + /* This function sets up the hid device. It does not add it |