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

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

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

parents d9d52832 83fc9c89

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -4280,7 +4280,7 @@ F: drivers/video/aty/aty128fb.c 
RALINK RT2X00 WIRELESS LAN DRIVER

P:	rt2x00 project

L:	linux-wireless@vger.kernel.org

L:	users@rt2x00.serialmonkey.com

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

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

S:	Maintained

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/ivd/rt2x00.git

drivers/net/wireless/airo.c

+2 −3
Original line number Diff line number Diff line
@@ -4790,9 +4790,8 @@ static int proc_stats_rid_open( struct inode *inode, 
static int get_dec_u16( char *buffer, int *start, int limit ) {

	u16 value;

	int valid = 0;

	for( value = 0; buffer[*start] >= '0' &&

		     buffer[*start] <= '9' &&

		     *start < limit; (*start)++ ) {

	for (value = 0; *start < limit && buffer[*start] >= '0' &&

			buffer[*start] <= '9'; (*start)++) {

		valid = 1;

		value *= 10;

		value += buffer[*start] - '0';

drivers/net/wireless/b43/leds.h

+1 −0
Original line number Diff line number Diff line 
#ifndef B43_LEDS_H_

#define B43_LEDS_H_



struct b43_wl;

struct b43_wldev;



#ifdef CONFIG_B43_LEDS

drivers/net/wireless/b43/main.c

+0 −1
Original line number Diff line number Diff line
@@ -4501,7 +4501,6 @@ static void b43_op_stop(struct ieee80211_hw *hw) 


	cancel_work_sync(&(wl->beacon_update_trigger));



	wiphy_rfkill_stop_polling(hw->wiphy);

	mutex_lock(&wl->mutex);

	if (b43_status(dev) >= B43_STAT_STARTED) {

		dev = b43_wireless_core_stop(dev);

drivers/net/wireless/b43/rfkill.c

+2 −1
Original line number Diff line number Diff line
@@ -33,7 +33,8 @@ bool b43_is_hw_radio_enabled(struct b43_wldev *dev) 
		      & B43_MMIO_RADIO_HWENABLED_HI_MASK))

			return 1;

	} else {

		if (b43_read16(dev, B43_MMIO_RADIO_HWENABLED_LO)

		if (b43_status(dev) >= B43_STAT_STARTED &&

		    b43_read16(dev, B43_MMIO_RADIO_HWENABLED_LO)

		    & B43_MMIO_RADIO_HWENABLED_LO_MASK)

			return 1;

	}