From 41f29520649d193951836684860b74a018dd7fe9 Mon Sep 17 00:00:00 2001 From: Mike McCormack Date: Thu, 10 Mar 2011 22:33:57 +0900 Subject: [PATCH] --- yaml --- r: 236527 b: refs/heads/master c: 7c186cff26eea4a7e2f1c0df9feb3f20aff7c71c h: refs/heads/master i: 236525: 9b5e2ca62d7228d71f7a2476f22110f39336a984 236523: 50279ad60606c96e9fa165d3669813e8f06eeb70 236519: 66c196c8deb7c202df2fb9df1af7cca05bd7f448 236511: 7dd89c809f59adc8c3410c6b9dde2e576623ed18 v: v3 --- [refs] | 2 +- trunk/drivers/staging/rtl8192e/ieee80211/ieee80211.h | 8 ++++---- .../staging/rtl8192e/ieee80211/ieee80211_softmac.c | 2 +- trunk/drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 3b08ffc4715a..83f2ae9cea2e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d1c580aa706ad49a670af9c7188d1e13c319bd9a +refs/heads/master: 7c186cff26eea4a7e2f1c0df9feb3f20aff7c71c diff --git a/trunk/drivers/staging/rtl8192e/ieee80211/ieee80211.h b/trunk/drivers/staging/rtl8192e/ieee80211/ieee80211.h index 8bbf79d29300..af6465334036 100644 --- a/trunk/drivers/staging/rtl8192e/ieee80211/ieee80211.h +++ b/trunk/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/trunk/drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c b/trunk/drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c index d75c731157ba..7888cfe383f8 100644 --- a/trunk/drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c +++ b/trunk/drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c @@ -3157,7 +3157,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/trunk/drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c b/trunk/drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c index ef3a9b202d42..6530d9b6829d 100644 --- a/trunk/drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c +++ b/trunk/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 @@ int ieee80211_wx_set_encode_ext(struct ieee80211_device *ieee, 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; }