target/linux: sync kernel patches to 2.6.37-rc3

[openwrt.git] / target / linux / ixp4xx / patches-2.6.32 / 300-avila_fetch_mac.patch

diff --git a/target/linux/ixp4xx/patches-2.6.32/300-avila_fetch_mac.patch b/target/linux/ixp4xx/patches-2.6.32/300-avila_fetch_mac.patch
index ca8cae1..d3ccb04 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.32/300-avila_fetch_mac.patch
+++ b/target/linux/ixp4xx/patches-2.6.32/300-avila_fetch_mac.patch
@@ -147,6 +147,7 @@
 +static struct avila_board_info * __init avila_find_board_info(char *model)
 +{
 +      int i;
 +static struct avila_board_info * __init avila_find_board_info(char *model)
 +{
 +      int i;

++      model[6] = '\0';

 +
 +      for (i = 0; i < ARRAY_SIZE(avila_boards); i++) {
 +              struct avila_board_info *info = &avila_boards[i];
 +
 +      for (i = 0; i < ARRAY_SIZE(avila_boards); i++) {
 +              struct avila_board_info *info = &avila_boards[i];


@@ -159,10 +160,10 @@
 +
 +static struct memory_accessor *at24_mem_acc;
 +
 +
 +static struct memory_accessor *at24_mem_acc;
 +

-+static int 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;
 +


@@ -179,7 +180,6 @@
 +              avila_info = avila_find_board_info(model);
 +      }
 +
 +              avila_info = avila_find_board_info(model);
 +      }
 +

-+      return 0;

 +}
 +
 +static struct at24_platform_data avila_eeprom_info = {
 +}
 +
 +static struct at24_platform_data avila_eeprom_info = {