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

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

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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  iwlwifi: Fix built-in compilation of iwlcore
  net: Unexport move_addr_to_{kernel,user}
  rt2x00: Select LEDS_CLASS.
  iwlwifi: Select LEDS_CLASS.
  leds: Do not guard NEW_LEDS with HAS_IOMEM
  [IPSEC]: Fix catch-22 with algorithm IDs above 31
  time: Export set_normalized_timespec.
  tcp: Make use of before macro in tcp_input.c
  hamradio: Remove unneeded and deprecated cli()/sti() calls in dmascc.c
  [NETNS]: Remove empty ->init callback.
  [DCCP]: Convert do_gettimeofday() to getnstimeofday().
  [NETNS]: Don't initialize err variable twice.
  [NETNS]: The ip6_fib_timer can work with garbage on net namespace stop.
  [IPV4]: Convert do_gettimeofday() to getnstimeofday().
  [IPV4]: Make icmp_sk_init() static.
  [IPV6]: Make struct ip6_prohibit_entry_template static.
  tcp: Trivial fix to correct function name in a comment in net/ipv4/tcp.c
  [NET]: Expose netdevice dev_id through sysfs
  skbuff: fix missing kernel-doc notation
  [ROSE]: Fix soft lockup wrt. rose_node_list_lock
parents 0093cb11 d7d31300

drivers/leds/Kconfig

+0 −1
Original line number Diff line number Diff line 
menuconfig NEW_LEDS

	bool "LED Support"

	depends on HAS_IOMEM

	help

	  Say Y to enable Linux LED support.  This allows control of supported

	  LEDs from both userspace and optionally, by kernel events (triggers).

drivers/net/hamradio/dmascc.c

+0 −3
Original line number Diff line number Diff line
@@ -1083,15 +1083,12 @@ static void start_timer(struct scc_priv *priv, int t, int r15) 
	if (t == 0) {

		tm_isr(priv);

	} else if (t > 0) {

		save_flags(flags);

		cli();

		outb(t & 0xFF, priv->tmr_cnt);

		outb((t >> 8) & 0xFF, priv->tmr_cnt);

		if (priv->type != TYPE_TWIN) {

			write_scc(priv, R15, r15 | CTSIE);

			priv->rr0 |= CTS;

		}

		restore_flags(flags);

	}

}

drivers/net/wireless/iwlwifi/Kconfig

+6 −2
Original line number Diff line number Diff line
@@ -49,7 +49,9 @@ config IWL4965_HT 


config IWL4965_LEDS

	bool "Enable LEDS features in iwl4965 driver"

	depends on IWL4965 && MAC80211_LEDS && LEDS_CLASS

	depends on IWL4965

	select MAC80211_LEDS

	select LEDS_CLASS

	select IWLWIFI_LEDS

	---help---

	  This option enables LEDS for the iwlwifi drivers
@@ -134,7 +136,9 @@ config IWL3945_SPECTRUM_MEASUREMENT 


config IWL3945_LEDS

	bool "Enable LEDS features in iwl3945 driver"

	depends on IWL3945 && MAC80211_LEDS && LEDS_CLASS

	depends on IWL3945

	select MAC80211_LEDS

	select LEDS_CLASS

	---help---

	  This option enables LEDS for the iwl3945 driver.

drivers/net/wireless/iwlwifi/Makefile

+1 −1
Original line number Diff line number Diff line 
obj-$(CONFIG_IWLCORE)	:= iwlcore.o

obj-$(CONFIG_IWLCORE)	+= iwlcore.o

iwlcore-objs 		:= iwl-core.o iwl-eeprom.o iwl-hcmd.o

iwlcore-$(CONFIG_IWLWIFI_DEBUGFS) += iwl-debugfs.o

iwlcore-$(CONFIG_IWLWIFI_LEDS) += iwl-led.o

drivers/net/wireless/rt2x00/Kconfig

+10 −5
Original line number Diff line number Diff line
@@ -60,7 +60,8 @@ config RT2400PCI_RFKILL 


config RT2400PCI_LEDS

	bool "RT2400 leds support"

	depends on RT2400PCI && LEDS_CLASS

	depends on RT2400PCI

	select LEDS_CLASS

	select RT2X00_LIB_LEDS

	---help---

	  This adds support for led triggers provided my mac80211.
@@ -86,7 +87,8 @@ config RT2500PCI_RFKILL 


config RT2500PCI_LEDS

	bool "RT2500 leds support"

	depends on RT2500PCI && LEDS_CLASS

	depends on RT2500PCI

	select LEDS_CLASS

	select RT2X00_LIB_LEDS

	---help---

	  This adds support for led triggers provided my mac80211.
@@ -114,7 +116,8 @@ config RT61PCI_RFKILL 


config RT61PCI_LEDS

	bool "RT61 leds support"

	depends on RT61PCI && LEDS_CLASS

	depends on RT61PCI

	select LEDS_CLASS

	select RT2X00_LIB_LEDS

	---help---

	  This adds support for led triggers provided my mac80211.
@@ -130,7 +133,8 @@ config RT2500USB 


config RT2500USB_LEDS

	bool "RT2500 leds support"

	depends on RT2500USB && LEDS_CLASS

	depends on RT2500USB

	select LEDS_CLASS

	select RT2X00_LIB_LEDS

	---help---

	  This adds support for led triggers provided my mac80211.
@@ -148,7 +152,8 @@ config RT73USB 


config RT73USB_LEDS

	bool "RT73 leds support"

	depends on RT73USB && LEDS_CLASS

	depends on RT73USB

	select LEDS_CLASS

	select RT2X00_LIB_LEDS

	---help---

	  This adds support for led triggers provided my mac80211.