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

Commit 9559cc23 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'fixes-jgarzik' of... 

Merge branch 'fixes-jgarzik' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes
parents e236ed23 d101f649

drivers/net/wireless/b43/rfkill.c

+6 −5
Original line number Diff line number Diff line
@@ -138,8 +138,11 @@ void b43_rfkill_init(struct b43_wldev *dev) 
	rfk->rfkill->user_claim_unsupported = 1;



	rfk->poll_dev = input_allocate_polled_device();

	if (!rfk->poll_dev)

		goto err_free_rfk;

	if (!rfk->poll_dev) {

		rfkill_free(rfk->rfkill);

		goto err_freed_rfk;

	}



	rfk->poll_dev->private = dev;

	rfk->poll_dev->poll = b43_rfkill_poll;

	rfk->poll_dev->poll_interval = 1000; /* msecs */
@@ -175,8 +178,7 @@ void b43_rfkill_init(struct b43_wldev *dev) 
err_free_polldev:

	input_free_polled_device(rfk->poll_dev);

	rfk->poll_dev = NULL;

err_free_rfk:

	rfkill_free(rfk->rfkill);

err_freed_rfk:

	rfk->rfkill = NULL;

out_error:

	rfk->registered = 0;
@@ -195,6 +197,5 @@ void b43_rfkill_exit(struct b43_wldev *dev) 
	rfkill_unregister(rfk->rfkill);

	input_free_polled_device(rfk->poll_dev);

	rfk->poll_dev = NULL;

	rfkill_free(rfk->rfkill);

	rfk->rfkill = NULL;

}

drivers/net/wireless/hostap/hostap_plx.c

+3 −3
Original line number Diff line number Diff line
@@ -608,7 +608,7 @@ static void prism2_plx_remove(struct pci_dev *pdev) 


MODULE_DEVICE_TABLE(pci, prism2_plx_id_table);



static struct pci_driver prism2_plx_drv_id = {

static struct pci_driver prism2_plx_driver = {

	.name		= "hostap_plx",

	.id_table	= prism2_plx_id_table,

	.probe		= prism2_plx_probe,
@@ -618,13 +618,13 @@ static struct pci_driver prism2_plx_drv_id = { 


static int __init init_prism2_plx(void)

{

	return pci_register_driver(&prism2_plx_drv_id);

	return pci_register_driver(&prism2_plx_driver);

}





static void __exit exit_prism2_plx(void)

{

	pci_unregister_driver(&prism2_plx_drv_id);

	pci_unregister_driver(&prism2_plx_driver);

}

drivers/net/wireless/ipw2200.c

+1 −1
Original line number Diff line number Diff line
@@ -4935,7 +4935,7 @@ static int ipw_queue_reset(struct ipw_priv *priv) 
/**

 * Reclaim Tx queue entries no more used by NIC.

 *

 * When FW adwances 'R' index, all entries between old and

 * When FW advances 'R' index, all entries between old and

 * new 'R' index need to be reclaimed. As result, some free space

 * forms. If there is enough free space (> low mark), wake Tx queue.

 *

drivers/net/wireless/libertas/if_sdio.c

+4 −0
Original line number Diff line number Diff line
@@ -871,6 +871,10 @@ static int if_sdio_probe(struct sdio_func *func, 
		if (sscanf(func->card->info[i],

				"ID: %x", &model) == 1)

			break;

               if (!strcmp(func->card->info[i], "IBIS Wireless SDIO Card")) {

                       model = 4;

                       break;

               }

	}



	if (i == func->card->num_info) {

drivers/net/wireless/rt2x00/rt2x00pci.c

+1 −1
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ void rt2x00pci_rxdone(struct rt2x00_dev *rt2x00dev) 
		 * The data behind the ieee80211 header must be

		 * aligned on a 4 byte boundary.

		 */

		align = NET_IP_ALIGN + (2 * (header_size % 4 == 0));

		align = header_size % 4;



		/*

		 * Allocate the sk_buffer, initialize it and copy