From 6dae19ce42f4f6424a37c25f9ec393c1b4bc5c32 Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Thu, 8 Oct 2009 17:01:23 -0400 Subject: [PATCH] 01-netdev.patch: temporary fix for libertas/main.c We'll remove this once John merges my patch. Signed-off-by: Luis R. Rodriguez --- compat/patches/01-netdev.patch | 35 ++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/compat/patches/01-netdev.patch b/compat/patches/01-netdev.patch index 6ec182725b70..a619a01e6ca0 100644 --- a/compat/patches/01-netdev.patch +++ b/compat/patches/01-netdev.patch @@ -534,3 +534,38 @@ 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 + -- 2.30.2