Return-path: Received: from mout0.freenet.de ([195.4.92.90]:57685 "EHLO mout0.freenet.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752878Ab2AWS0Z (ORCPT ); Mon, 23 Jan 2012 13:26:25 -0500 Received: from [195.4.92.140] (helo=mjail0.freenet.de) by mout0.freenet.de with esmtpa (ID andihartmann@freenet.de) (port 25) (Exim 4.76 #1) id 1RpOb2-00029L-5I for linux-wireless@vger.kernel.org; Mon, 23 Jan 2012 19:26:24 +0100 Received: from localhost ([::1]:44699 helo=mjail0.freenet.de) by mjail0.freenet.de with esmtpa (ID andihartmann@freenet.de) (Exim 4.76 #1) id 1RpOb2-0000ra-4a for linux-wireless@vger.kernel.org; Mon, 23 Jan 2012 19:26:24 +0100 Received: from [195.4.92.19] (port=34924 helo=9.mx.freenet.de) by mjail0.freenet.de with esmtpa (ID andihartmann@freenet.de) (Exim 4.76 #1) id 1RpOYS-0006w7-VZ for linux-wireless@vger.kernel.org; Mon, 23 Jan 2012 19:23:44 +0100 Received: from [2002:4fde:11a5:2:5054:ff:feb8:40bd] (port=45558 helo=mail.maya.org) by 9.mx.freenet.de with esmtpsa (ID andihartmann@freenet.de) (TLSv1:AES256-SHA:256) (port 25) (Exim 4.76 #1) id 1RpOYS-00025m-GZ for linux-wireless@vger.kernel.org; Mon, 23 Jan 2012 19:23:44 +0100 Message-ID: <4F1DA5A6.2040407@maya.org> (sfid-20120123_192629_000347_E822D4B8) Date: Mon, 23 Jan 2012 19:23:34 +0100 From: Andreas Hartmann MIME-Version: 1.0 To: Hauke Mehrtens CC: "Luis R. Rodriguez" , linux-wireless@vger.kernel.org Subject: Re: [PATCH] compat: add __cancel_delayed_work() References: <1327153475-28081-1-git-send-email-hauke@hauke-m.de> <201201231755.q0NHtQUR002682@mail.maya.org> <4F1DA06C.5080605@hauke-m.de> In-Reply-To: <4F1DA06C.5080605@hauke-m.de> Content-Type: text/plain; charset=UTF-8 Sender: linux-wireless-owner@vger.kernel.org List-ID: Hauke Mehrtens schrieb: > On 01/23/2012 06:57 PM, Luis R. Rodriguez wrote: >> On Mon, Jan 23, 2012 at 9:55 AM, Andreas Hartmann >> wrote: >>> Luis R. Rodriguez schrieb: >>>> On Sat, Jan 21, 2012 at 5:44 AM, Hauke Mehrtens wrote: >>>>> __cancel_delayed_work is needed by include/net/bluetooth/l2cap.h and >>>>> not available in old kernel versions. This was just copied from the >>>>> kernel. >>>>> >>>>> This should also go into compat-wireless-stable-3.3. >>>>> >>>>> Signed-off-by: Hauke Mehrtens >>>> >>>> Thanks! Applied all onto compat-wireless.git and compat.git, in >>>> addition to the linux-3.3.y branch for compat.git as you indicated for >>>> this patch. Will roll out a new tarball right away. >>> >>> BTW: I've to apply always the following patch to some older >>> compat-wireless packages (3.2 e.g) to get it compiled with kernel 3.1: >>> >>> --- drivers/misc/eeprom/Makefile.orig 2012-01-10 02:10:51.000000000 +0100 >>> +++ drivers/misc/eeprom/Makefile 2012-01-10 05:14:40.082494612 +0100 >>> @@ -1,3 +1,3 @@ >>> obj-$(CONFIG_EEPROM_93CX6) += eeprom_93cx6.o >>> -obj-$(CONFIG_EEPROM_93XX46) += eeprom_93xx46.o >>> +# obj-$(CONFIG_EEPROM_93XX46) += eeprom_93xx46.o >>> obj-$(CONFIG_EEPROM_DIGSY_MTC_CFG) += digsy_mtc_eeprom.o >>> >>> Is this eventually needed in 3.3, too? >> >> Why do you need this? Can you show your compile errors? >> >> Luis > > This is fixed in HEAD in this commit: > > commit 0db9fae8c40674f65cf50c78e6587b9c9d9e2735 > Author: Hauke Mehrtens > Date: Sat Dec 3 15:46:21 2011 +0100 > > compat-wireless: remove some modules from Makefile > > It should be backported to linux-3.1.y and linux-3.2.y. We just ship > eeprom_93cx6.c and nothing else in this directory. Thank you, Andreas