[PATCH] b43, b43legacy: Fix inconsistency between branches 'b43' and 'everything' in wireless-dev

[PATCH] b43, b43legacy: Fix inconsistency between branches 'b43' and 'everything' in wireless-dev

[Larry Finger]

One of Johannes's 27 patches changed the definition of the set_key callback.
Because his change got applied to the 'everything' branch, and the changes in the
b43 drivers to the 'b43' branch, the drivers in that branch are out of synch and an
"initialization from incompatible pointer type" warning is generated. When this patch
is applied to branch 'b43', it is internally consistent.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
---

John,

I'm not sure how to handle this. In it's present state, branch 'b43' cannot be used
to generate a working version of b43 or b43legacy. In addition,  the Kconfig and Makefile
from b43legacy are not included, thus it is not possible to build b43legacy
in that branch.

Larry

  
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index 9a0cf2b..19e9cf1 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -2861,8 +2861,8 @@ static int b43_dev_config(struct ieee80211_hw *hw, struct ieee80211_conf *conf)
 }
 
 static int b43_dev_set_key(struct ieee80211_hw *hw,
-			   set_key_cmd cmd, const u8 *local_addr,
-			   const u8 *addr, struct ieee80211_key_conf *key)
+			   set_key_cmd cmd, u8 *addr,
+			   struct ieee80211_key_conf *key, int aid)
 {
 	struct b43_wl *wl = hw_to_b43_wl(hw);
 	struct b43_wldev *dev = wl->current_dev;
diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c
index 980cb81..f9d6938 100644
--- a/drivers/net/wireless/b43legacy/main.c
+++ b/drivers/net/wireless/b43legacy/main.c
@@ -2686,9 +2686,8 @@ out_unlock_mutex:
 }
 
 static int b43legacy_dev_set_key(struct ieee80211_hw *hw,
-				 set_key_cmd cmd,
-				 const u8 *local_addr, const u8 *addr,
-				 struct ieee80211_key_conf *key)
+				 set_key_cmd cmd, u8 *addr,
+				 struct ieee80211_key_conf *key, int aid)
 {
 	struct b43legacy_wl *wl = hw_to_b43legacy_wl(hw);
 	struct b43legacy_wldev *dev = wl->current_dev;

Re: [PATCH] b43, b43legacy: Fix inconsistency between branches 'b43' and 'everything' in wireless-dev

[John W. Linville]

On Thu, Aug 23, 2007 at 06:05:40PM -0500, Larry Finger wrote:

> I'm not sure how to handle this. In it's present state, branch 'b43' cannot be used
> to generate a working version of b43 or b43legacy. In addition,  the Kconfig and Makefile
> from b43legacy are not included, thus it is not possible to build b43legacy
> in that branch.

I had neglected to pull the mac80211 updates into the branches that
depend on them (now most of the driver branches).  I have done that
now, and pushed the results.

Hth!

John

P.S.  FWIW, b43legacy seems to have Kconfig and Makefile in my tree.
I was able to build it just fine.  Yes, I checked to make sure I had
included them in git. :-)
-- 
John W. Linville
linville@tuxdriver.com