parent
ed8902d686
commit
a5abb08100
@ -1,25 +0,0 @@ |
||||
From f453c08359a875df66cbbda48087e3592c29da58 Mon Sep 17 00:00:00 2001
|
||||
From: Hauke Mehrtens <hauke@hauke-m.de>
|
||||
Date: Sat, 18 Feb 2012 16:23:58 +0100
|
||||
Subject: [PATCH 191/202] ssb: fix per path sprom vars
|
||||
|
||||
On sprom version 4 and 5 there are 4 values for pa_2g, pa_5gl, pa_5g
|
||||
and pa_5gh, for sprom version 8 and 9 there are only 3. Make the per
|
||||
path sprom store also work for older sprom versions.
|
||||
|
||||
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
|
||||
---
|
||||
include/linux/ssb/ssb.h | 2 +-
|
||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||
|
||||
--- a/include/linux/ssb/ssb.h
|
||||
+++ b/include/linux/ssb/ssb.h
|
||||
@@ -19,7 +19,7 @@ struct ssb_driver;
|
||||
struct ssb_sprom_core_pwr_info {
|
||||
u8 itssi_2g, itssi_5g;
|
||||
u8 maxpwr_2g, maxpwr_5gl, maxpwr_5g, maxpwr_5gh;
|
||||
- u16 pa_2g[3], pa_5gl[3], pa_5g[3], pa_5gh[3];
|
||||
+ u16 pa_2g[4], pa_5gl[4], pa_5g[4], pa_5gh[4];
|
||||
};
|
||||
|
||||
struct ssb_sprom {
|
@ -1,22 +0,0 @@ |
||||
From b0a2a5c4a88f5d83046b408714ec9b86772fa75d Mon Sep 17 00:00:00 2001
|
||||
From: Hauke Mehrtens <hauke@hauke-m.de>
|
||||
Date: Sat, 18 Feb 2012 17:16:28 +0100
|
||||
Subject: [PATCH 192/202] ssb: add ccode
|
||||
|
||||
This member contains the country code encoded with two chars
|
||||
|
||||
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
|
||||
---
|
||||
include/linux/ssb/ssb.h | 1 +
|
||||
1 files changed, 1 insertions(+), 0 deletions(-)
|
||||
|
||||
--- a/include/linux/ssb/ssb.h
|
||||
+++ b/include/linux/ssb/ssb.h
|
||||
@@ -35,6 +35,7 @@ struct ssb_sprom {
|
||||
u8 country_code; /* Country Code */
|
||||
u8 leddc_on_time; /* LED Powersave Duty Cycle On Count */
|
||||
u8 leddc_off_time; /* LED Powersave Duty Cycle Off Count */
|
||||
+ char ccode[2];
|
||||
u8 ant_available_a; /* 2GHz antenna available bits (up to 4) */
|
||||
u8 ant_available_bg; /* 5GHz antenna available bits (up to 4) */
|
||||
u16 pa0b0;
|
@ -0,0 +1,11 @@ |
||||
--- a/include/linux/ssb/ssb.h
|
||||
+++ b/include/linux/ssb/ssb.h
|
||||
@@ -19,7 +19,7 @@ struct ssb_driver;
|
||||
struct ssb_sprom_core_pwr_info {
|
||||
u8 itssi_2g, itssi_5g;
|
||||
u8 maxpwr_2g, maxpwr_5gl, maxpwr_5g, maxpwr_5gh;
|
||||
- u16 pa_2g[3], pa_5gl[3], pa_5g[3], pa_5gh[3];
|
||||
+ u16 pa_2g[4], pa_5gl[4], pa_5g[4], pa_5gh[4];
|
||||
};
|
||||
|
||||
struct ssb_sprom {
|
@ -0,0 +1,10 @@ |
||||
--- a/include/linux/ssb/ssb.h
|
||||
+++ b/include/linux/ssb/ssb.h
|
||||
@@ -33,6 +33,7 @@ struct ssb_sprom {
|
||||
u8 et1mdcport; /* MDIO for enet1 */
|
||||
u16 board_rev; /* Board revision number from SPROM. */
|
||||
u8 country_code; /* Country Code */
|
||||
+ char alpha2[2]; /* Country Code as two chars like EU or US */
|
||||
u8 leddc_on_time; /* LED Powersave Duty Cycle On Count */
|
||||
u8 leddc_off_time; /* LED Powersave Duty Cycle Off Count */
|
||||
u8 ant_available_a; /* 2GHz antenna available bits (up to 4) */
|
@ -1,16 +1,3 @@ |
||||
From a07c69ed06031373726e9e5e513d0d942997c265 Mon Sep 17 00:00:00 2001
|
||||
From: Hauke Mehrtens <hauke@hauke-m.de>
|
||||
Date: Sat, 18 Feb 2012 14:22:32 +0100
|
||||
Subject: [PATCH 194/202] bcma: export bcma_find_core
|
||||
|
||||
This function is needed by the bcm47xx arch code to get the number of
|
||||
the ieee80211 core.
|
||||
|
||||
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
|
||||
---
|
||||
drivers/bcma/main.c | 3 ++-
|
||||
include/linux/bcma/bcma.h | 1 +
|
||||
2 files changed, 3 insertions(+), 1 deletions(-)
|
||||
|
||||
--- a/drivers/bcma/main.c
|
||||
+++ b/drivers/bcma/main.c
|
@ -1,24 +0,0 @@ |
||||
From 3ac18c5072e097ffa719994ef3b5c64e744a5405 Mon Sep 17 00:00:00 2001
|
||||
From: Hauke Mehrtens <hauke@hauke-m.de>
|
||||
Date: Sat, 18 Feb 2012 14:46:45 +0100
|
||||
Subject: [PATCH 196/202] MIPS: BCM47XX: return number of written bytes in
|
||||
nvram_getenv
|
||||
|
||||
|
||||
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
|
||||
---
|
||||
arch/mips/bcm47xx/nvram.c | 3 +--
|
||||
1 files changed, 1 insertions(+), 2 deletions(-)
|
||||
|
||||
--- a/arch/mips/bcm47xx/nvram.c
|
||||
+++ b/arch/mips/bcm47xx/nvram.c
|
||||
@@ -243,8 +243,7 @@ int nvram_getenv(char *name, char *val,
|
||||
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;
|
@ -1,23 +0,0 @@ |
||||
From c330338212785092aab7a266f24b52c132775463 Mon Sep 17 00:00:00 2001
|
||||
From: Hauke Mehrtens <hauke@hauke-m.de>
|
||||
Date: Sat, 18 Feb 2012 15:00:36 +0100
|
||||
Subject: [PATCH 197/202] MIPS: BCM47XX: fix signature of nvram_parse_macaddr
|
||||
|
||||
Explicitly enforce an char array of 6 bytes for the mac address.
|
||||
|
||||
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
|
||||
---
|
||||
arch/mips/include/asm/mach-bcm47xx/nvram.h | 2 +-
|
||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||
|
||||
--- a/arch/mips/include/asm/mach-bcm47xx/nvram.h
|
||||
+++ b/arch/mips/include/asm/mach-bcm47xx/nvram.h
|
||||
@@ -37,7 +37,7 @@ struct nvram_header {
|
||||
|
||||
extern int nvram_getenv(char *name, char *val, size_t val_len);
|
||||
|
||||
-static inline void nvram_parse_macaddr(char *buf, u8 *macaddr)
|
||||
+static inline void nvram_parse_macaddr(char *buf, u8 macaddr[6])
|
||||
{
|
||||
if (strchr(buf, ':'))
|
||||
sscanf(buf, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx", &macaddr[0],
|
@ -0,0 +1,13 @@ |
||||
|
||||
--- a/arch/mips/bcm47xx/nvram.c
|
||||
+++ b/arch/mips/bcm47xx/nvram.c
|
||||
@@ -243,8 +243,7 @@ int nvram_getenv(char *name, char *val,
|
||||
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;
|
@ -0,0 +1,12 @@ |
||||
|
||||
--- a/arch/mips/include/asm/mach-bcm47xx/nvram.h
|
||||
+++ b/arch/mips/include/asm/mach-bcm47xx/nvram.h
|
||||
@@ -37,7 +37,7 @@ struct nvram_header {
|
||||
|
||||
extern int nvram_getenv(char *name, char *val, size_t val_len);
|
||||
|
||||
-static inline void nvram_parse_macaddr(char *buf, u8 *macaddr)
|
||||
+static inline void nvram_parse_macaddr(char *buf, u8 macaddr[6])
|
||||
{
|
||||
if (strchr(buf, ':'))
|
||||
sscanf(buf, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx", &macaddr[0],
|
Loading…
Reference in new issue