Commit 62910554 authored by Patrick McHardy's avatar Patrick McHardy
Browse files

Merge branch 'master' of /repos/git/net-next-2.6 



Conflicts:
	Documentation/feature-removal-schedule.txt
	net/ipv6/netfilter/ip6t_REJECT.c
	net/netfilter/xt_limit.c

Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parents 22265a5c ab930471

Documentation/ABI/obsolete/sysfs-class-rfkill

0 → 100644
+29 −0
Original line number Diff line number Diff line 
rfkill - radio frequency (RF) connector kill switch support



For details to this subsystem look at Documentation/rfkill.txt.



What:		/sys/class/rfkill/rfkill[0-9]+/state

Date:		09-Jul-2007

KernelVersion	v2.6.22

Contact:	linux-wireless@vger.kernel.org

Description: 	Current state of the transmitter.

		This file is deprecated and sheduled to be removed in 2014,

		because its not possible to express the 'soft and hard block'

		state of the rfkill driver.

Values: 	A numeric value.

		0: RFKILL_STATE_SOFT_BLOCKED

			transmitter is turned off by software

		1: RFKILL_STATE_UNBLOCKED

			transmitter is (potentially) active

		2: RFKILL_STATE_HARD_BLOCKED

			transmitter is forced off by something outside of

			the driver's control.



What:		/sys/class/rfkill/rfkill[0-9]+/claim

Date:		09-Jul-2007

KernelVersion	v2.6.22

Contact:	linux-wireless@vger.kernel.org

Description:	This file is deprecated because there no longer is a way to

		claim just control over a single rfkill instance.

		This file is scheduled to be removed in 2012.

Values: 	0: Kernel handles events

Documentation/ABI/stable/sysfs-class-rfkill

0 → 100644
+67 −0
Original line number Diff line number Diff line 
rfkill - radio frequency (RF) connector kill switch support



For details to this subsystem look at Documentation/rfkill.txt.



For the deprecated /sys/class/rfkill/*/state and

/sys/class/rfkill/*/claim knobs of this interface look in

Documentation/ABI/obsolete/sysfs-class-rfkill.



What: 		/sys/class/rfkill

Date:		09-Jul-2007

KernelVersion:	v2.6.22

Contact:	linux-wireless@vger.kernel.org,

Description: 	The rfkill class subsystem folder.

		Each registered rfkill driver is represented by an rfkillX

		subfolder (X being an integer > 0).





What:		/sys/class/rfkill/rfkill[0-9]+/name

Date:		09-Jul-2007

KernelVersion	v2.6.22

Contact:	linux-wireless@vger.kernel.org

Description: 	Name assigned by driver to this key (interface or driver name).

Values: 	arbitrary string.





What: 		/sys/class/rfkill/rfkill[0-9]+/type

Date:		09-Jul-2007

KernelVersion	v2.6.22

Contact:	linux-wireless@vger.kernel.org

Description: 	Driver type string ("wlan", "bluetooth", etc).

Values: 	See include/linux/rfkill.h.





What:		/sys/class/rfkill/rfkill[0-9]+/persistent

Date:		09-Jul-2007

KernelVersion	v2.6.22

Contact:	linux-wireless@vger.kernel.org

Description: 	Whether the soft blocked state is initialised from non-volatile

		storage at startup.

Values: 	A numeric value.

		0: false

		1: true





What:		/sys/class/rfkill/rfkill[0-9]+/hard

Date:		12-March-2010

KernelVersion	v2.6.34

Contact:	linux-wireless@vger.kernel.org

Description: 	Current hardblock state. This file is read only.

Values: 	A numeric value.

		0: inactive

			The transmitter is (potentially) active.

		1: active

			The transmitter is forced off by something outside of

			the driver's control.





What:		/sys/class/rfkill/rfkill[0-9]+/soft

Date:		12-March-2010

KernelVersion	v2.6.34

Contact:	linux-wireless@vger.kernel.org

Description:	Current softblock state. This file is read and write.

Values: 	A numeric value.

		0: inactive

			The transmitter is (potentially) active.

		1: active

			The transmitter is turned off by software.

Documentation/ABI/testing/sysfs-bus-usb

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ Description: 
		match the driver to the device.  For example:

		# echo "046d c315" > /sys/bus/usb/drivers/foo/remove_id



What:		/sys/bus/usb/device/.../avoid_reset

What:		/sys/bus/usb/device/.../avoid_reset_quirk

Date:		December 2009

Contact:	Oliver Neukum <oliver@neukum.org>

Description:

Documentation/DocBook/tracepoint.tmpl

+13 −0
Original line number Diff line number Diff line
@@ -16,6 +16,15 @@ 
     </address>

    </affiliation>

   </author>

   <author>

    <firstname>William</firstname>

    <surname>Cohen</surname>

    <affiliation>

     <address>

      <email>wcohen@redhat.com</email>

     </address>

    </affiliation>

   </author>

  </authorgroup>



  <legalnotice>
@@ -91,4 +100,8 @@ 
!Iinclude/trace/events/signal.h

  </chapter>



  <chapter id="block">

   <title>Block IO</title>

!Iinclude/trace/events/block.h

  </chapter>

</book>