KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fixup cambria/avila model detection

Browse source 
SVN-Revision: 19448
This commit is contained in:
Imre Kaloz 2010-01-31 13:46:52 +00:00
parent 0d5e3e1c45
commit c07bd86175
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
target/linux/ixp4xx/patches-2.6.32/190-cambria_support.patch
View file

@ -398,6 +398,7 @@
+static struct cambria_board_info * __init cambria_find_board_info(char *model) +static struct cambria_board_info * __init cambria_find_board_info(char *model)
+{ +{
+ int i; + int i;
+ model[6] = '\0';
+ +
+ for (i = 0; i < ARRAY_SIZE(cambria_boards); i++) { + for (i = 0; i < ARRAY_SIZE(cambria_boards); i++) {
+ struct cambria_board_info *info = &cambria_boards[i]; + struct cambria_board_info *info = &cambria_boards[i];
@ -413,7 +414,7 @@
+static void at24_setup(struct memory_accessor *mem_acc, void *context) +static void at24_setup(struct memory_accessor *mem_acc, void *context)
+{ +{
+ char mac_addr[ETH_ALEN]; + char mac_addr[ETH_ALEN];
+ char model[6]; + char model[7];
+ +
+ at24_mem_acc = mem_acc; + at24_mem_acc = mem_acc;
+ +
@ -421,7 +422,6 @@
+ if (at24_mem_acc->read(at24_mem_acc, mac_addr, 0x0, 6) == 6) { + if (at24_mem_acc->read(at24_mem_acc, mac_addr, 0x0, 6) == 6) {
+ memcpy(&cambria_npec_data.hwaddr, mac_addr, ETH_ALEN); + memcpy(&cambria_npec_data.hwaddr, mac_addr, ETH_ALEN);
+ } + }
+
+ if (at24_mem_acc->read(at24_mem_acc, mac_addr, 0x6, 6) == 6) { + if (at24_mem_acc->read(at24_mem_acc, mac_addr, 0x6, 6) == 6) {
+ memcpy(&cambria_npea_data.hwaddr, mac_addr, ETH_ALEN); + memcpy(&cambria_npea_data.hwaddr, mac_addr, ETH_ALEN);
+ } + }

4
target/linux/ixp4xx/patches-2.6.32/300-avila_fetch_mac.patch
View file

@ -147,6 +147,7 @@
+static struct avila_board_info * __init avila_find_board_info(char *model) +static struct avila_board_info * __init avila_find_board_info(char *model)
+{ +{
+ int i; + int i;
+ model[6] = '\0';
+ +
+ for (i = 0; i < ARRAY_SIZE(avila_boards); i++) { + for (i = 0; i < ARRAY_SIZE(avila_boards); i++) {
+ struct avila_board_info *info = &avila_boards[i]; + struct avila_board_info *info = &avila_boards[i];
@ -162,7 +163,7 @@
+static void at24_setup(struct memory_accessor *mem_acc, void *context) +static void at24_setup(struct memory_accessor *mem_acc, void *context)
+{ +{
+ char mac_addr[ETH_ALEN]; + char mac_addr[ETH_ALEN];
+ char model[6]; + char model[7];
+ +
+ at24_mem_acc = mem_acc; + at24_mem_acc = mem_acc;
+ +
@ -170,7 +171,6 @@
+ if (at24_mem_acc->read(at24_mem_acc, mac_addr, 0x0, 6) == 6) { + if (at24_mem_acc->read(at24_mem_acc, mac_addr, 0x0, 6) == 6) {
+ memcpy(&avila_npeb_data.hwaddr, mac_addr, ETH_ALEN); + memcpy(&avila_npeb_data.hwaddr, mac_addr, ETH_ALEN);
+ } + }
+
+ if (at24_mem_acc->read(at24_mem_acc, mac_addr, 0x6, 6) == 6) { + if (at24_mem_acc->read(at24_mem_acc, mac_addr, 0x6, 6) == 6) {
+ memcpy(&avila_npec_data.hwaddr, mac_addr, ETH_ALEN); + memcpy(&avila_npec_data.hwaddr, mac_addr, ETH_ALEN);
+ } + }