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

Commit 2071a008 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-1000.c
	drivers/net/wireless/iwlwifi/iwl-6000.c
	drivers/net/wireless/iwlwifi/iwl-core.h
parents ff879eb6 d01032e4

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -4303,6 +4303,7 @@ F: drivers/video/aty/aty128fb.c 


RALINK RT2X00 WIRELESS LAN DRIVER

P:	rt2x00 project

M:	Ivo van Doorn <IvDoorn@gmail.com>

L:	linux-wireless@vger.kernel.org

L:	users@rt2x00.serialmonkey.com (moderated for non-subscribers)

W:	http://rt2x00.serialmonkey.com/

drivers/net/wireless/ath/ath5k/base.c

+0 −1
Original line number Diff line number Diff line
@@ -1146,7 +1146,6 @@ ath5k_mode_setup(struct ath5k_softc *sc) 
	/* configure operational mode */

	ath5k_hw_set_opmode(ah);



	ath5k_hw_set_mcast_filter(ah, 0, 0);

	ATH5K_DBG(sc, ATH5K_DEBUG_MODE, "RX filter 0x%x\n", rfilt);

}

drivers/net/wireless/ath/ath5k/led.c

+4 −0
Original line number Diff line number Diff line
@@ -65,12 +65,16 @@ static const struct pci_device_id ath5k_led_devices[] = { 
	{ ATH_SDEVICE(PCI_VENDOR_ID_AMBIT, 0x0422), ATH_LED(1, 1) },

	/* E-machines E510 (tuliom@gmail.com) */

	{ ATH_SDEVICE(PCI_VENDOR_ID_AMBIT, 0x0428), ATH_LED(3, 0) },

	/* BenQ Joybook R55v (nowymarluk@wp.pl) */

	{ ATH_SDEVICE(PCI_VENDOR_ID_QMI, 0x0100), ATH_LED(1, 0) },

	/* Acer Extensa 5620z (nekoreeve@gmail.com) */

	{ ATH_SDEVICE(PCI_VENDOR_ID_QMI, 0x0105), ATH_LED(3, 0) },

	/* Fukato Datacask Jupiter 1014a (mrb74@gmx.at) */

	{ ATH_SDEVICE(PCI_VENDOR_ID_AZWAVE, 0x1026), ATH_LED(3, 0) },

	/* IBM ThinkPad AR5BXB6 (legovini@spiro.fisica.unipd.it) */

	{ ATH_SDEVICE(PCI_VENDOR_ID_IBM, 0x058a), ATH_LED(1, 0) },

	/* HP Compaq CQ60-206US (ddreggors@jumptv.com) */

	{ ATH_SDEVICE(PCI_VENDOR_ID_HP, 0x0137a), ATH_LED(3, 1) },

	/* HP Compaq C700 (nitrousnrg@gmail.com) */

	{ ATH_SDEVICE(PCI_VENDOR_ID_HP, 0x0137b), ATH_LED(3, 1) },

	/* IBM-specific AR5212 (all others) */

drivers/net/wireless/b43/main.c

+1 −2
Original line number Diff line number Diff line
@@ -4521,9 +4521,8 @@ static int b43_op_beacon_set_tim(struct ieee80211_hw *hw, 
{

	struct b43_wl *wl = hw_to_b43_wl(hw);



	mutex_lock(&wl->mutex);

	/* FIXME: add locking */

	b43_update_templates(wl);

	mutex_unlock(&wl->mutex);



	return 0;

}

drivers/net/wireless/libertas/ethtool.c

+10 −7
Original line number Diff line number Diff line
@@ -169,16 +169,19 @@ static int lbs_ethtool_set_wol(struct net_device *dev, 
	struct lbs_private *priv = dev->ml_priv;

	uint32_t criteria = 0;



	if (priv->wol_criteria == 0xffffffff && wol->wolopts)

		return -EOPNOTSUPP;



	if (wol->wolopts & ~(WAKE_UCAST|WAKE_MCAST|WAKE_BCAST|WAKE_PHY))

		return -EOPNOTSUPP;



	if (wol->wolopts & WAKE_UCAST) criteria |= EHS_WAKE_ON_UNICAST_DATA;

	if (wol->wolopts & WAKE_MCAST) criteria |= EHS_WAKE_ON_MULTICAST_DATA;

	if (wol->wolopts & WAKE_BCAST) criteria |= EHS_WAKE_ON_BROADCAST_DATA;

	if (wol->wolopts & WAKE_PHY)   criteria |= EHS_WAKE_ON_MAC_EVENT;

	if (wol->wolopts & WAKE_UCAST)

		criteria |= EHS_WAKE_ON_UNICAST_DATA;

	if (wol->wolopts & WAKE_MCAST)

		criteria |= EHS_WAKE_ON_MULTICAST_DATA;

	if (wol->wolopts & WAKE_BCAST)

		criteria |= EHS_WAKE_ON_BROADCAST_DATA;

	if (wol->wolopts & WAKE_PHY)

		criteria |= EHS_WAKE_ON_MAC_EVENT;

	if (wol->wolopts == 0)

		criteria |= EHS_REMOVE_WAKEUP;



	return lbs_host_sleep_cfg(priv, criteria, (struct wol_config *)NULL);

}