[kernel] r19955 - in dists/trunk/linux/debian: . patches patches/debian

[Ben Hutchings]

Author: benh
Date: Sun Mar 31 03:02:47 2013
New Revision: 19955

Log:
cdc_ncm,cdc_mbim: Use NCM by default

Added:
   dists/trunk/linux/debian/patches/debian/cdc_ncm-cdc_mbim-use-ncm-by-default.patch
Modified:
   dists/trunk/linux/debian/changelog
   dists/trunk/linux/debian/patches/series

Modified: dists/trunk/linux/debian/changelog
==============================================================================
--- dists/trunk/linux/debian/changelog	Fri Mar 29 23:08:16 2013	(r19954)
+++ dists/trunk/linux/debian/changelog	Sun Mar 31 03:02:47 2013	(r19955)
@@ -9,6 +9,7 @@
     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 <ben at decadent.org.uk>  Wed, 20 Mar 2013 23:32:20 +0000
 

Added: dists/trunk/linux/debian/patches/debian/cdc_ncm-cdc_mbim-use-ncm-by-default.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux/debian/patches/debian/cdc_ncm-cdc_mbim-use-ncm-by-default.patch	Sun Mar 31 03:02:47 2013	(r19955)
@@ -0,0 +1,26 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+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");
+ 

Modified: dists/trunk/linux/debian/patches/series
==============================================================================
--- dists/trunk/linux/debian/patches/series	Fri Mar 29 23:08:16 2013	(r19954)
+++ dists/trunk/linux/debian/patches/series	Sun Mar 31 03:02:47 2013	(r19955)
@@ -87,3 +87,4 @@
 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