Commit 7c3ceb4a authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 

Conflicts:

	drivers/net/wireless/iwlwifi/iwl-3945.c
	net/mac80211/mlme.c
parents 54dceb00 b2238566

drivers/net/irda/nsc-ircc.c

+1 −0
Original line number Diff line number Diff line
@@ -152,6 +152,7 @@ static chipio_t pnp_info; 
static const struct pnp_device_id nsc_ircc_pnp_table[] = {

	{ .id = "NSC6001", .driver_data = 0 },

	{ .id = "IBM0071", .driver_data = 0 },

	{ .id = "HWPC224", .driver_data = 0 },

	{ }

};

drivers/net/irda/via-ircc.c

+3 −0
Original line number Diff line number Diff line
@@ -1546,6 +1546,7 @@ static int via_ircc_net_open(struct net_device *dev) 
			IRDA_WARNING("%s, unable to allocate dma2=%d\n",

				     driver_name, self->io.dma2);

			free_irq(self->io.irq, self);

			free_dma(self->io.dma);

			return -EAGAIN;

		}

	}
@@ -1606,6 +1607,8 @@ static int via_ircc_net_close(struct net_device *dev) 
	EnAllInt(iobase, OFF);

	free_irq(self->io.irq, dev);

	free_dma(self->io.dma);

	if (self->io.dma2 != self->io.dma)

		free_dma(self->io.dma2);



	return 0;

}

drivers/net/wireless/hostap/hostap_cs.c

+8 −4
Original line number Diff line number Diff line
@@ -777,7 +777,9 @@ static int hostap_cs_suspend(struct pcmcia_device *link) 
	int dev_open = 0;

	struct hostap_interface *iface = NULL;



	if (dev)

	if (!dev)

		return -ENODEV;



	iface = netdev_priv(dev);



	PDEBUG(DEBUG_EXTRA, "%s: CS_EVENT_PM_SUSPEND\n", dev_info);
@@ -798,7 +800,9 @@ static int hostap_cs_resume(struct pcmcia_device *link) 
	int dev_open = 0;

	struct hostap_interface *iface = NULL;



	if (dev)

	if (!dev)

		return -ENODEV;



	iface = netdev_priv(dev);



	PDEBUG(DEBUG_EXTRA, "%s: CS_EVENT_PM_RESUME\n", dev_info);

drivers/net/wireless/iwlwifi/iwl-3945.c

+2 −2
Original line number Diff line number Diff line
@@ -451,7 +451,7 @@ static void iwl3945_dbg_report_frame(struct iwl3945_priv *priv, 


	if (print_summary) {

		char *title;

		u32 rate;

		int rate;



		if (hundred)

			title = "100Frames";
@@ -489,7 +489,7 @@ static void iwl3945_dbg_report_frame(struct iwl3945_priv *priv, 
		 *    but you can hack it to show more, if you'd like to. */

		if (dataframe)

			IWL_DEBUG_RX("%s: mhd=0x%04x, dst=0x%02x, "

				     "len=%u, rssi=%d, chnl=%d, rate=%u, \n",

				     "len=%u, rssi=%d, chnl=%d, rate=%d, \n",

				     title, le16_to_cpu(fc), header->addr1[5],

				     length, rssi, channel, rate);

		else {

drivers/net/wireless/zd1211rw/zd_usb.c

+1 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ static struct usb_device_id usb_ids[] = { 
	{ USB_DEVICE(0x079b, 0x0062), .driver_info = DEVICE_ZD1211B },

	{ USB_DEVICE(0x1582, 0x6003), .driver_info = DEVICE_ZD1211B },

	{ USB_DEVICE(0x050d, 0x705c), .driver_info = DEVICE_ZD1211B },

	{ USB_DEVICE(0x083a, 0xe506), .driver_info = DEVICE_ZD1211B },

	{ USB_DEVICE(0x083a, 0x4505), .driver_info = DEVICE_ZD1211B },

	{ USB_DEVICE(0x0471, 0x1236), .driver_info = DEVICE_ZD1211B },

	{ USB_DEVICE(0x13b1, 0x0024), .driver_info = DEVICE_ZD1211B },