Module Name:	src
Committed By:	skrll
Date:		Tue Dec 20 07:51:38 UTC 2005

Modified Files:
	src/sys/dev/pci: if_ipw.c if_ipwreg.h if_ipwvar.h

Log Message:
Merge the FreeBSD code and adapt to NetBSD:

	- add power management.
	- update ioctl handling.

Fix PR 27439 as the FreeBSD code has joerg's fix for when the RX intr
routine can't allocate a new mbuf.

Fix PR 30806. Thanks to cube@ for testing and some struct ipw_soft_hdr
handling code.

XXX The state machine doesn't sync with the net80211 layer, but that's
XXX not a surprise.


To generate a diff of this commit:
cvs rdiff -r1.14 -r1.15 src/sys/dev/pci/if_ipw.c
cvs rdiff -r1.4 -r1.5 src/sys/dev/pci/if_ipwreg.h
cvs rdiff -r1.7 -r1.8 src/sys/dev/pci/if_ipwvar.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.