Also remove a few stray DECLARE_MAC_BUF that were no longer

used at all.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>

---

Not sure this will apply to your tree, I prepared it against John's tree

which might have more things. If you put the previous patch in, I

suppose John _could_ put it into his tree, but then he'd have to pull in

yours which he normally doesn't... No idea. I can also just postpone

this?
 net/mac80211/debugfs_key.c    |    4 -

 net/mac80211/debugfs_netdev.c |    3 -

 net/mac80211/debugfs_sta.c    |    5 -

 net/mac80211/event.c          |    5 -

 net/mac80211/ht.c             |   42 +++++---------

 net/mac80211/key.c            |   10 +--

 net/mac80211/mesh_plink.c     |   49 +++++-----------

 net/mac80211/mlme.c           |  125 ++++++++++++++++--------------------------

 net/mac80211/rx.c             |   38 ++++--------

 net/mac80211/sta_info.c       |   33 ++++-------

 net/mac80211/tkip.c           |   10 +--

 net/mac80211/tx.c             |   24 +++-----

 net/mac80211/wme.c            |    8 +-

 net/mac80211/wpa.c            |    3 -

 14 files changed, 132 insertions(+), 227 deletions(-)
--- everything.orig/net/mac80211/debugfs_key.c	2008-10-25 01:42:52.000000000 +0200

+++ everything/net/mac80211/debugfs_key.c	2008-10-25 01:44:43.000000000 +0200

@@ -188,7 +188,6 @@ void ieee80211_debugfs_key_add(struct ie

   {

 	static int keycount;

 	char buf[50];

-	DECLARE_MAC_BUF(mac);

 	struct sta_info *sta;
 	if (!key->local->debugfs.keys)

@@ -206,8 +205,7 @@ void ieee80211_debugfs_key_add(struct ie

 	rcu_read_lock();

 	sta = rcu_dereference(key->sta);

 	if (sta)

-		sprintf(buf, "../../stations/%s",

-			print_mac(mac, sta->sta.addr));

+		sprintf(buf, "../../stations/%pM", sta->sta.addr);

 	rcu_read_unlock();
 	/* using sta as a boolean is fine outside RCU lock */

--- everything.orig/net/mac80211/debugfs_netdev.c	2008-10-25 01:42:51.000000000 +0200

+++ everything/net/mac80211/debugfs_netdev.c	2008-10-25 01:44:43.000000...
[ message continues ]

From: Johannes Berg <johannes@sipsolutions.net>
I munged this to apply to my tree, the only conflicts were in

mlme.c
Sorry John, one of us had to deal with this :-)

--

John, you can always just take your version, and if I see print_mac show

up in mac80211 again then I'll send you another patch.
johannes

No, this seems fine to me.  I'll try to stay aware of it for possible

merge conflicts...
John

--

John W. Linville		Linux should be at the core

linville@tuxdriver.com			of your literate lifestyle.

--