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

Commit 8d357611 authored by Wey-Yi Guy's avatar Wey-Yi Guy
Browse files

Merge branch 'master' of... 

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into wireless-next
parents 6b21d18e 8763848e

Documentation/DocBook/80211.tmpl

+0 −1
Original line number Diff line number Diff line
@@ -129,7 +129,6 @@ 
!Finclude/net/cfg80211.h cfg80211_pmksa

!Finclude/net/cfg80211.h cfg80211_send_rx_auth

!Finclude/net/cfg80211.h cfg80211_send_auth_timeout

!Finclude/net/cfg80211.h __cfg80211_auth_canceled

!Finclude/net/cfg80211.h cfg80211_send_rx_assoc

!Finclude/net/cfg80211.h cfg80211_send_assoc_timeout

!Finclude/net/cfg80211.h cfg80211_send_deauth

MAINTAINERS

+2 −4
Original line number Diff line number Diff line
@@ -1405,7 +1405,7 @@ F: net/ax25/ 
B43 WIRELESS DRIVER

M:	Stefano Brivio <stefano.brivio@polimi.it>

L:	linux-wireless@vger.kernel.org

L:	b43-dev@lists.infradead.org (moderated for non-subscribers)

L:	b43-dev@lists.infradead.org

W:	http://linuxwireless.org/en/users/Drivers/b43

S:	Maintained

F:	drivers/net/wireless/b43/
@@ -1414,6 +1414,7 @@ B43LEGACY WIRELESS DRIVER 
M:	Larry Finger <Larry.Finger@lwfinger.net>

M:	Stefano Brivio <stefano.brivio@polimi.it>

L:	linux-wireless@vger.kernel.org

L:	b43-dev@lists.infradead.org

W:	http://linuxwireless.org/en/users/Drivers/b43

S:	Maintained

F:	drivers/net/wireless/b43legacy/
@@ -1567,7 +1568,6 @@ F: drivers/net/ethernet/broadcom/tg3.* 


BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER

M:	Brett Rudley <brudley@broadcom.com>

M:	Henry Ptasinski <henryp@broadcom.com>

M:	Roland Vossen <rvossen@broadcom.com>

M:	Arend van Spriel <arend@broadcom.com>

M:	Franky (Zhenhui) Lin <frankyl@broadcom.com>
@@ -4910,8 +4910,6 @@ F: fs/ocfs2/ 


ORINOCO DRIVER

L:	linux-wireless@vger.kernel.org

L:	orinoco-users@lists.sourceforge.net

L:	orinoco-devel@lists.sourceforge.net

W:	http://linuxwireless.org/en/users/Drivers/orinoco

W:	http://www.nongnu.org/orinoco/

S:	Orphan

arch/mips/bcm47xx/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -3,5 +3,5 @@ 
# under Linux.

#



obj-y 				+= gpio.o irq.o nvram.o prom.o serial.o setup.o time.o

obj-y 				+= gpio.o irq.o nvram.o prom.o serial.o setup.o time.o sprom.o

obj-$(CONFIG_BCM47XX_SSB)	+= wgt634u.o

arch/mips/bcm47xx/nvram.c

+1 −2
Original line number Diff line number Diff line
@@ -107,8 +107,7 @@ int nvram_getenv(char *name, char *val, size_t val_len) 
		value = eq + 1;

		if ((eq - var) == strlen(name) &&

			strncmp(var, name, (eq - var)) == 0) {

			snprintf(val, val_len, "%s", value);

			return 0;

			return snprintf(val, val_len, "%s", value);

		}

	}

	return NVRAM_ERR_ENVNOTFOUND;

arch/mips/bcm47xx/setup.c

+35 −153
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
 *  Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org>

 *  Copyright (C) 2006 Michael Buesch <m@bues.ch>

 *  Copyright (C) 2010 Waldemar Brodkorb <wbx@openadk.org>

 *  Copyright (C) 2010-2011 Hauke Mehrtens <hauke@hauke-m.de>

 *  Copyright (C) 2010-2012 Hauke Mehrtens <hauke@hauke-m.de>

 *

 *  This program is free software; you can redistribute  it and/or modify it

 *  under  the terms of  the GNU General  Public License as published by the
@@ -85,156 +85,7 @@ static void bcm47xx_machine_halt(void) 
}



#ifdef CONFIG_BCM47XX_SSB

#define READ_FROM_NVRAM(_outvar, name, buf) \

	if (nvram_getprefix(prefix, name, buf, sizeof(buf)) >= 0)\

		sprom->_outvar = simple_strtoul(buf, NULL, 0);



#define READ_FROM_NVRAM2(_outvar, name1, name2, buf) \

	if (nvram_getprefix(prefix, name1, buf, sizeof(buf)) >= 0 || \

	    nvram_getprefix(prefix, name2, buf, sizeof(buf)) >= 0)\

		sprom->_outvar = simple_strtoul(buf, NULL, 0);



static inline int nvram_getprefix(const char *prefix, char *name,

				  char *buf, int len)

{

	if (prefix) {

		char key[100];



		snprintf(key, sizeof(key), "%s%s", prefix, name);

		return nvram_getenv(key, buf, len);

	}



	return nvram_getenv(name, buf, len);

}



static u32 nvram_getu32(const char *name, char *buf, int len)

{

	int rv;

	char key[100];

	u16 var0, var1;



	snprintf(key, sizeof(key), "%s0", name);

	rv = nvram_getenv(key, buf, len);

	/* return 0 here so this looks like unset */

	if (rv < 0)

		return 0;

	var0 = simple_strtoul(buf, NULL, 0);



	snprintf(key, sizeof(key), "%s1", name);

	rv = nvram_getenv(key, buf, len);

	if (rv < 0)

		return 0;

	var1 = simple_strtoul(buf, NULL, 0);

	return var1 << 16 | var0;

}



static void bcm47xx_fill_sprom(struct ssb_sprom *sprom, const char *prefix)

{

	char buf[100];

	u32 boardflags;



	memset(sprom, 0, sizeof(struct ssb_sprom));



	sprom->revision = 1; /* Fallback: Old hardware does not define this. */

	READ_FROM_NVRAM(revision, "sromrev", buf);

	if (nvram_getprefix(prefix, "il0macaddr", buf, sizeof(buf)) >= 0 ||

	    nvram_getprefix(prefix, "macaddr", buf, sizeof(buf)) >= 0)

		nvram_parse_macaddr(buf, sprom->il0mac);

	if (nvram_getprefix(prefix, "et0macaddr", buf, sizeof(buf)) >= 0)

		nvram_parse_macaddr(buf, sprom->et0mac);

	if (nvram_getprefix(prefix, "et1macaddr", buf, sizeof(buf)) >= 0)

		nvram_parse_macaddr(buf, sprom->et1mac);

	READ_FROM_NVRAM(et0phyaddr, "et0phyaddr", buf);

	READ_FROM_NVRAM(et1phyaddr, "et1phyaddr", buf);

	READ_FROM_NVRAM(et0mdcport, "et0mdcport", buf);

	READ_FROM_NVRAM(et1mdcport, "et1mdcport", buf);

	READ_FROM_NVRAM(board_rev, "boardrev", buf);

	READ_FROM_NVRAM(country_code, "ccode", buf);

	READ_FROM_NVRAM(ant_available_a, "aa5g", buf);

	READ_FROM_NVRAM(ant_available_bg, "aa2g", buf);

	READ_FROM_NVRAM(pa0b0, "pa0b0", buf);

	READ_FROM_NVRAM(pa0b1, "pa0b1", buf);

	READ_FROM_NVRAM(pa0b2, "pa0b2", buf);

	READ_FROM_NVRAM(pa1b0, "pa1b0", buf);

	READ_FROM_NVRAM(pa1b1, "pa1b1", buf);

	READ_FROM_NVRAM(pa1b2, "pa1b2", buf);

	READ_FROM_NVRAM(pa1lob0, "pa1lob0", buf);

	READ_FROM_NVRAM(pa1lob2, "pa1lob1", buf);

	READ_FROM_NVRAM(pa1lob1, "pa1lob2", buf);

	READ_FROM_NVRAM(pa1hib0, "pa1hib0", buf);

	READ_FROM_NVRAM(pa1hib2, "pa1hib1", buf);

	READ_FROM_NVRAM(pa1hib1, "pa1hib2", buf);

	READ_FROM_NVRAM2(gpio0, "ledbh0", "wl0gpio0", buf);

	READ_FROM_NVRAM2(gpio1, "ledbh1", "wl0gpio1", buf);

	READ_FROM_NVRAM2(gpio2, "ledbh2", "wl0gpio2", buf);

	READ_FROM_NVRAM2(gpio3, "ledbh3", "wl0gpio3", buf);

	READ_FROM_NVRAM2(maxpwr_bg, "maxp2ga0", "pa0maxpwr", buf);

	READ_FROM_NVRAM2(maxpwr_al, "maxp5gla0", "pa1lomaxpwr", buf);

	READ_FROM_NVRAM2(maxpwr_a, "maxp5ga0", "pa1maxpwr", buf);

	READ_FROM_NVRAM2(maxpwr_ah, "maxp5gha0", "pa1himaxpwr", buf);

	READ_FROM_NVRAM2(itssi_bg, "itt5ga0", "pa0itssit", buf);

	READ_FROM_NVRAM2(itssi_a, "itt2ga0", "pa1itssit", buf);

	READ_FROM_NVRAM(tri2g, "tri2g", buf);

	READ_FROM_NVRAM(tri5gl, "tri5gl", buf);

	READ_FROM_NVRAM(tri5g, "tri5g", buf);

	READ_FROM_NVRAM(tri5gh, "tri5gh", buf);

	READ_FROM_NVRAM(txpid2g[0], "txpid2ga0", buf);

	READ_FROM_NVRAM(txpid2g[1], "txpid2ga1", buf);

	READ_FROM_NVRAM(txpid2g[2], "txpid2ga2", buf);

	READ_FROM_NVRAM(txpid2g[3], "txpid2ga3", buf);

	READ_FROM_NVRAM(txpid5g[0], "txpid5ga0", buf);

	READ_FROM_NVRAM(txpid5g[1], "txpid5ga1", buf);

	READ_FROM_NVRAM(txpid5g[2], "txpid5ga2", buf);

	READ_FROM_NVRAM(txpid5g[3], "txpid5ga3", buf);

	READ_FROM_NVRAM(txpid5gl[0], "txpid5gla0", buf);

	READ_FROM_NVRAM(txpid5gl[1], "txpid5gla1", buf);

	READ_FROM_NVRAM(txpid5gl[2], "txpid5gla2", buf);

	READ_FROM_NVRAM(txpid5gl[3], "txpid5gla3", buf);

	READ_FROM_NVRAM(txpid5gh[0], "txpid5gha0", buf);

	READ_FROM_NVRAM(txpid5gh[1], "txpid5gha1", buf);

	READ_FROM_NVRAM(txpid5gh[2], "txpid5gha2", buf);

	READ_FROM_NVRAM(txpid5gh[3], "txpid5gha3", buf);

	READ_FROM_NVRAM(rxpo2g, "rxpo2g", buf);

	READ_FROM_NVRAM(rxpo5g, "rxpo5g", buf);

	READ_FROM_NVRAM(rssisav2g, "rssisav2g", buf);

	READ_FROM_NVRAM(rssismc2g, "rssismc2g", buf);

	READ_FROM_NVRAM(rssismf2g, "rssismf2g", buf);

	READ_FROM_NVRAM(bxa2g, "bxa2g", buf);

	READ_FROM_NVRAM(rssisav5g, "rssisav5g", buf);

	READ_FROM_NVRAM(rssismc5g, "rssismc5g", buf);

	READ_FROM_NVRAM(rssismf5g, "rssismf5g", buf);

	READ_FROM_NVRAM(bxa5g, "bxa5g", buf);

	READ_FROM_NVRAM(cck2gpo, "cck2gpo", buf);



	sprom->ofdm2gpo = nvram_getu32("ofdm2gpo", buf, sizeof(buf));

	sprom->ofdm5glpo = nvram_getu32("ofdm5glpo", buf, sizeof(buf));

	sprom->ofdm5gpo = nvram_getu32("ofdm5gpo", buf, sizeof(buf));

	sprom->ofdm5ghpo = nvram_getu32("ofdm5ghpo", buf, sizeof(buf));



	READ_FROM_NVRAM(antenna_gain.ghz24.a0, "ag0", buf);

	READ_FROM_NVRAM(antenna_gain.ghz24.a1, "ag1", buf);

	READ_FROM_NVRAM(antenna_gain.ghz24.a2, "ag2", buf);

	READ_FROM_NVRAM(antenna_gain.ghz24.a3, "ag3", buf);

	memcpy(&sprom->antenna_gain.ghz5, &sprom->antenna_gain.ghz24,

	       sizeof(sprom->antenna_gain.ghz5));



	if (nvram_getprefix(prefix, "boardflags", buf, sizeof(buf)) >= 0) {

		boardflags = simple_strtoul(buf, NULL, 0);

		if (boardflags) {

			sprom->boardflags_lo = (boardflags & 0x0000FFFFU);

			sprom->boardflags_hi = (boardflags & 0xFFFF0000U) >> 16;

		}

	}

	if (nvram_getprefix(prefix, "boardflags2", buf, sizeof(buf)) >= 0) {

		boardflags = simple_strtoul(buf, NULL, 0);

		if (boardflags) {

			sprom->boardflags2_lo = (boardflags & 0x0000FFFFU);

			sprom->boardflags2_hi = (boardflags & 0xFFFF0000U) >> 16;

		}

	}

}



int bcm47xx_get_sprom(struct ssb_bus *bus, struct ssb_sprom *out)

static int bcm47xx_get_sprom_ssb(struct ssb_bus *bus, struct ssb_sprom *out)

{

	char prefix[10];
@@ -281,7 +132,7 @@ static void __init bcm47xx_register_ssb(void) 
	char buf[100];

	struct ssb_mipscore *mcore;



	err = ssb_arch_register_fallback_sprom(&bcm47xx_get_sprom);

	err = ssb_arch_register_fallback_sprom(&bcm47xx_get_sprom_ssb);

	if (err)

		printk(KERN_WARNING "bcm47xx: someone else already registered"

			" a ssb SPROM callback handler (err %d)\n", err);
@@ -308,10 +159,41 @@ static void __init bcm47xx_register_ssb(void) 
#endif



#ifdef CONFIG_BCM47XX_BCMA

static int bcm47xx_get_sprom_bcma(struct bcma_bus *bus, struct ssb_sprom *out)

{

	char prefix[10];

	struct bcma_device *core;



	switch (bus->hosttype) {

	case BCMA_HOSTTYPE_PCI:

		snprintf(prefix, sizeof(prefix), "pci/%u/%u/",

			 bus->host_pci->bus->number + 1,

			 PCI_SLOT(bus->host_pci->devfn));

		bcm47xx_fill_sprom(out, prefix);

		return 0;

	case BCMA_HOSTTYPE_SOC:

		bcm47xx_fill_sprom_ethernet(out, NULL);

		core = bcma_find_core(bus, BCMA_CORE_80211);

		if (core) {

			snprintf(prefix, sizeof(prefix), "sb/%u/",

				 core->core_index);

			bcm47xx_fill_sprom(out, prefix);

		}

		return 0;

	default:

		pr_warn("bcm47xx: unable to fill SPROM for given bustype.\n");

		return -EINVAL;

	}

}



static void __init bcm47xx_register_bcma(void)

{

	int err;



	err = bcma_arch_register_fallback_sprom(&bcm47xx_get_sprom_bcma);

	if (err)

		pr_warn("bcm47xx: someone else already registered a bcma SPROM callback handler (err %d)\n", err);



	err = bcma_host_soc_register(&bcm47xx_bus.bcma);

	if (err)

		panic("Failed to initialize BCMA bus (err %d)", err);