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

Commit ff945afb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6:
  Staging: comedi: fix build on arches that don't want comedi drivers
  Staging: comedi: pcmcia irq fixes
  Staging: comedi: ni_pcimio: Added device id for pxi-6225.
  Staging: comedi: ni_65xx.c: fix output inversion problem.
  Staging: comedi: ni_65xx.c: fix insn_bits shift calculation.
  Staging: comedi: s526: fixes for pulse generator
  Staging: comedi: s526: Take account of arch's byte order.
  Staging: comedi: s526: Get rid of global variable 'cmReg'.
  Staging: comedi: s526: Fix number of channels on DIO subdevice
  Staging: comedi: cb_pcidio: fix "section mismatch" error
  Staging: comedi: jr3_pci: Initialize transf variable fully in jr3_pci_poll_subdevice().
  Staging: comedi: Corrected type of a printk argument in resize_async_buffer().
  Staging: p9auth: a few fixes
  Staging: rtl8192e: Add #include <linux/vmalloc.h>
  Staging: iio: Don't build on s390
  Staging: winbond: implement prepare_multicast and fix API usage
  Staging: w35und: Fix ->beacon_int breakage
  Staging: remove cowloop driver
  Staging: remove agnx driver
  Staging: comedi: serial2002: fix include build issue
parents 4c274fff cad9e3c7

drivers/staging/Kconfig

+0 −4
Original line number Diff line number Diff line
@@ -59,8 +59,6 @@ source "drivers/staging/echo/Kconfig" 


source "drivers/staging/poch/Kconfig"



source "drivers/staging/agnx/Kconfig"



source "drivers/staging/otus/Kconfig"



source "drivers/staging/rt2860/Kconfig"
@@ -129,7 +127,5 @@ source "drivers/staging/sep/Kconfig" 


source "drivers/staging/iio/Kconfig"



source "drivers/staging/cowloop/Kconfig"



endif # !STAGING_EXCLUDE_BUILD

endif # STAGING

drivers/staging/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ obj-$(CONFIG_W35UND) += winbond/ 
obj-$(CONFIG_PRISM2_USB)	+= wlan-ng/

obj-$(CONFIG_ECHO)		+= echo/

obj-$(CONFIG_POCH)		+= poch/

obj-$(CONFIG_AGNX)		+= agnx/

obj-$(CONFIG_OTUS)		+= otus/

obj-$(CONFIG_RT2860)		+= rt2860/

obj-$(CONFIG_RT2870)		+= rt2870/
@@ -46,4 +45,3 @@ obj-$(CONFIG_VME_BUS) += vme/ 
obj-$(CONFIG_RAR_REGISTER)	+= rar/

obj-$(CONFIG_DX_SEP)		+= sep/

obj-$(CONFIG_IIO)		+= iio/
 
obj-$(CONFIG_COWLOOP)		+= cowloop/

drivers/staging/agnx/Kconfig

deleted100644 → 0
+0 −5
Original line number Diff line number Diff line 
config AGNX

	tristate "Wireless Airgo AGNX support"

	depends on WLAN_80211 && MAC80211

	---help---

	  This is an experimental driver for Airgo AGNX00 wireless chip.

drivers/staging/agnx/Makefile

deleted100644 → 0
+0 −8
Original line number Diff line number Diff line 
obj-$(CONFIG_AGNX)	+= agnx.o



agnx-objs :=	rf.o	\

		pci.o	\

		xmit.o	\

		table.o	\

		sta.o	\

		phy.o

drivers/staging/agnx/TODO

deleted100644 → 0
+0 −22
Original line number Diff line number Diff line 
2008 7/18



The RX has can't receive OFDM packet correctly,

Guess it need be do RX calibrate.





before 2008 3/1



1: The RX get too much "CRC failed" pakets, it make the card work very unstable,

2: After running a while, the card will get infinity "RX Frame" and "Error"

interrupt, not know the root reason so far, try to fix it

3: Using two tx queue txd and txm but not only txm.

4: Set the hdr correctly.

5: Try to do recalibrate correvtly

6: To support G mode in future

7: Fix the mac address can't be readed and set correctly in BE machine.

8: Fix include and exclude FCS in promisous mode and manage mode

9: Using sta_notify to notice sta change

10: Turn on frame reception at the end of start

11: Guess the card support HW_MULTICAST_FILTER

12: The tx process should be implment atomic?

13: Using mac80211 function to control the TX&RX LED.