Support for VLAN tags

[yaboot.git] / second / fs_of.c

diff --git a/second/fs_of.c b/second/fs_of.c
index 5961cfecd57a09b45702444f7628382541427aed..3a8819c4b83f82c9342848712edb7fd5f311ec49 100644 (file)
--- a/second/fs_of.c
+++ b/second/fs_of.c
@@ -44,7 +44,6 @@
 #include "errors.h"
 #include "debug.h"
 
-#define LOAD_BUFFER_POS                0x1000000
 #define LOAD_BUFFER_SIZE       0x1800000
 
 static int of_open(struct boot_file_t* file,
@@ -153,9 +152,9 @@ of_net_open(struct boot_file_t* file,
      }
 
      DEBUG_F("siaddr <%s>; filename <%s>; ciaddr <%s>; giaddr <%s>;"
-             " ipv6 <%d>\n",
+             " ipv6 <%d>; vtag <%s>\n",
              fspec->siaddr, filename, fspec->ciaddr, fspec->giaddr,
-             fspec->is_ipv6);
+             fspec->is_ipv6, fspec->vtag);
 
      strncpy(buffer, fspec->dev, 768);
      /* If we didn't get a ':' include one */
@@ -170,6 +169,13 @@ of_net_open(struct boot_file_t* file,
      DEBUG_F("Using %s tftp style\n", (new_tftp? "new": "old"));
 
      if (new_tftp) {
+          if (fspec->is_ipv6)
+              strcat(buffer, "ipv6,");
+
+          if (fspec->vtag) {
+              strcat(buffer, fspec->vtag);
+              strcat(buffer, ",");
+         }
           strcat(buffer, fspec->siaddr);
           strcat(buffer, ",");
 
@@ -208,8 +214,7 @@ of_net_open(struct boot_file_t* file,
      }
 
 
-     file->buffer = prom_claim_chunk((void *)LOAD_BUFFER_POS,
-                                     LOAD_BUFFER_SIZE, 0);
+     file->buffer = prom_claim_chunk_top(LOAD_BUFFER_SIZE, 0);
      if (file->buffer == (void *)-1) {
          prom_printf("Can't claim memory for TFTP download\n");
          prom_close(file->of_device);