X-Git-Url: https://git.tld-linux.org/?p=packages%2Fgrub2.git;a=blobdiff_plain;f=add-vlan-tag-support.patch;h=42fde72d5470789780ded2d09ce4a4d738973db1;hp=be01c58aef24f7ff7046078ff58fca5ab719de06;hb=f95a1ca1ec8ddd7b01b033fd552bc7619faed11e;hpb=874c4add0aa91b4d5d5a6665790c95d9f8757d81

diff --git a/add-vlan-tag-support.patch b/add-vlan-tag-support.patch
index be01c58..42fde72 100644
--- a/add-vlan-tag-support.patch
+++ b/add-vlan-tag-support.patch
@@ -1,29 +1,7 @@
-From 5573f16fd05c1f8f310f2ead176b52ed6d4a08ec Mon Sep 17 00:00:00 2001
-From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
-Date: Tue, 30 Oct 2012 15:19:39 -0200
-Subject: [PATCH] Add vlan-tag support
-
-This patch adds support for virtual LAN (VLAN) tagging. VLAN tagging allows
-multiple VLANs in a bridged network to share the same physical network link but
-maintain isolation:
-
-http://en.wikipedia.org/wiki/IEEE_802.1Q
-
-This patch should fix this bugzilla:
-https://bugzilla.redhat.com/show_bug.cgi?id=871563
----
- grub-core/kern/ieee1275/init.c   |    1 +
- grub-core/kern/ieee1275/openfw.c |   30 +++++++++++++++++++++++++++
- grub-core/net/ethernet.c         |   42 +++++++++++++++++++++++++++++++++++---
- include/grub/ieee1275/ieee1275.h |    1 +
- include/grub/net.h               |    2 ++
- 5 files changed, 73 insertions(+), 3 deletions(-)
-
-diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c
-index 5c45947..209cf8a 100644
---- a/grub-core/kern/ieee1275/init.c
-+++ b/grub-core/kern/ieee1275/init.c
-@@ -102,6 +102,7 @@ grub_machine_get_bootlocation (char **device, char **path)
+diff -urNp grub-2.02-rc1.orig/grub-core/kern/ieee1275/init.c grub-2.02-rc1/grub-core/kern/ieee1275/init.c
+--- grub-2.02-rc1.orig/grub-core/kern/ieee1275/init.c	2017-02-08 15:06:05.420317447 +0000
++++ grub-2.02-rc1/grub-core/kern/ieee1275/init.c	2017-02-08 15:06:17.784317308 +0000
+@@ -125,6 +125,7 @@ grub_machine_get_bootlocation (char **de
        char *dev, *canon;
        char *ptr;
        dev = grub_ieee1275_get_aliasdevname (bootpath);
@@ -31,10 +9,9 @@ index 5c45947..209cf8a 100644
        canon = grub_ieee1275_canonicalise_devname (dev);
        ptr = canon + grub_strlen (canon) - 1;
        while (ptr > canon && (*ptr == ',' || *ptr == ':'))
-diff --git a/grub-core/kern/ieee1275/openfw.c b/grub-core/kern/ieee1275/openfw.c
-index c2b1bdf..9fdfafa 100644
---- a/grub-core/kern/ieee1275/openfw.c
-+++ b/grub-core/kern/ieee1275/openfw.c
+diff -urNp grub-2.02-rc1.orig/grub-core/kern/ieee1275/openfw.c grub-2.02-rc1/grub-core/kern/ieee1275/openfw.c
+--- grub-2.02-rc1.orig/grub-core/kern/ieee1275/openfw.c	2017-02-08 15:06:05.420317447 +0000
++++ grub-2.02-rc1/grub-core/kern/ieee1275/openfw.c	2017-02-08 15:06:17.785317308 +0000
 @@ -23,6 +23,7 @@
  #include <grub/mm.h>
  #include <grub/ieee1275/ieee1275.h>
@@ -43,7 +20,7 @@ index c2b1bdf..9fdfafa 100644
  
  enum grub_ieee1275_parse_type
  {
-@@ -413,6 +414,35 @@ fail:
+@@ -451,6 +452,35 @@ fail:
    return ret;
  }
  
@@ -79,10 +56,9 @@ index c2b1bdf..9fdfafa 100644
  char *
  grub_ieee1275_get_device_type (const char *path)
  {
-diff --git a/grub-core/net/ethernet.c b/grub-core/net/ethernet.c
-index b38e2c8..5e45d46 100644
---- a/grub-core/net/ethernet.c
-+++ b/grub-core/net/ethernet.c
+diff -urNp grub-2.02-rc1.orig/grub-core/net/ethernet.c grub-2.02-rc1/grub-core/net/ethernet.c
+--- grub-2.02-rc1.orig/grub-core/net/ethernet.c	2017-02-08 15:06:05.433317447 +0000
++++ grub-2.02-rc1/grub-core/net/ethernet.c	2017-02-08 15:06:17.785317308 +0000
 @@ -23,6 +23,7 @@
  #include <grub/net/arp.h>
  #include <grub/net/netbuff.h>
@@ -91,7 +67,7 @@ index b38e2c8..5e45d46 100644
  #include <grub/time.h>
  #include <grub/net/arp.h>
  
-@@ -56,10 +57,19 @@ send_ethernet_packet (struct grub_net_network_level_interface *inf,
+@@ -56,10 +57,19 @@ send_ethernet_packet (struct grub_net_ne
  {
    struct etherhdr *eth;
    grub_err_t err;
@@ -113,7 +89,7 @@ index b38e2c8..5e45d46 100644
    if (err)
      return err;
    eth = (struct etherhdr *) nb->data;
-@@ -76,6 +86,19 @@ send_ethernet_packet (struct grub_net_network_level_interface *inf,
+@@ -76,6 +86,19 @@ send_ethernet_packet (struct grub_net_ne
  	return err;
        inf->card->opened = 1;
      }
@@ -133,7 +109,7 @@ index b38e2c8..5e45d46 100644
    return inf->card->driver->send (inf->card, nb);
  }
  
-@@ -90,10 +113,23 @@ grub_net_recv_ethernet_packet (struct grub_net_buff *nb,
+@@ -90,10 +113,23 @@ grub_net_recv_ethernet_packet (struct gr
    grub_net_link_level_address_t hwaddress;
    grub_net_link_level_address_t src_hwaddress;
    grub_err_t err;
@@ -158,28 +134,24 @@ index b38e2c8..5e45d46 100644
    if (err)
      return err;
  
-diff --git a/include/grub/ieee1275/ieee1275.h b/include/grub/ieee1275/ieee1275.h
-index 416a544..a8cf093 100644
---- a/include/grub/ieee1275/ieee1275.h
-+++ b/include/grub/ieee1275/ieee1275.h
-@@ -210,5 +210,6 @@ char *EXPORT_FUNC(grub_ieee1275_canonicalise_devname) (const char *path);
- char *EXPORT_FUNC(grub_ieee1275_get_aliasdevname) (const char *path);
+diff -urNp grub-2.02-rc1.orig/include/grub/ieee1275/ieee1275.h grub-2.02-rc1/include/grub/ieee1275/ieee1275.h
+--- grub-2.02-rc1.orig/include/grub/ieee1275/ieee1275.h	2017-02-08 15:06:05.445317447 +0000
++++ grub-2.02-rc1/include/grub/ieee1275/ieee1275.h	2017-02-08 15:06:17.787317308 +0000
+@@ -227,6 +227,7 @@ char *EXPORT_FUNC(grub_ieee1275_get_alia
  char *EXPORT_FUNC(grub_ieee1275_canonicalise_devname) (const char *path);
  char *EXPORT_FUNC(grub_ieee1275_get_device_type) (const char *path);
+ char *EXPORT_FUNC(grub_ieee1275_get_devname) (const char *path);
 +int EXPORT_FUNC(grub_ieee1275_parse_net_options) (const char *path);
  
- #endif /* ! GRUB_IEEE1275_HEADER */
-diff --git a/include/grub/net.h b/include/grub/net.h
-index a7e5b2c..f4fec17 100644
---- a/include/grub/net.h
-+++ b/include/grub/net.h
-@@ -532,4 +532,6 @@ extern char *grub_net_default_server;
- #define GRUB_NET_TRIES 40
+ void EXPORT_FUNC(grub_ieee1275_devalias_init_iterator) (struct grub_ieee1275_devalias *alias);
+ void EXPORT_FUNC(grub_ieee1275_devalias_free) (struct grub_ieee1275_devalias *alias);
+diff -urNp grub-2.02-rc1.orig/include/grub/net.h grub-2.02-rc1/include/grub/net.h
+--- grub-2.02-rc1.orig/include/grub/net.h	2017-02-08 15:06:05.446317447 +0000
++++ grub-2.02-rc1/include/grub/net.h	2017-02-08 15:06:17.788317308 +0000
+@@ -561,4 +561,6 @@ extern char *grub_net_default_server;
  #define GRUB_NET_INTERVAL 400
+ #define GRUB_NET_INTERVAL_ADDITION 20
  
 +#define VLANTAG_IDENTIFIER 0x8100
 +
  #endif /* ! GRUB_NET_HEADER */
--- 
-1.7.10.4
-