diff options
Diffstat (limited to 'drivers/staging')
-rw-r--r-- | drivers/staging/rtl8192e/ieee80211/ieee80211.h | 8 | ||||
-rw-r--r-- | drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c | 2 | ||||
-rw-r--r-- | 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 8bbf79d29300..af6465334036 100644 --- a/drivers/staging/rtl8192e/ieee80211/ieee80211.h +++ b/drivers/staging/rtl8192e/ieee80211/ieee80211.h | |||
@@ -2109,12 +2109,12 @@ struct ieee80211_device { | |||
2109 | int (*hard_start_xmit)(struct ieee80211_txb *txb, | 2109 | int (*hard_start_xmit)(struct ieee80211_txb *txb, |
2110 | struct ieee80211_device *ieee); | 2110 | struct ieee80211_device *ieee); |
2111 | 2111 | ||
2112 | int (*reset_port)(struct net_device *dev); | 2112 | int (*reset_port)(struct ieee80211_device *ieee); |
2113 | int (*is_queue_full) (struct net_device * dev, int pri); | 2113 | int (*is_queue_full) (struct ieee80211_device *ieee, int pri); |
2114 | 2114 | ||
2115 | int (*handle_management) (struct net_device * dev, | 2115 | int (*handle_management) (struct ieee80211_device *ieee, |
2116 | struct ieee80211_network * network, u16 type); | 2116 | struct ieee80211_network * network, u16 type); |
2117 | int (*is_qos_active) (struct net_device *dev, struct sk_buff *skb); | 2117 | int (*is_qos_active) (struct ieee80211_device *ieee, struct sk_buff *skb); |
2118 | 2118 | ||
2119 | /* Softmac-generated frames (mamagement) are TXed via this | 2119 | /* Softmac-generated frames (mamagement) are TXed via this |
2120 | * callback if the flag IEEE_SOFTMAC_SINGLE_QUEUE is | 2120 | * 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 d75c731157ba..7888cfe383f8 100644 --- a/drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c +++ b/drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c | |||
@@ -3157,7 +3157,7 @@ static int ieee80211_wpa_set_encryption(struct ieee80211_device *ieee, | |||
3157 | if (ieee->reset_on_keychange && | 3157 | if (ieee->reset_on_keychange && |
3158 | ieee->iw_mode != IW_MODE_INFRA && | 3158 | ieee->iw_mode != IW_MODE_INFRA && |
3159 | ieee->reset_port && | 3159 | ieee->reset_port && |
3160 | ieee->reset_port(ieee->dev)) { | 3160 | ieee->reset_port(ieee)) { |
3161 | printk("reset_port failed\n"); | 3161 | printk("reset_port failed\n"); |
3162 | param->u.crypt.err = IEEE_CRYPT_ERR_CARD_CONF_FAILED; | 3162 | param->u.crypt.err = IEEE_CRYPT_ERR_CARD_CONF_FAILED; |
3163 | return -EINVAL; | 3163 | return -EINVAL; |
diff --git a/drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c b/drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c index ef3a9b202d42..6530d9b6829d 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, | |||
472 | * the callbacks structures used to initialize the 802.11 stack. */ | 472 | * the callbacks structures used to initialize the 802.11 stack. */ |
473 | if (ieee->reset_on_keychange && | 473 | if (ieee->reset_on_keychange && |
474 | ieee->iw_mode != IW_MODE_INFRA && | 474 | ieee->iw_mode != IW_MODE_INFRA && |
475 | ieee->reset_port && ieee->reset_port(dev)) { | 475 | ieee->reset_port && ieee->reset_port(ieee)) { |
476 | printk(KERN_DEBUG "%s: reset_port failed\n", dev->name); | 476 | printk(KERN_DEBUG "%s: reset_port failed\n", dev->name); |
477 | return -EINVAL; | 477 | return -EINVAL; |
478 | } | 478 | } |
@@ -700,7 +700,7 @@ done: | |||
700 | 700 | ||
701 | if (ieee->reset_on_keychange && | 701 | if (ieee->reset_on_keychange && |
702 | ieee->iw_mode != IW_MODE_INFRA && | 702 | ieee->iw_mode != IW_MODE_INFRA && |
703 | ieee->reset_port && ieee->reset_port(dev)) { | 703 | ieee->reset_port && ieee->reset_port(ieee)) { |
704 | IEEE80211_DEBUG_WX("%s: reset_port failed\n", dev->name); | 704 | IEEE80211_DEBUG_WX("%s: reset_port failed\n", dev->name); |
705 | return -EINVAL; | 705 | return -EINVAL; |
706 | } | 706 | } |