summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/hostap/hostap_ap.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-12-07 05:02:40 -0500
committerJeff Garzik <jeff@garzik.org>2006-12-07 05:02:40 -0500
commit359f2d17e32b32f53577375f83fb06d34e31bfe8 (patch)
tree2890ffcf40fab2d2c24d2d208814afeb52bb12e5 /drivers/net/wireless/hostap/hostap_ap.c
parent0efdf2626676db4b30d343ff88f8461ad09130da (diff)
parent720eeb4332e5871c97d390b2fb55a5a74fb18ae6 (diff)
downloadop-kernel-dev-359f2d17e32b32f53577375f83fb06d34e31bfe8.zip
op-kernel-dev-359f2d17e32b32f53577375f83fb06d34e31bfe8.tar.gz
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream
Conflicts: drivers/net/wireless/zd1211rw/zd_mac.h net/ieee80211/softmac/ieee80211softmac_assoc.c
Diffstat (limited to 'drivers/net/wireless/hostap/hostap_ap.c')
-rw-r--r--drivers/net/wireless/hostap/hostap_ap.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/wireless/hostap/hostap_ap.c b/drivers/net/wireless/hostap/hostap_ap.c
index 08bc57a..974a8e5 100644
--- a/drivers/net/wireless/hostap/hostap_ap.c
+++ b/drivers/net/wireless/hostap/hostap_ap.c
@@ -1100,15 +1100,13 @@ static struct sta_info * ap_add_sta(struct ap_data *ap, u8 *addr)
{
struct sta_info *sta;
- sta = (struct sta_info *)
- kmalloc(sizeof(struct sta_info), GFP_ATOMIC);
+ sta = kzalloc(sizeof(struct sta_info), GFP_ATOMIC);
if (sta == NULL) {
PDEBUG(DEBUG_AP, "AP: kmalloc failed\n");
return NULL;
}
/* initialize STA info data */
- memset(sta, 0, sizeof(struct sta_info));
sta->local = ap->local;
skb_queue_head_init(&sta->tx_buf);
memcpy(sta->addr, addr, ETH_ALEN);
OpenPOWER on IntegriCloud