From patchwork Fri Mar 8 21:03:22 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Loic Domaigne X-Patchwork-Id: 226260 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 61FA92C0332 for ; Sat, 9 Mar 2013 08:03:33 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932962Ab3CHVD2 (ORCPT ); Fri, 8 Mar 2013 16:03:28 -0500 Received: from mail-bk0-f45.google.com ([209.85.214.45]:37102 "EHLO mail-bk0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932702Ab3CHVD0 (ORCPT ); Fri, 8 Mar 2013 16:03:26 -0500 Received: by mail-bk0-f45.google.com with SMTP id i18so921525bkv.18 for ; Fri, 08 Mar 2013 13:03:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=x-received:date:from:to:cc:subject:message-id:mime-version :content-type:content-disposition:user-agent; bh=eDvKcEf5fx2pEHYxi9sbIuBdawceW2H3bJzyTXL+fSQ=; b=DKdchnuNajnEsq2ER1Pe+UP1uXZs7xefhQ0+FTGzl+QaOWbubS7XTpCB/Js6DfVQ3O yerQ2XJ0fB66PiMiXUa6JcYzUYyR5a4TVk74COhNyyj1e83dUuL49EepoefBhlkpHz/z PSt5BcZWSxWDtTKvxV6AMDxcXQHwbPeSG/1Vcn364Q/TtKs9ZsSWuUknDtLs4GFzzg10 362Jz9fpD8a15/hRj0WKonETDo5FPVGzU4LH66xMn5TC3zm/A2IB2why050DAEUiohk1 cIVjcl6er6iZGrPgU7qH5d+Uq9LvfPIlKik/u7t/Rdb4bKXppBl3AlJ4b/lDGXA75EAc bOWQ== X-Received: by 10.205.114.11 with SMTP id ey11mr1502069bkc.104.1362776604841; Fri, 08 Mar 2013 13:03:24 -0800 (PST) Received: from feynman.loic.net (ppp-93-104-65-44.dynamic.mnet-online.de. [93.104.65.44]) by mx.google.com with ESMTPS id g28sm1959879bkv.17.2013.03.08.13.03.23 (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 08 Mar 2013 13:03:24 -0800 (PST) Date: Fri, 8 Mar 2013 22:03:22 +0100 From: Loic Domaigne To: netdev@vger.kernel.org Cc: linux-usb@vger.kernel.org Subject: RFC: [PATCH 2/3] usb: cdc_ncm: patch for multi kernel versions Message-ID: <20130308210322.GA4795@feynman.loic.net> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch allows to have a single source for many kernel versions. As the NCM driver at jambit runs on a wide range of embedded linux (from 2.6.35 to 3.4.x) we devised this convenient patch. This patch applies to longterm kernel version 3.4.35. Signed-Off-By: Loic Domaigne --- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- linux-3.4.35/drivers/net/usb/cdc_ncm.c.patch1 2013-03-05 10:22:14.361091251 +0100 +++ linux-3.4.35/drivers/net/usb/cdc_ncm.c 2013-03-05 10:33:33.169861281 +0100 @@ -38,6 +38,7 @@ * SUCH DAMAGE. */ +#include /* LINUX_VERSION_CODE and KERNEL_VERSION macro */ #include #include #include @@ -48,7 +49,6 @@ #include #include #include -#include #include #include @@ -1244,8 +1244,30 @@ static const struct ethtool_ops cdc_ncm_ .nway_reset = usbnet_nway_reset, }; +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 3, 0)) + module_usb_driver(cdc_ncm_driver); +#else + +static int __init cdc_ncm_init(void) +{ + pr_info(KBUILD_MODNAME ": " DRIVER_VERSION "\n"); + pr_info(KBUILD_MODNAME ": MirrorLink booster by Jambit\n"); + return usb_register(&cdc_ncm_driver); +} + +module_init(cdc_ncm_init); + +static void __exit cdc_ncm_exit(void) +{ + usb_deregister(&cdc_ncm_driver); +} + +module_exit(cdc_ncm_exit); + +#endif + MODULE_AUTHOR("Hans Petter Selasky"); MODULE_DESCRIPTION("USB CDC NCM host driver"); MODULE_LICENSE("Dual BSD/GPL");