From patchwork Mon Oct 12 21:19:13 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hauke Mehrtens X-Patchwork-Id: 53213 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n9CLU8JZ025169 for ; Mon, 12 Oct 2009 21:30:09 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758305AbZJLVUo (ORCPT ); Mon, 12 Oct 2009 17:20:44 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758302AbZJLVUn (ORCPT ); Mon, 12 Oct 2009 17:20:43 -0400 Received: from server19320154104.serverpool.info ([193.201.54.104]:47119 "EHLO hauke-m.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758229AbZJLVUn (ORCPT ); Mon, 12 Oct 2009 17:20:43 -0400 Received: from localhost (localhost [127.0.0.1]) by hauke-m.de (Postfix) with ESMTP id C7A62820D; Mon, 12 Oct 2009 23:19:33 +0200 (CEST) Received: from hauke-m.de ([127.0.0.1]) by localhost (hauke-m.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id fcLj2TOsCNMP; Mon, 12 Oct 2009 23:19:30 +0200 (CEST) Received: from localhost.localdomain (dyndsl-085-016-164-212.ewe-ip-backbone.de [85.16.164.212]) by hauke-m.de (Postfix) with ESMTPSA id C9601820E; Mon, 12 Oct 2009 23:19:21 +0200 (CEST) From: Hauke Mehrtens To: lrodriguez@atheros.com Cc: linux-wireless@vger.kernel.org, Hauke Mehrtens Subject: [PATCH 4/9] [compat-2.6] Fix compile bug with kernel 2.6.32 Date: Mon, 12 Oct 2009 23:19:13 +0200 Message-Id: <1255382358-20760-6-git-send-email-hauke@hauke-m.de> X-Mailer: git-send-email 1.6.2.1 In-Reply-To: <1255382358-20760-1-git-send-email-hauke@hauke-m.de> References: <1255382358-20760-1-git-send-email-hauke@hauke-m.de> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org diff --git a/compat/patches/12-iw_handler-changes.patch b/compat/patches/12-iw_handler-changes.patch index 50c9b1a..7a700b1 100644 --- a/compat/patches/12-iw_handler-changes.patch +++ b/compat/patches/12-iw_handler-changes.patch @@ -1,11 +1,14 @@ --- a/drivers/net/wireless/ipw2x00/ipw2100.c 2009-10-08 11:01:52.000000000 -0400 +++ b/drivers/net/wireless/ipw2x00/ipw2100.c 2009-10-08 11:01:43.000000000 -0400 -@@ -6057,7 +6057,7 @@ +@@ -6057,7 +6057,11 @@ dev->ethtool_ops = &ipw2100_ethtool_ops; dev->wireless_handlers = &ipw2100_wx_handler_def; -- priv->wireless_data.libipw = priv->ieee; ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,31)) + priv->wireless_data.libipw = priv->ieee; ++#else + priv->wireless_data.ieee80211 = (struct ieee80211_device *) priv->ieee; ++#endif dev->wireless_data = &priv->wireless_data; dev->watchdog_timeo = 3 * HZ; dev->irq = 0;