From patchwork Wed Apr 7 05:31:02 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Roskin X-Patchwork-Id: 90924 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o375V79x021275 for ; Wed, 7 Apr 2010 05:31:09 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752133Ab0DGFbF (ORCPT ); Wed, 7 Apr 2010 01:31:05 -0400 Received: from c60.cesmail.net ([216.154.195.49]:65104 "EHLO c60.cesmail.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751424Ab0DGFbD (ORCPT ); Wed, 7 Apr 2010 01:31:03 -0400 Received: from unknown (HELO smtprelay2.cesmail.net) ([192.168.1.112]) by c60.cesmail.net with ESMTP; 07 Apr 2010 01:31:03 -0400 Received: from mj.roinet.com (static-72-92-88-10.phlapa.fios.verizon.net [72.92.88.10]) by smtprelay2.cesmail.net (Postfix) with ESMTPSA id 9DC1D34C6A; Wed, 7 Apr 2010 01:35:32 -0400 (EDT) Subject: [PATCH 3/4] compat-wireless: remove 25-device_create.patch, it's handled by compat To: "Luis R. Rodriguez" , linux-wireless@vger.kernel.org From: Pavel Roskin Date: Wed, 07 Apr 2010 01:31:02 -0400 Message-ID: <20100407053102.23575.37321.stgit@mj.roinet.com> In-Reply-To: <20100407053051.23575.94594.stgit@mj.roinet.com> References: <20100407053051.23575.94594.stgit@mj.roinet.com> User-Agent: StGit/0.15-58-geec5 MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Wed, 07 Apr 2010 05:31:09 +0000 (UTC) diff --git a/patches/25-device_create.patch b/patches/25-device_create.patch deleted file mode 100644 index 232816e..0000000 --- a/patches/25-device_create.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/drivers/net/wireless/mac80211_hwsim.c -+++ b/drivers/net/wireless/mac80211_hwsim.c -@@ -1211,8 +1211,17 @@ static int __init init_mac80211_hwsim(vo - data = hw->priv; - data->hw = hw; - -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)) - data->dev = device_create(hwsim_class, NULL, 0, hw, - "hwsim%d", i); -+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)) -+ data->dev = device_create_drvdata(hwsim_class, NULL, 0, hw, -+ "hwsim%d", i); -+#else -+ data->dev = device_create(hwsim_class, NULL, 0, -+ "hwsim%d", i); -+ dev_set_drvdata(data->dev, hw); -+#endif - if (IS_ERR(data->dev)) { - printk(KERN_DEBUG - "mac80211_hwsim: device_create "