1 files changed, 5 insertions, 3 deletions

diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c
index a56d9fc6354..98d6ff69d37 100644
--- a/drivers/net/wireless/ipw2200.c
+++ b/drivers/net/wireless/ipw2200.c
@@ -10192,7 +10192,6 @@ static int ipw_tx_skb(struct ipw_priv *priv, struct ieee80211_txb *txb,
         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) {
@@ -10203,8 +10202,10 @@ static int ipw_tx_skb(struct ipw_priv *priv, struct ieee80211_txb *txb,
                         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;
                         }
                 }
@@ -11576,6 +11577,7 @@ static int ipw_prom_alloc(struct ipw_priv *priv)
         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;