dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

staging: rtl8192e: Pass ieee80211_device to callbacks 

Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Mike McCormack 2011-03-10 22:33:57 +09:00 committed by Greg Kroah-Hartman
parent d1c580aa70
commit 7c186cff26
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/staging/rtl8192e/ieee80211/ieee80211.h
View File

@ -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

2
drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c
View File

@ -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;

4
drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c
View File

@ -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;
}