From 1a0ba53dec40dc6616d2774e90d8731a57593fec Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Mon, 16 Jun 2008 15:35:10 +1000 Subject: [PATCH] --- yaml --- r: 103159 b: refs/heads/master c: e800f17c6ffe8b0410d8cf060ab204b93e9c73ab h: refs/heads/master i: 103157: 398d50b49562e09f775027c9240b68a4f6e70948 103155: 288a0e3635008a5464b841ebfffdf275d80a73ee 103151: 410216c8fa96906c990c163e03860270ce04aada v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/mac80211_hwsim.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 1bb193e77c56..4f074f2eedb5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b662348662f9661f9259c7186c1bdb65620045f1 +refs/heads/master: e800f17c6ffe8b0410d8cf060ab204b93e9c73ab diff --git a/trunk/drivers/net/wireless/mac80211_hwsim.c b/trunk/drivers/net/wireless/mac80211_hwsim.c index 8da352ae6825..5d30c57e3969 100644 --- a/trunk/drivers/net/wireless/mac80211_hwsim.c +++ b/trunk/drivers/net/wireless/mac80211_hwsim.c @@ -430,15 +430,16 @@ static int __init init_mac80211_hwsim(void) hwsim_radios[i] = hw; data = hw->priv; - data->dev = device_create(hwsim_class, NULL, 0, "hwsim%d", i); + data->dev = device_create_drvdata(hwsim_class, NULL, 0, hw, + "hwsim%d", i); if (IS_ERR(data->dev)) { - printk(KERN_DEBUG "mac80211_hwsim: device_create " + printk(KERN_DEBUG + "mac80211_hwsim: device_create_drvdata " "failed (%ld)\n", PTR_ERR(data->dev)); err = -ENOMEM; goto failed; } data->dev->driver = &mac80211_hwsim_driver; - dev_set_drvdata(data->dev, hw); SET_IEEE80211_DEV(hw, data->dev); addr[3] = i >> 8;