From: David S. Miller <davem@davemloft.net>
Date: Wed, 9 Apr 2008 22:10:14 +0000 (-0700)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v2.6.25-rc9~4^2~5
X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=b41f5bfff73f244101b34f3603974ef7aeadf545;hp=-c

Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-2.6
---

b41f5bfff73f244101b34f3603974ef7aeadf545
diff --combined drivers/net/wireless/ipw2200.c
index 0d78e40919cf,b34c275f4985..98d6ff69d375
--- a/drivers/net/wireless/ipw2200.c
+++ b/drivers/net/wireless/ipw2200.c
@@@ -10192,6 -10192,7 +10192,6 @@@ static int ipw_tx_skb(struct ipw_priv *
  	u8 id, hdr_len, unicast;
  	u16 remaining_bytes;
  	int fc;
 -	DECLARE_MAC_BUF(mac);
  
  	hdr_len = ieee80211_get_hdrlen(le16_to_cpu(hdr->frame_ctl));
  	switch (priv->ieee->iw_mode) {
@@@ -10202,10 -10203,8 +10202,10 @@@
  			id = ipw_add_station(priv, hdr->addr1);
  			if (id == IPW_INVALID_STATION) {
  				IPW_WARNING("Attempt to send data to "
 -					    "invalid cell: %s\n",
 -					    print_mac(mac, hdr->addr1));
 +					    "invalid cell: " MAC_FMT "\n",
 +					    hdr->addr1[0], hdr->addr1[1],
 +					    hdr->addr1[2], hdr->addr1[3],
 +					    hdr->addr1[4], hdr->addr1[5]);
  				goto drop;
  			}
  		}
@@@ -11577,6 -11576,7 +11577,7 @@@ static int ipw_prom_alloc(struct ipw_pr
  	priv->prom_priv->priv = priv;
  
  	strcpy(priv->prom_net_dev->name, "rtap%d");
+ 	memcpy(priv->prom_net_dev->dev_addr, priv->mac_addr, ETH_ALEN);
  
  	priv->prom_net_dev->type = ARPHRD_IEEE80211_RADIOTAP;
  	priv->prom_net_dev->open = ipw_prom_open;