Signed-off-by: Mike McCormack <[email protected]>
---
drivers/staging/rtl8192e/ieee80211/ieee80211.h | 8 ++++----
.../staging/rtl8192e/ieee80211/ieee80211_softmac.c | 2 +-
drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/rtl8192e/ieee80211/ieee80211.h
b/drivers/staging/rtl8192e/ieee80211/ieee80211.h
index 8bbf79d..af64653 100644
--- a/drivers/staging/rtl8192e/ieee80211/ieee80211.h
+++ b/drivers/staging/rtl8192e/ieee80211/ieee80211.h
@@ -2109,12 +2109,12 @@ struct ieee80211_device {
int (*hard_start_xmit)(struct ieee80211_txb *txb,
struct ieee80211_device *ieee);
- int (*reset_port)(struct net_device *dev);
- int (*is_queue_full) (struct net_device * dev, int pri);
+ int (*reset_port)(struct ieee80211_device *ieee);
+ int (*is_queue_full) (struct ieee80211_device *ieee, int pri);
- int (*handle_management) (struct net_device * dev,
+ int (*handle_management) (struct ieee80211_device *ieee,
struct ieee80211_network * network, u16
type);
- int (*is_qos_active) (struct net_device *dev, struct sk_buff *skb);
+ int (*is_qos_active) (struct ieee80211_device *ieee, struct sk_buff
*skb);
/* Softmac-generated frames (mamagement) are TXed via this
* callback if the flag IEEE_SOFTMAC_SINGLE_QUEUE is
diff --git a/drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c
b/drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c
index 07cb7f2..e65df49 100644
--- a/drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c
+++ b/drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c
@@ -3160,7 +3160,7 @@ static int ieee80211_wpa_set_encryption(struct
ieee80211_device *ieee,
if (ieee->reset_on_keychange &&
ieee->iw_mode != IW_MODE_INFRA &&
ieee->reset_port &&
- ieee->reset_port(ieee->dev)) {
+ ieee->reset_port(ieee)) {
printk("reset_port failed\n");
param->u.crypt.err = IEEE_CRYPT_ERR_CARD_CONF_FAILED;
return -EINVAL;
diff --git a/drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c
b/drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c
index 040a998..3f2e46e 100644
--- a/drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c
+++ b/drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c
@@ -472,7 +472,7 @@ int ieee80211_wx_set_encode(struct ieee80211_device *ieee,
* the callbacks structures used to initialize the 802.11 stack. */
if (ieee->reset_on_keychange &&
ieee->iw_mode != IW_MODE_INFRA &&
- ieee->reset_port && ieee->reset_port(dev)) {
+ ieee->reset_port && ieee->reset_port(ieee)) {
printk(KERN_DEBUG "%s: reset_port failed\n", dev->name);
return -EINVAL;
}
@@ -700,7 +700,7 @@ done:
if (ieee->reset_on_keychange &&
ieee->iw_mode != IW_MODE_INFRA &&
- ieee->reset_port && ieee->reset_port(dev)) {
+ ieee->reset_port && ieee->reset_port(ieee)) {
IEEE80211_DEBUG_WX("%s: reset_port failed\n", dev->name);
return -EINVAL;
}
--
1.7.0.4
_______________________________________________
devel mailing list
[email protected]
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
