From: Johannes Berg <johannes@sipsolutions.net>
Date: Fri, 12 Feb 2010 09:45:05 +0000 (+0100)
Subject: mac80211: fix netdev rename
X-Git-Tag: v2.6.34-rc1~233^2~49^2~65
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2f5265e6e785b2a666dd985ea157bc8c260be8fa;p=profile%2Fivi%2Fkernel-x86-ivi.git

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>
---

diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index 09fff46..0793d7a 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;