From patchwork Sat Oct 17 21:06:45 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hauke Mehrtens X-Patchwork-Id: 54569 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 n9HL6tCs016358 for ; Sat, 17 Oct 2009 21:06:55 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753826AbZJQVGu (ORCPT ); Sat, 17 Oct 2009 17:06:50 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753825AbZJQVGu (ORCPT ); Sat, 17 Oct 2009 17:06:50 -0400 Received: from server19320154104.serverpool.info ([193.201.54.104]:49855 "EHLO hauke-m.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751969AbZJQVGt (ORCPT ); Sat, 17 Oct 2009 17:06:49 -0400 Received: from localhost (localhost [127.0.0.1]) by hauke-m.de (Postfix) with ESMTP id 4A3858263; Sat, 17 Oct 2009 23:06:50 +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 RLBCB+6lR6ty; Sat, 17 Oct 2009 23:06:47 +0200 (CEST) Received: from localhost.localdomain (host-091-096-211-194.ewe-ip-backbone.de [91.96.211.194]) by hauke-m.de (Postfix) with ESMTPSA id E45A38244; Sat, 17 Oct 2009 23:06:46 +0200 (CEST) From: Hauke Mehrtens To: lrodriguez@atheros.com Cc: linux-wireless@vger.kernel.org, Hauke Mehrtens Subject: [PATCH] [compat-2.6 and compat-2.6-stable] rename ieee80211_rx Date: Sat, 17 Oct 2009 23:06:45 +0200 Message-Id: <1255813605-19366-1-git-send-email-hauke@hauke-m.de> X-Mailer: git-send-email 1.6.2.1 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org diff --git a/compat/compat-2.6.32.h b/compat/compat-2.6.32.h index ad7f01b..1362e3e 100644 --- a/compat/compat-2.6.32.h +++ b/compat/compat-2.6.32.h @@ -71,6 +71,9 @@ struct dev_pm_ops name = { \ #define wireless_send_event(a, b, c, d) wireless_send_event(a, b, c, (char * ) d) +/* The export symbol in changed in compat/patches/15-symbol-export-conflicts.patch */ +#define ieee80211_rx(hw, skb) mac80211_ieee80211_rx(hw, skb) + #endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,32)) */ #endif /* LINUX_26_32_COMPAT_H */ diff --git a/compat/patches/15-symbol-export-conflicts.patch b/compat/patches/15-symbol-export-conflicts.patch new file mode 100644 index 0000000..e095f9b --- /dev/null +++ b/compat/patches/15-symbol-export-conflicts.patch @@ -0,0 +1,20 @@ +In kernel < 2.6.32 libipw also exports ieee80211_rx. +To avoid conflicts with the other export we rename our. + +diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c +index 5c385e3..26e5fc9 100644 +--- a/net/mac80211/rx.c ++++ b/net/mac80211/rx.c +@@ -2545,7 +2545,12 @@ void ieee80211_rx(struct ieee80211_hw *hw, struct sk_buff *skb) + drop: + kfree_skb(skb); + } ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32)) + EXPORT_SYMBOL(ieee80211_rx); ++#else ++EXPORT_SYMBOL(mac80211_ieee80211_rx); ++#endif ++ + + /* This is a version of the rx handler that can be called from hard irq + * context. Post the skb on the queue and schedule the tasklet */