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

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (55 commits)
  netxen: fix tx ring accounting
  netxen: fix detection of cut-thru firmware mode
  forcedeth: fix dma api mismatches
  atm: sk_wmem_alloc initial value is one
  net: correct off-by-one write allocations reports
  via-velocity : fix no link detection on boot
  Net / e100: Fix suspend of devices that cannot be power managed
  TI DaVinci EMAC : Fix rmmod error
  net: group address list and its count
  ipv4: Fix fib_trie rebalancing, part 2
  pkt_sched: Update drops stats in act_police
  sky2: version 1.23
  sky2: add GRO support
  sky2: skb recycling
  sky2: reduce default transmit ring
  sky2: receive counter update
  sky2: fix shutdown synchronization
  sky2: PCI irq issues
  sky2: more receive shutdown
  sky2: turn off pause during shutdown
  ...

Manually fix trivial conflict in net/core/skbuff.c due to kmemcheck
parents 9e3e4b1d cb2107be

Documentation/rfkill.txt

+69 −68
Original line number Original line Diff line number Diff line
@@ -3,9 +3,8 @@ rfkill - RF kill switch support 




1. Introduction

1. Introduction

2. Implementation details

2. Implementation details

3. Kernel driver guidelines

3. Kernel API

4. Kernel API

4. Userspace support

5. Userspace support









1. Introduction

1. Introduction
@@ -19,82 +18,62 @@ disable all transmitters of a certain type (or all). This is intended for 
situations where transmitters need to be turned off, for example on

situations where transmitters need to be turned off, for example on

aircraft.

aircraft.





The rfkill subsystem has a concept of "hard" and "soft" block, which

differ little in their meaning (block == transmitters off) but rather in

whether they can be changed or not:

 - hard block: read-only radio block that cannot be overriden by software

 - soft block: writable radio block (need not be readable) that is set by

               the system software.









2. Implementation details

2. Implementation details





The rfkill subsystem is composed of various components: the rfkill class, the

The rfkill subsystem is composed of three main components:

rfkill-input module (an input layer handler), and some specific input layer

 * the rfkill core,

events.

 * the deprecated rfkill-input module (an input layer handler, being



   replaced by userspace policy code) and

The rfkill class is provided for kernel drivers to register their radio

 * the rfkill drivers.

transmitter with the kernel, provide methods for turning it on and off and,

optionally, letting the system know about hardware-disabled states that may

be implemented on the device. This code is enabled with the CONFIG_RFKILL

Kconfig option, which drivers can "select".



The rfkill class code also notifies userspace of state changes, this is

achieved via uevents. It also provides some sysfs files for userspace to

check the status of radio transmitters. See the "Userspace support" section

below.





The rfkill core provides API for kernel drivers to register their radio

transmitter with the kernel, methods for turning it on and off and, letting

the system know about hardware-disabled states that may be implemented on

the device.





The rfkill-input code implements a basic response to rfkill buttons -- it

The rfkill core code also notifies userspace of state changes, and provides

implements turning on/off all devices of a certain class (or all).

ways for userspace to query the current states. See the "Userspace support"

section below.





When the device is hard-blocked (either by a call to rfkill_set_hw_state()

When the device is hard-blocked (either by a call to rfkill_set_hw_state()

or from query_hw_block) set_block() will be invoked but drivers can well

or from query_hw_block) set_block() will be invoked for additional software

ignore the method call since they can use the return value of the function

block, but drivers can ignore the method call since they can use the return

rfkill_set_hw_state() to sync the software state instead of keeping track

value of the function rfkill_set_hw_state() to sync the software state

of calls to set_block().

instead of keeping track of calls to set_block(). In fact, drivers should



use the return value of rfkill_set_hw_state() unless the hardware actually



keeps track of soft and hard block separately.

The entire functionality is spread over more than one subsystem:



 * The kernel input layer generates KEY_WWAN, KEY_WLAN etc. and

   SW_RFKILL_ALL -- when the user presses a button. Drivers for radio

   transmitters generally do not register to the input layer, unless the

   device really provides an input device (i.e. a button that has no

   effect other than generating a button press event)



 * The rfkill-input code hooks up to these events and switches the soft-block

   of the various radio transmitters, depending on the button type.



 * The rfkill drivers turn off/on their transmitters as requested.



 * The rfkill class will generate userspace notifications (uevents) to tell

   userspace what the current state is.









3. Kernel API





3. Kernel driver guidelines







Drivers for radio transmitters normally implement an rfkill driver.

Drivers for radio transmitters normally implement only the rfkill class.

These drivers may not unblock the transmitter based on own decisions, they

should act on information provided by the rfkill class only.





Platform drivers might implement input devices if the rfkill button is just

Platform drivers might implement input devices if the rfkill button is just

that, a button. If that button influences the hardware then you need to

that, a button. If that button influences the hardware then you need to

implement an rfkill class instead. This also applies if the platform provides

implement an rfkill driver instead. This also applies if the platform provides

a way to turn on/off the transmitter(s).

a way to turn on/off the transmitter(s).





During suspend/hibernation, transmitters should only be left enabled when

For some platforms, it is possible that the hardware state changes during

wake-on wlan or similar functionality requires it and the device wasn't

suspend/hibernation, in which case it will be necessary to update the rfkill

blocked before suspend/hibernate. Note that it may be necessary to update

core with the current state is at resume time.

the rfkill subsystem's idea of what the current state is at resume time if

the state may have changed over suspend.







To create an rfkill driver, driver's Kconfig needs to have





4. Kernel API

	depends on RFKILL || !RFKILL





To build a driver with rfkill subsystem support, the driver should depend on

to ensure the driver cannot be built-in when rfkill is modular. The !RFKILL

(or select) the Kconfig symbol RFKILL.

case allows the driver to be built when rfkill is not configured, which which



case all rfkill API can still be used but will be provided by static inlines

The hardware the driver talks to may be write-only (where the current state

which compile to almost nothing.

of the hardware is unknown), or read-write (where the hardware can be queried

about its current state).





Calling rfkill_set_hw_state() when a state change happens is required from

Calling rfkill_set_hw_state() when a state change happens is required from

rfkill drivers that control devices that can be hard-blocked unless they also

rfkill drivers that control devices that can be hard-blocked unless they also
@@ -105,10 +84,33 @@ device). Don't do this unless you cannot get the event in any other way. 




5. Userspace support

5. Userspace support





The following sysfs entries exist for every rfkill device:

The recommended userspace interface to use is /dev/rfkill, which is a misc

character device that allows userspace to obtain and set the state of rfkill

devices and sets of devices. It also notifies userspace about device addition

and removal. The API is a simple read/write API that is defined in

linux/rfkill.h, with one ioctl that allows turning off the deprecated input

handler in the kernel for the transition period.



Except for the one ioctl, communication with the kernel is done via read()

and write() of instances of 'struct rfkill_event'. In this structure, the

soft and hard block are properly separated (unlike sysfs, see below) and

userspace is able to get a consistent snapshot of all rfkill devices in the

system. Also, it is possible to switch all rfkill drivers (or all drivers of

a specified type) into a state which also updates the default state for

hotplugged devices.



After an application opens /dev/rfkill, it can read the current state of

all devices, and afterwards can poll the descriptor for hotplug or state

change events.



Applications must ignore operations (the "op" field) they do not handle,

this allows the API to be extended in the future.



Additionally, each rfkill device is registered in sysfs and there has the

following attributes:





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

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

	type: Name of the key type ("wlan", "bluetooth", etc).

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

	state: Current state of the transmitter

	state: Current state of the transmitter

		0: RFKILL_STATE_SOFT_BLOCKED

		0: RFKILL_STATE_SOFT_BLOCKED

			transmitter is turned off by software

			transmitter is turned off by software
@@ -117,7 +119,12 @@ The following sysfs entries exist for every rfkill device: 
		2: RFKILL_STATE_HARD_BLOCKED

		2: RFKILL_STATE_HARD_BLOCKED

			transmitter is forced off by something outside of

			transmitter is forced off by something outside of

			the driver's control.

			the driver's control.

	claim: 0: Kernel handles events (currently always reads that value)

	       This file is deprecated because it can only properly show

	       three of the four possible states, soft-and-hard-blocked is

	       missing.

	claim: 0: Kernel handles events

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

	       claim just control over a single rfkill instance.





rfkill devices also issue uevents (with an action of "change"), with the

rfkill devices also issue uevents (with an action of "change"), with the

following environment variables set:

following environment variables set:
@@ -128,9 +135,3 @@ RFKILL_TYPE 




The contents of these variables corresponds to the "name", "state" and

The contents of these variables corresponds to the "name", "state" and

"type" sysfs files explained above.
 
"type" sysfs files explained above.
 


An alternative userspace interface exists as a misc device /dev/rfkill,

which allows userspace to obtain and set the state of rfkill devices and

sets of devices. It also notifies userspace about device addition and

removal. The API is a simple read/write API that is defined in

linux/rfkill.h.

drivers/isdn/i4l/isdn_net.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1300,7 +1300,7 @@ isdn_net_start_xmit(struct sk_buff *skb, struct net_device *ndev) 
				netif_stop_queue(ndev);

				netif_stop_queue(ndev);

		}

		}

	}

	}

	return 1;

	return NETDEV_TX_BUSY;

}

}





/*

/*

drivers/net/bnx2.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -3552,14 +3552,14 @@ bnx2_set_rx_mode(struct net_device *dev) 
		sort_mode |= BNX2_RPM_SORT_USER0_MC_HSH_EN;

		sort_mode |= BNX2_RPM_SORT_USER0_MC_HSH_EN;

	}

	}





	if (dev->uc_count > BNX2_MAX_UNICAST_ADDRESSES) {

	if (dev->uc.count > BNX2_MAX_UNICAST_ADDRESSES) {

		rx_mode |= BNX2_EMAC_RX_MODE_PROMISCUOUS;

		rx_mode |= BNX2_EMAC_RX_MODE_PROMISCUOUS;

		sort_mode |= BNX2_RPM_SORT_USER0_PROM_EN |

		sort_mode |= BNX2_RPM_SORT_USER0_PROM_EN |

			     BNX2_RPM_SORT_USER0_PROM_VLAN;

			     BNX2_RPM_SORT_USER0_PROM_VLAN;

	} else if (!(dev->flags & IFF_PROMISC)) {

	} else if (!(dev->flags & IFF_PROMISC)) {

		/* Add all entries into to the match filter list */

		/* Add all entries into to the match filter list */

		i = 0;

		i = 0;

		list_for_each_entry(ha, &dev->uc_list, list) {

		list_for_each_entry(ha, &dev->uc.list, list) {

			bnx2_set_mac_addr(bp, ha->addr,

			bnx2_set_mac_addr(bp, ha->addr,

					  i + BNX2_START_UNICAST_ADDRESS_INDEX);

					  i + BNX2_START_UNICAST_ADDRESS_INDEX);

			sort_mode |= (1 <<

			sort_mode |= (1 <<

drivers/net/davinci_emac.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -2767,7 +2767,6 @@ static int __devexit davinci_emac_remove(struct platform_device *pdev) 




	dev_notice(&ndev->dev, "DaVinci EMAC: davinci_emac_remove()\n");

	dev_notice(&ndev->dev, "DaVinci EMAC: davinci_emac_remove()\n");





	clk_disable(emac_clk);

	platform_set_drvdata(pdev, NULL);

	platform_set_drvdata(pdev, NULL);

	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	mdiobus_unregister(priv->mii_bus);

	mdiobus_unregister(priv->mii_bus);

drivers/net/e100.c

+6 −5
Original line number Original line Diff line number Diff line
@@ -2895,12 +2895,13 @@ static void __e100_shutdown(struct pci_dev *pdev, bool *enable_wake) 




static int __e100_power_off(struct pci_dev *pdev, bool wake)

static int __e100_power_off(struct pci_dev *pdev, bool wake)

{

{

	if (wake) {

	if (wake)

		return pci_prepare_to_sleep(pdev);

		return pci_prepare_to_sleep(pdev);

	} else {



	pci_wake_from_d3(pdev, false);

	pci_wake_from_d3(pdev, false);

		return pci_set_power_state(pdev, PCI_D3hot);

	pci_set_power_state(pdev, PCI_D3hot);

	}



	return 0;

}

}





#ifdef CONFIG_PM

#ifdef CONFIG_PM

CRA Git | Maintained and supported by SUSTech CRA and CCSE