From 0fd3db57d9020d7b47f3e35849ca468c4e970804 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sun, 31 Mar 2013 03:02:47 +0000 Subject: [PATCH] cdc_ncm,cdc_mbim: Use NCM by default svn path=/dists/trunk/linux/; revision=19955 --- debian/changelog | 1 + .../cdc_ncm-cdc_mbim-use-ncm-by-default.patch | 26 +++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 28 insertions(+) create mode 100644 debian/patches/debian/cdc_ncm-cdc_mbim-use-ncm-by-default.patch diff --git a/debian/changelog b/debian/changelog index d7c903a43..f476167bf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ linux (3.8.5-1~experimental.1) UNRELEASED; urgency=low introduced by fix for CVE-2013-0914) * udeb: Add hid-generic, hid-holtek-kbd, hid-lenovo-tpkbd, hid-roccat-isku, hid-roccat-lua, hid-roccat-savu to input-modules + * cdc_ncm,cdc_mbim: Use NCM by default -- Ben Hutchings Wed, 20 Mar 2013 23:32:20 +0000 diff --git a/debian/patches/debian/cdc_ncm-cdc_mbim-use-ncm-by-default.patch b/debian/patches/debian/cdc_ncm-cdc_mbim-use-ncm-by-default.patch new file mode 100644 index 000000000..e8de4f9ff --- /dev/null +++ b/debian/patches/debian/cdc_ncm-cdc_mbim-use-ncm-by-default.patch @@ -0,0 +1,26 @@ +From: Ben Hutchings +Subject: cdc_ncm,cdc_mbim: Use NCM by default +Date: Sun, 31 Mar 2013 03:58:04 +0100 + +Devices that support both NCM and MBIM modes should be kept in NCM +mode unless there is userland support for MBIM. + +Set the default value of cdc_ncm.prefer_mbim to false and leave it to +userland (modem-manager) to override this with a modprobe.conf file +once it's ready to speak MBIM. + +--- +--- a/drivers/net/usb/cdc_ncm.c ++++ b/drivers/net/usb/cdc_ncm.c +@@ -55,11 +55,7 @@ + + #define DRIVER_VERSION "14-Mar-2012" + +-#if IS_ENABLED(CONFIG_USB_NET_CDC_MBIM) +-static bool prefer_mbim = true; +-#else + static bool prefer_mbim; +-#endif + module_param(prefer_mbim, bool, S_IRUGO | S_IWUSR); + MODULE_PARM_DESC(prefer_mbim, "Prefer MBIM setting on dual NCM/MBIM functions"); + diff --git a/debian/patches/series b/debian/patches/series index 7d588238a..226c2605b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -87,3 +87,4 @@ debian/efivars-remove-check-for-50-full-on-write.patch bugfix/x86/KVM-x86-fix-for-buffer-overflow-in-handling-of-MSR_K.patch bugfix/x86/KVM-x86-Convert-MSR_KVM_SYSTEM_TIME-to-use-gfn_to_hv.patch bugfix/all/KVM-Fix-bounds-checking-in-ioapic-indirect-register-.patch +debian/cdc_ncm-cdc_mbim-use-ncm-by-default.patch