summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/ipw2200.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-04-10 02:10:14 +0400
committerDavid S. Miller <davem@davemloft.net>2008-04-10 02:10:14 +0400
commitb41f5bfff73f244101b34f3603974ef7aeadf545 (patch)
tree5c7fc7de15a020cde0f99fac3e61d981a1d59022 /drivers/net/wireless/ipw2200.c
parentbcf0dda8d2408fe1c1040cdec5a98e5fcad2ac72 (diff)
parente91e9d490d9ae382003ef9d05fd50238db54c35b (diff)
downloadlinux-b41f5bfff73f244101b34f3603974ef7aeadf545.tar.xz
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.c1
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;