From patchwork Thu Aug 9 14:51:18 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Santiago Leon X-Patchwork-Id: 176139 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (localhost [IPv6:::1]) by ozlabs.org (Postfix) with ESMTP id 33A262C00FB for ; Fri, 10 Aug 2012 00:51:26 +1000 (EST) Received: from uio2.ecua.net.ec (netmon2.ecnet.ec [157.100.45.15]) by ozlabs.org (Postfix) with ESMTP id 74CFE2C00CA for ; Fri, 10 Aug 2012 00:51:22 +1000 (EST) Received: from [192.168.2.100] (unknown [186.4.150.131]) by uio2.ecua.net.ec (Postfix) with ESMTP id B57E0104444 for ; Thu, 9 Aug 2012 09:58:00 -0500 (ECT) Message-ID: <5023CE66.3050209@linux.vnet.ibm.com> Date: Thu, 09 Aug 2012 09:51:18 -0500 From: Santiago Leon User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.1.9) Gecko/20100430 Fedora/3.0.4-2.fc11 Thunderbird/3.0.4 MIME-Version: 1.0 To: yaboot-devel@lists.ozlabs.org Subject: [PATCH-Resend] Support for VLAN tags X-BeenThere: yaboot-devel@lists.ozlabs.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Technical and development discussion regarding yaboot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: yaboot-devel-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Yaboot-devel" Inlining previously posted patch Adds support for booting from an IPv4 or IPv6 network with a VLAN tag. Signed-off-by: Santiago Leon diff -urNp a/include/file.h b/include/file.h --- a/include/file.h 2011-10-18 00:11:10.000000000 -0400 +++ b/include/file.h 2012-07-03 16:39:10.119814624 -0400 @@ -47,6 +47,7 @@ struct boot_fspec_t { char* tftp_retries; /* TFTP retries */ char* subnetmask; /* Subnet mask */ char* addl_params; /* copy all additional parameters */ + char* vtag; /* VLAN tag */ /* Following fields are used only in ipv6 format */ int is_ipv6; /* is ipv6 specified ? */ diff -urNp a/Makefile b/Makefile diff -urNp a/second/file.c b/second/file.c --- a/second/file.c 2011-10-18 00:11:10.000000000 -0400 +++ b/second/file.c 2012-07-18 22:28:57.529814947 -0400 @@ -163,9 +163,12 @@ extract_ipv4_args(char *imagepath, struc args++; /* If comma(,) is not immediately followed by ':' then go past the , */ /* - * read the arguments in order: siaddr,filename,ciaddr,giaddr, + * read the arguments in order: vtag,siaddr,filename,ciaddr,giaddr, * bootp-retries,tftp-retries,addl_prameters */ + if ((tmp = strstr(imagepath, "vtag=")) != NULL) + result->vtag = scopy(&str, &tmp); + result->siaddr = is_valid_ipv4_str(scopy(&str, &args)); result->file = scopy(&str, &args); result->ciaddr = is_valid_ipv4_str(scopy(&str, &args)); @@ -331,6 +334,9 @@ extract_ipv6_args(char *imagepath, struc if ((tmp = strstr(imagepath, "dhcpv6=")) != NULL) result->dhcpv6 = scopy(&str, &tmp); + if ((tmp = strstr(imagepath, "vtag=")) != NULL) + result->vtag = scopy(&str, &tmp); + if ((tmp = strstr(imagepath, "ciaddr=")) != NULL) result->ciaddr = scopy(&str, &tmp); diff -urNp a/second/fs_of.c b/second/fs_of.c --- a/second/fs_of.c 2011-10-18 00:11:10.000000000 -0400 +++ b/second/fs_of.c 2012-07-18 20:46:10.619815172 -0400 @@ -152,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 */ @@ -169,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, ",");