summaryrefslogtreecommitdiffstats
path: root/net/mac80211
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2010-02-12 10:45:05 +0100
committerJohn W. Linville <linville@tuxdriver.com>2010-02-15 16:12:52 -0500
commit2f5265e6e785b2a666dd985ea157bc8c260be8fa (patch)
treece12947c600cc0e6de2cf0cab57cb518b09b907c /net/mac80211
parentf318d658decb5789cfbb43041daf3dc3aade1df0 (diff)
downloadblackbird-op-linux-2f5265e6e785b2a666dd985ea157bc8c260be8fa.tar.gz
blackbird-op-linux-2f5265e6e785b2a666dd985ea157bc8c260be8fa.zip
mac80211: fix netdev rename
Fix a copy bug introduced by commit 47846c9b0c10808d9337d2e7d09361f3e0a0a71a Author: Johannes Berg <johannes@sipsolutions.net> Date: Wed Nov 25 17:46:19 2009 +0100 mac80211: reduce reliance on netdev This manifested itself only in debug messages and in the debugfs rename failure that would always happen due to trying to rename the dir over itself. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Tested-by: Pavel Roskin <proski@gnu.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/iface.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index 09fff4662e80..0793d7a8d743 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -1031,7 +1031,7 @@ static int netdev_notify(struct notifier_block *nb,
sdata = IEEE80211_DEV_TO_SUB_IF(dev);
- memcpy(sdata->name, sdata->name, IFNAMSIZ);
+ memcpy(sdata->name, dev->name, IFNAMSIZ);
ieee80211_debugfs_rename_netdev(sdata);
return 0;
OpenPOWER on IntegriCloud