Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[karo-tx-linux.git] / drivers / net / wireless / mwl8k.c

diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c
index 83967afe0821681ca7140c08fac2d47bd3d4419e..8a6d3afe41227741a1c61af92777a53466972767 100644 (file)
--- a/drivers/net/wireless/mwl8k.c
+++ b/drivers/net/wireless/mwl8k.c
@@ -1049,7 +1049,8 @@ static int rxq_process(struct ieee80211_hw *hw, int index, int limit)
                status.flag = 0;
                status.band = IEEE80211_BAND_2GHZ;
                status.freq = ieee80211_channel_to_frequency(rx_desc->channel);
-               ieee80211_rx_irqsafe(hw, skb, &status);
+               memcpy(IEEE80211_SKB_RXCB(skb), &status, sizeof(status));
+               ieee80211_rx_irqsafe(hw, skb);
 
                processed++;
        }
@@ -2273,7 +2274,6 @@ static int mwl8k_cmd_update_sta_db(struct ieee80211_hw *hw,
        struct mwl8k_cmd_update_sta_db *cmd;
        struct peer_capability_info *peer_info;
        struct ieee80211_rate *bitrates = mv_vif->legacy_rates;
-       DECLARE_MAC_BUF(mac);
        int rc;
        __u8 count, *rates;
 
@@ -3486,7 +3486,6 @@ static int __devinit mwl8k_probe(struct pci_dev *pdev,
 {
        struct ieee80211_hw *hw;
        struct mwl8k_priv *priv;
-       DECLARE_MAC_BUF(mac);
        int rc;
        int i;
        u8 *fw;
@@ -3675,8 +3674,8 @@ static int __devinit mwl8k_probe(struct pci_dev *pdev,
                MWL8K_DESC);
        printk(KERN_INFO "%s: Driver Ver:%s  Firmware Ver:%u.%u.%u.%u\n",
                priv->name, MWL8K_VERSION, fw[3], fw[2], fw[1], fw[0]);
-       printk(KERN_INFO "%s: MAC Address: %s\n", priv->name,
-              print_mac(mac, hw->wiphy->perm_addr));
+       printk(KERN_INFO "%s: MAC Address: %pM\n", priv->name,
+               hw->wiphy->perm_addr);
 
        return 0;