From patchwork Mon Oct 12 21:19:14 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hauke Mehrtens X-Patchwork-Id: 53215 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 n9CLU8Jb025169 for ; Mon, 12 Oct 2009 21:30:10 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758303AbZJLVUp (ORCPT ); Mon, 12 Oct 2009 17:20:45 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758307AbZJLVUo (ORCPT ); Mon, 12 Oct 2009 17:20:44 -0400 Received: from server19320154104.serverpool.info ([193.201.54.104]:47120 "EHLO hauke-m.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758279AbZJLVUn (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 37026820E; Mon, 12 Oct 2009 23:19:36 +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 0ofuXZVgtxJj; Mon, 12 Oct 2009 23:19:32 +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 2EA69820F; Mon, 12 Oct 2009 23:19:22 +0200 (CEST) From: Hauke Mehrtens To: lrodriguez@atheros.com Cc: linux-wireless@vger.kernel.org, Hauke Mehrtens Subject: [PATCH 5/9] [compat-2.6] Remove temporary fix Date: Mon, 12 Oct 2009 23:19:14 +0200 Message-Id: <1255382358-20760-7-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/01-netdev.patch b/compat/patches/01-netdev.patch index a619a01..6ec1827 100644 --- a/compat/patches/01-netdev.patch +++ b/compat/patches/01-netdev.patch @@ -534,38 +534,3 @@ without creating a headache on maintenance of the pathes. dev->destructor = free_netdev; ether_setup(dev); dev->tx_queue_len = 0; - - -Remove this after John picks this up: - -From 8fe3f6159c61a7c88a2bd160e8281d62e3978bed Mon Sep 17 00:00:00 2001 -From: Luis R. Rodriguez -Date: Thu, 8 Oct 2009 16:43:57 -0400 -Subject: [PATCH] libertas: remove double assignment of dev->netdev_ops - -This came in through the patch titled: - libertas: first stab at cfg80211 support - -I only noticed it because it breaks compat-wireless :) - -Cc: Holger Schurig -Signed-off-by: Luis R. Rodriguez ---- - drivers/net/wireless/libertas/main.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c -index e6da1df..87bfd17 100644 ---- a/drivers/net/wireless/libertas/main.c -+++ b/drivers/net/wireless/libertas/main.c -@@ -1276,7 +1276,6 @@ struct lbs_private *lbs_add_card(void *card, struct device *dmdev) - goto err_adapter; - } - -- dev->netdev_ops = &lbs_netdev_ops; - dev->ieee80211_ptr = wdev; - dev->ml_priv = priv; - SET_NETDEV_DEV(dev, dmdev); --- -1.6.0.4 -