diff options
| author | David S. Miller <davem@davemloft.net> | 2008-04-09 15:10:14 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-09 15:10:14 -0700 |
| commit | b41f5bfff73f244101b34f3603974ef7aeadf545 (patch) | |
| tree | 5c7fc7de15a020cde0f99fac3e61d981a1d59022 /drivers/net/wireless/ipw2200.c | |
| parent | bcf0dda8d2408fe1c1040cdec5a98e5fcad2ac72 (diff) | |
| parent | e91e9d490d9ae382003ef9d05fd50238db54c35b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/ipw2200.c')
| -rw-r--r-- | drivers/net/wireless/ipw2200.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c index 0d78e40919cf..98d6ff69d375 100644 --- a/drivers/net/wireless/ipw2200.c +++ b/drivers/net/wireless/ipw2200.c @@ -11577,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; |