diff options
Diffstat (limited to 'drivers/staging/rtl8192e')
4 files changed, 6 insertions, 7 deletions
diff --git a/drivers/staging/rtl8192e/ieee80211/ieee80211_module.c b/drivers/staging/rtl8192e/ieee80211/ieee80211_module.c index f43a7db5c78..c7aa1c63cb1 100644 --- a/drivers/staging/rtl8192e/ieee80211/ieee80211_module.c +++ b/drivers/staging/rtl8192e/ieee80211/ieee80211_module.c | |||
@@ -170,7 +170,7 @@ struct net_device *alloc_ieee80211(int sizeof_priv) | |||
170 | ieee80211_softmac_init(ieee); | 170 | ieee80211_softmac_init(ieee); |
171 | 171 | ||
172 | #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13)) | 172 | #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13)) |
173 | ieee->pHTInfo = (RT_HIGH_THROUGHPUT*)kzalloc(sizeof(RT_HIGH_THROUGHPUT), GFP_KERNEL); | 173 | ieee->pHTInfo = kzalloc(sizeof(RT_HIGH_THROUGHPUT), GFP_KERNEL); |
174 | #else | 174 | #else |
175 | ieee->pHTInfo = (RT_HIGH_THROUGHPUT*)kmalloc(sizeof(RT_HIGH_THROUGHPUT), GFP_KERNEL); | 175 | ieee->pHTInfo = (RT_HIGH_THROUGHPUT*)kmalloc(sizeof(RT_HIGH_THROUGHPUT), GFP_KERNEL); |
176 | memset(ieee->pHTInfo,0,sizeof(RT_HIGH_THROUGHPUT)); | 176 | memset(ieee->pHTInfo,0,sizeof(RT_HIGH_THROUGHPUT)); |
diff --git a/drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c b/drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c index ce265ae5fe1..da10067485e 100644 --- a/drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c +++ b/drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c | |||
@@ -1397,7 +1397,7 @@ int ieee80211_rtl_rx(struct ieee80211_device *ieee, struct sk_buff *skb, | |||
1397 | /* skb: hdr + (possible reassembled) full plaintext payload */ | 1397 | /* skb: hdr + (possible reassembled) full plaintext payload */ |
1398 | payload = skb->data + hdrlen; | 1398 | payload = skb->data + hdrlen; |
1399 | //ethertype = (payload[6] << 8) | payload[7]; | 1399 | //ethertype = (payload[6] << 8) | payload[7]; |
1400 | rxb = (struct ieee80211_rxb*)kmalloc(sizeof(struct ieee80211_rxb),GFP_ATOMIC); | 1400 | rxb = kmalloc(sizeof(struct ieee80211_rxb), GFP_ATOMIC); |
1401 | if(rxb == NULL) | 1401 | if(rxb == NULL) |
1402 | { | 1402 | { |
1403 | IEEE80211_DEBUG(IEEE80211_DL_ERR,"%s(): kmalloc rxb error\n",__FUNCTION__); | 1403 | IEEE80211_DEBUG(IEEE80211_DL_ERR,"%s(): kmalloc rxb error\n",__FUNCTION__); |
diff --git a/drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c b/drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c index b4beb207391..4f6ce06b606 100644 --- a/drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c +++ b/drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c | |||
@@ -1800,7 +1800,7 @@ static inline u16 auth_parse(struct sk_buff *skb, u8** challenge, int *chlen) | |||
1800 | 1800 | ||
1801 | if(*(t++) == MFIE_TYPE_CHALLENGE){ | 1801 | if(*(t++) == MFIE_TYPE_CHALLENGE){ |
1802 | *chlen = *(t++); | 1802 | *chlen = *(t++); |
1803 | *challenge = (u8*)kmalloc(*chlen, GFP_ATOMIC); | 1803 | *challenge = kmalloc(*chlen, GFP_ATOMIC); |
1804 | memcpy(*challenge, t, *chlen); | 1804 | memcpy(*challenge, t, *chlen); |
1805 | } | 1805 | } |
1806 | } | 1806 | } |
@@ -3459,8 +3459,7 @@ static int ieee80211_wpa_set_encryption(struct ieee80211_device *ieee, | |||
3459 | 3459 | ||
3460 | ieee80211_crypt_delayed_deinit(ieee, crypt); | 3460 | ieee80211_crypt_delayed_deinit(ieee, crypt); |
3461 | 3461 | ||
3462 | new_crypt = (struct ieee80211_crypt_data *) | 3462 | new_crypt = kmalloc(sizeof(*new_crypt), GFP_KERNEL); |
3463 | kmalloc(sizeof(*new_crypt), GFP_KERNEL); | ||
3464 | if (new_crypt == NULL) { | 3463 | if (new_crypt == NULL) { |
3465 | ret = -ENOMEM; | 3464 | ret = -ENOMEM; |
3466 | goto done; | 3465 | goto done; |
@@ -3592,7 +3591,7 @@ int ieee80211_wpa_supplicant_ioctl(struct ieee80211_device *ieee, struct iw_poin | |||
3592 | goto out; | 3591 | goto out; |
3593 | } | 3592 | } |
3594 | 3593 | ||
3595 | param = (struct ieee_param *)kmalloc(p->length, GFP_KERNEL); | 3594 | param = kmalloc(p->length, GFP_KERNEL); |
3596 | if (param == NULL){ | 3595 | if (param == NULL){ |
3597 | ret = -ENOMEM; | 3596 | ret = -ENOMEM; |
3598 | goto out; | 3597 | goto out; |
diff --git a/drivers/staging/rtl8192e/r8192E_core.c b/drivers/staging/rtl8192e/r8192E_core.c index 604c691d64b..533be4882bb 100644 --- a/drivers/staging/rtl8192e/r8192E_core.c +++ b/drivers/staging/rtl8192e/r8192E_core.c | |||
@@ -5040,7 +5040,7 @@ static int rtl8192_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) | |||
5040 | goto out; | 5040 | goto out; |
5041 | } | 5041 | } |
5042 | 5042 | ||
5043 | ipw = (struct ieee_param *)kmalloc(p->length, GFP_KERNEL); | 5043 | ipw = kmalloc(p->length, GFP_KERNEL); |
5044 | if (ipw == NULL){ | 5044 | if (ipw == NULL){ |
5045 | ret = -ENOMEM; | 5045 | ret = -ENOMEM; |
5046 | goto out; | 5046 | goto out; |