diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-26 02:26:21 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-26 02:26:21 -0500 |
| commit | 19bc291c99f018bd4f2c38bbf69144086dca903f (patch) | |
| tree | 9d3cf9bc0c5a78e363dc0547da8bcd1e7c394265 /net/mac80211/iface.c | |
| parent | 04488734806948624dabc4514f96f14cd75b9a50 (diff) | |
| parent | 4a6967b88af02eebeedfbb91bc09160750225bb5 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-core.h
drivers/net/wireless/rt2x00/rt2800pci.c
Diffstat (limited to 'net/mac80211/iface.c')
| -rw-r--r-- | net/mac80211/iface.c | 2 |
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, | |||
| 1031 | 1031 | ||
| 1032 | sdata = IEEE80211_DEV_TO_SUB_IF(dev); | 1032 | sdata = IEEE80211_DEV_TO_SUB_IF(dev); |
| 1033 | 1033 | ||
| 1034 | memcpy(sdata->name, sdata->name, IFNAMSIZ); | 1034 | memcpy(sdata->name, dev->name, IFNAMSIZ); |
| 1035 | 1035 | ||
| 1036 | ieee80211_debugfs_rename_netdev(sdata); | 1036 | ieee80211_debugfs_rename_netdev(sdata); |
| 1037 | return 0; | 1037 | return 0; |