Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Wed, 9 Apr 2008 22:10:14 +0000 (15:10 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 9 Apr 2008 22:10:14 +0000 (15:10 -0700)
1  2 
drivers/net/wireless/ipw2200.c

index 0d78e40919cf6ff1a632f3c15a040d63128de001,b34c275f49852668ba8356b7887f635960cdb0a3..98d6ff69d3755949309509c2f37a3ca935abd8d9
@@@ -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) {
                        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;