Blame 0053-net-remove-NICInfo.bootable-field.patch
|
Justin M. Forbes |
73d3c2 |
From 30397a024f57f14800975bbb4312be54cc75202b Mon Sep 17 00:00:00 2001
|
|
Justin M. Forbes |
73d3c2 |
From: Eduardo Habkost <ehabkost@redhat.com>
|
|
Justin M. Forbes |
73d3c2 |
Date: Tue, 6 Apr 2010 19:38:51 -0300
|
|
Justin M. Forbes |
73d3c2 |
Subject: [PATCH] net: remove NICInfo.bootable field
|
|
Justin M. Forbes |
73d3c2 |
|
|
Justin M. Forbes |
73d3c2 |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=561078
|
|
Justin M. Forbes |
73d3c2 |
|
|
Justin M. Forbes |
73d3c2 |
It is just set by net_set_boot_mask() and never used. The logic for rom loading
|
|
Justin M. Forbes |
73d3c2 |
changed a lot since this field was introduced. It is not needed anymore.
|
|
Justin M. Forbes |
73d3c2 |
|
|
Justin M. Forbes |
73d3c2 |
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
Justin M. Forbes |
73d3c2 |
---
|
|
Justin M. Forbes |
73d3c2 |
net.c | 1 -
|
|
Justin M. Forbes |
73d3c2 |
net.h | 1 -
|
|
Justin M. Forbes |
73d3c2 |
2 files changed, 0 insertions(+), 2 deletions(-)
|
|
Justin M. Forbes |
73d3c2 |
|
|
Justin M. Forbes |
73d3c2 |
diff --git a/net.c b/net.c
|
|
Justin M. Forbes |
73d3c2 |
index de7d626..5cebb1a 100644
|
|
Justin M. Forbes |
73d3c2 |
--- a/net.c
|
|
Justin M. Forbes |
73d3c2 |
+++ b/net.c
|
|
Justin M. Forbes |
73d3c2 |
@@ -1204,7 +1204,6 @@ void net_set_boot_mask(int net_boot_mask)
|
|
Justin M. Forbes |
73d3c2 |
|
|
Justin M. Forbes |
73d3c2 |
for (i = 0; i < nb_nics; i++) {
|
|
Justin M. Forbes |
73d3c2 |
if (net_boot_mask & (1 << i)) {
|
|
Justin M. Forbes |
73d3c2 |
- nd_table[i].bootable = 1;
|
|
Justin M. Forbes |
73d3c2 |
net_boot_mask &= ~(1 << i);
|
|
Justin M. Forbes |
73d3c2 |
}
|
|
Justin M. Forbes |
73d3c2 |
}
|
|
Justin M. Forbes |
73d3c2 |
diff --git a/net.h b/net.h
|
|
Justin M. Forbes |
73d3c2 |
index 33a1eaf..5b6e814 100644
|
|
Justin M. Forbes |
73d3c2 |
--- a/net.h
|
|
Justin M. Forbes |
73d3c2 |
+++ b/net.h
|
|
Justin M. Forbes |
73d3c2 |
@@ -135,7 +135,6 @@ struct NICInfo {
|
|
Justin M. Forbes |
73d3c2 |
VLANState *vlan;
|
|
Justin M. Forbes |
73d3c2 |
VLANClientState *netdev;
|
|
Justin M. Forbes |
73d3c2 |
int used;
|
|
Justin M. Forbes |
73d3c2 |
- int bootable;
|
|
Justin M. Forbes |
73d3c2 |
int nvectors;
|
|
Justin M. Forbes |
73d3c2 |
};
|
|
Justin M. Forbes |
73d3c2 |
|
|
Justin M. Forbes |
73d3c2 |
--
|
|
Justin M. Forbes |
73d3c2 |
1.6.6.1
|
|
Justin M. Forbes |
73d3c2 |
|