From: Hauke Mehrtens Date: Mon, 12 Oct 2009 21:19:14 +0000 (+0200) Subject: Remove temporary fix X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ec83e8ae53bd12c19bd3868e05f6fe9ea65714c2;p=openwrt%2Fstaging%2Fblogic.git Remove temporary fix Remove temporary fix from 6dae19ce42f4f6424a37c25f9ec393c1b4bc5c32 it is now in John's tree Signed-off-by: Hauke Mehrtens --- diff --git a/compat/patches/01-netdev.patch b/compat/patches/01-netdev.patch index a619a01e6ca0..6ec182725b70 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 -