|
@@ -132,7 +132,7 @@ void rtl8180_tx_pw_wq (struct work_struct *work)
|
|
// struct r8180_priv *priv = container_of(work, struct r8180_priv, watch_dog_wq);
|
|
// struct r8180_priv *priv = container_of(work, struct r8180_priv, watch_dog_wq);
|
|
// struct ieee80211_device * ieee = (struct ieee80211_device*)
|
|
// struct ieee80211_device * ieee = (struct ieee80211_device*)
|
|
// container_of(work, struct ieee80211_device, watch_dog_wq);
|
|
// container_of(work, struct ieee80211_device, watch_dog_wq);
|
|
- struct delayed_work *dwork = container_of(work,struct delayed_work,work);
|
|
|
|
|
|
+ struct delayed_work *dwork = to_delayed_work(work);
|
|
struct ieee80211_device *ieee = container_of(dwork,struct ieee80211_device,tx_pw_wq);
|
|
struct ieee80211_device *ieee = container_of(dwork,struct ieee80211_device,tx_pw_wq);
|
|
struct net_device *dev = ieee->dev;
|
|
struct net_device *dev = ieee->dev;
|
|
#else
|
|
#else
|
|
@@ -314,7 +314,7 @@ void rtl8180_hw_dig_wq (struct work_struct *work)
|
|
// struct r8180_priv *priv = container_of(work, struct r8180_priv, watch_dog_wq);
|
|
// struct r8180_priv *priv = container_of(work, struct r8180_priv, watch_dog_wq);
|
|
// struct ieee80211_device * ieee = (struct ieee80211_device*)
|
|
// struct ieee80211_device * ieee = (struct ieee80211_device*)
|
|
// container_of(work, struct ieee80211_device, watch_dog_wq);
|
|
// container_of(work, struct ieee80211_device, watch_dog_wq);
|
|
- struct delayed_work *dwork = container_of(work,struct delayed_work,work);
|
|
|
|
|
|
+ struct delayed_work *dwork = to_delayed_work(work);
|
|
struct ieee80211_device *ieee = container_of(dwork,struct ieee80211_device,hw_dig_wq);
|
|
struct ieee80211_device *ieee = container_of(dwork,struct ieee80211_device,hw_dig_wq);
|
|
struct net_device *dev = ieee->dev;
|
|
struct net_device *dev = ieee->dev;
|
|
#else
|
|
#else
|
|
@@ -1250,7 +1250,7 @@ SetInitialGain:
|
|
#if LINUX_VERSION_CODE >=KERNEL_VERSION(2,6,20)
|
|
#if LINUX_VERSION_CODE >=KERNEL_VERSION(2,6,20)
|
|
void rtl8180_rate_adapter(struct work_struct * work)
|
|
void rtl8180_rate_adapter(struct work_struct * work)
|
|
{
|
|
{
|
|
- struct delayed_work *dwork = container_of(work,struct delayed_work,work);
|
|
|
|
|
|
+ struct delayed_work *dwork = to_delayed_work(work);
|
|
struct ieee80211_device *ieee = container_of(dwork,struct ieee80211_device,rate_adapter_wq);
|
|
struct ieee80211_device *ieee = container_of(dwork,struct ieee80211_device,rate_adapter_wq);
|
|
struct net_device *dev = ieee->dev;
|
|
struct net_device *dev = ieee->dev;
|
|
#else
|
|
#else
|