From: Greg Kroah-Hartman Date: Fri, 7 Jul 2017 13:37:36 +0000 (+0200) Subject: 4.4-stable patches X-Git-Tag: v4.9.37~29 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0ed33ff9f4099a76c35fcc410c02ed0a5d8044e2;p=thirdparty%2Fkernel%2Fstable-queue.git 4.4-stable patches added patches: mac80211_hwsim-replace-bogus-hrtimer-clockid.patch --- diff --git a/queue-4.4/mac80211_hwsim-replace-bogus-hrtimer-clockid.patch b/queue-4.4/mac80211_hwsim-replace-bogus-hrtimer-clockid.patch new file mode 100644 index 00000000000..f01035e42fa --- /dev/null +++ b/queue-4.4/mac80211_hwsim-replace-bogus-hrtimer-clockid.patch @@ -0,0 +1,33 @@ +From 8fbcfeb8a9cc803464d6c166e7991913711c612c Mon Sep 17 00:00:00 2001 +From: Thomas Gleixner +Date: Sat, 25 Feb 2017 10:27:37 +0000 +Subject: mac80211_hwsim: Replace bogus hrtimer clockid + +From: Thomas Gleixner + +commit 8fbcfeb8a9cc803464d6c166e7991913711c612c upstream. + +mac80211_hwsim initializes a hrtimer with clockid +CLOCK_MONOTONIC_RAW. That's not supported. + +Use CLOCK_MONOTONIC instead. + +Signed-off-by: Thomas Gleixner +Signed-off-by: Johannes Berg +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/net/wireless/mac80211_hwsim.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/net/wireless/mac80211_hwsim.c ++++ b/drivers/net/wireless/mac80211_hwsim.c +@@ -2539,7 +2539,7 @@ static int mac80211_hwsim_new_radio(stru + + tasklet_hrtimer_init(&data->beacon_timer, + mac80211_hwsim_beacon, +- CLOCK_MONOTONIC_RAW, HRTIMER_MODE_ABS); ++ CLOCK_MONOTONIC, HRTIMER_MODE_ABS); + + spin_lock_bh(&hwsim_radio_lock); + list_add_tail(&data->list, &hwsim_radios); diff --git a/queue-4.4/series b/queue-4.4/series index eef9e0ecae9..b8f99512d64 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -10,3 +10,4 @@ usb-serial-cp210x-add-id-for-cel-em3588-usb-zigbee-stick.patch add-usb-quirk-for-hvr-950q-to-avoid-intermittent-device-resets.patch usb-usbip-set-buffer-pointers-to-null-after-free.patch usb-fix-typo-in-the-definition-of-endpointrequest.patch +mac80211_hwsim-replace-bogus-hrtimer-clockid.patch