Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 359f2d17 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'upstream' of... 

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
parents 0efdf262 720eeb43

drivers/net/wireless/hostap/hostap_ap.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -1100,15 +1100,13 @@ static struct sta_info * ap_add_sta(struct ap_data *ap, u8 *addr) 
{

{

	struct sta_info *sta;

	struct sta_info *sta;





	sta = (struct sta_info *)

	sta = kzalloc(sizeof(struct sta_info), GFP_ATOMIC);

		kmalloc(sizeof(struct sta_info), GFP_ATOMIC);

	if (sta == NULL) {

	if (sta == NULL) {

		PDEBUG(DEBUG_AP, "AP: kmalloc failed\n");

		PDEBUG(DEBUG_AP, "AP: kmalloc failed\n");

		return NULL;

		return NULL;

	}

	}





	/* initialize STA info data */

	/* initialize STA info data */

	memset(sta, 0, sizeof(struct sta_info));

	sta->local = ap->local;

	sta->local = ap->local;

	skb_queue_head_init(&sta->tx_buf);

	skb_queue_head_init(&sta->tx_buf);

	memcpy(sta->addr, addr, ETH_ALEN);

	memcpy(sta->addr, addr, ETH_ALEN);

drivers/net/wireless/hostap/hostap_cs.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -563,12 +563,11 @@ static int prism2_config(struct pcmcia_device *link) 
	PDEBUG(DEBUG_FLOW, "prism2_config()\n");

	PDEBUG(DEBUG_FLOW, "prism2_config()\n");





	parse = kmalloc(sizeof(cisparse_t), GFP_KERNEL);

	parse = kmalloc(sizeof(cisparse_t), GFP_KERNEL);

	hw_priv = kmalloc(sizeof(*hw_priv), GFP_KERNEL);

	hw_priv = kzalloc(sizeof(*hw_priv), GFP_KERNEL);

	if (parse == NULL || hw_priv == NULL) {

	if (parse == NULL || hw_priv == NULL) {

		ret = -ENOMEM;

		ret = -ENOMEM;

		goto failed;

		goto failed;

	}

	}

	memset(hw_priv, 0, sizeof(*hw_priv));





	tuple.Attributes = 0;

	tuple.Attributes = 0;

	tuple.TupleData = buf;

	tuple.TupleData = buf;

drivers/net/wireless/hostap/hostap_download.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -685,14 +685,12 @@ static int prism2_download(local_info_t *local, 
		goto out;

		goto out;

	}

	}





	dl = kmalloc(sizeof(*dl) + param->num_areas *

	dl = kzalloc(sizeof(*dl) + param->num_areas *

		     sizeof(struct prism2_download_data_area), GFP_KERNEL);

		     sizeof(struct prism2_download_data_area), GFP_KERNEL);

	if (dl == NULL) {

	if (dl == NULL) {

		ret = -ENOMEM;

		ret = -ENOMEM;

		goto out;

		goto out;

	}

	}

	memset(dl, 0, sizeof(*dl) + param->num_areas *

	       sizeof(struct prism2_download_data_area));

	dl->dl_cmd = param->dl_cmd;

	dl->dl_cmd = param->dl_cmd;

	dl->start_addr = param->start_addr;

	dl->start_addr = param->start_addr;

	dl->num_areas = param->num_areas;

	dl->num_areas = param->num_areas;

drivers/net/wireless/hostap/hostap_hw.c

+3 −9
Original line number Original line Diff line number Diff line
@@ -347,14 +347,12 @@ static int hfa384x_cmd(struct net_device *dev, u16 cmd, u16 param0, 
	if (signal_pending(current))

	if (signal_pending(current))

		return -EINTR;

		return -EINTR;





	entry = (struct hostap_cmd_queue *)

	entry = kzalloc(sizeof(*entry), GFP_ATOMIC);

		kmalloc(sizeof(*entry), GFP_ATOMIC);

	if (entry == NULL) {

	if (entry == NULL) {

		printk(KERN_DEBUG "%s: hfa384x_cmd - kmalloc failed\n",

		printk(KERN_DEBUG "%s: hfa384x_cmd - kmalloc failed\n",

		       dev->name);

		       dev->name);

		return -ENOMEM;

		return -ENOMEM;

	}

	}

	memset(entry, 0, sizeof(*entry));

	atomic_set(&entry->usecnt, 1);

	atomic_set(&entry->usecnt, 1);

	entry->type = CMD_SLEEP;

	entry->type = CMD_SLEEP;

	entry->cmd = cmd;

	entry->cmd = cmd;
@@ -517,14 +515,12 @@ static int hfa384x_cmd_callback(struct net_device *dev, u16 cmd, u16 param0, 
		return -1;

		return -1;

	}

	}





	entry = (struct hostap_cmd_queue *)

	entry = kzalloc(sizeof(*entry), GFP_ATOMIC);

		kmalloc(sizeof(*entry), GFP_ATOMIC);

	if (entry == NULL) {

	if (entry == NULL) {

		printk(KERN_DEBUG "%s: hfa384x_cmd_callback - kmalloc "

		printk(KERN_DEBUG "%s: hfa384x_cmd_callback - kmalloc "

		       "failed\n", dev->name);

		       "failed\n", dev->name);

		return -ENOMEM;

		return -ENOMEM;

	}

	}

	memset(entry, 0, sizeof(*entry));

	atomic_set(&entry->usecnt, 1);

	atomic_set(&entry->usecnt, 1);

	entry->type = CMD_CALLBACK;

	entry->type = CMD_CALLBACK;

	entry->cmd = cmd;

	entry->cmd = cmd;
@@ -3016,14 +3012,12 @@ static int prism2_set_tim(struct net_device *dev, int aid, int set) 
	iface = netdev_priv(dev);

	iface = netdev_priv(dev);

	local = iface->local;

	local = iface->local;





	new_entry = (struct set_tim_data *)

	new_entry = kzalloc(sizeof(*new_entry), GFP_ATOMIC);

		kmalloc(sizeof(*new_entry), GFP_ATOMIC);

	if (new_entry == NULL) {

	if (new_entry == NULL) {

		printk(KERN_DEBUG "%s: prism2_set_tim: kmalloc failed\n",

		printk(KERN_DEBUG "%s: prism2_set_tim: kmalloc failed\n",

		       local->dev->name);

		       local->dev->name);

		return -ENOMEM;

		return -ENOMEM;

	}

	}

	memset(new_entry, 0, sizeof(*new_entry));

	new_entry->aid = aid;

	new_entry->aid = aid;

	new_entry->set = set;

	new_entry->set = set;

drivers/net/wireless/hostap/hostap_info.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -327,11 +327,10 @@ static void prism2_info_hostscanresults(local_info_t *local, 
	ptr = (u8 *) pos;

	ptr = (u8 *) pos;





	new_count = left / result_size;

	new_count = left / result_size;

	results = kmalloc(new_count * sizeof(struct hfa384x_hostscan_result),

	results = kcalloc(new_count, sizeof(struct hfa384x_hostscan_result),

			  GFP_ATOMIC);

			  GFP_ATOMIC);

	if (results == NULL)

	if (results == NULL)

		return;

		return;

	memset(results, 0, new_count * sizeof(struct hfa384x_hostscan_result));





	for (i = 0; i < new_count; i++) {

	for (i = 0; i < new_count; i++) {

		memcpy(&results[i], ptr, copy_len);

		memcpy(&results[i], ptr, copy_len);