X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=vswitchd%2Fproc-net-compat.c;h=68ae1ac817ac019f9a8618cf0c3807c8c671eaec;hb=6dee2066b5edaa9b5c7af572d075591ad595428d;hp=3f5cf44adb5eb9e72416a5420cd46770587c161a;hpb=064af42167bf4fc9aaea2702d80ce08074b889c0;p=openvswitch
diff --git a/vswitchd/proc-net-compat.c b/vswitchd/proc-net-compat.c
index 3f5cf44a..68ae1ac8 100644
--- a/vswitchd/proc-net-compat.c
+++ b/vswitchd/proc-net-compat.c
@@ -1,18 +1,16 @@
/* Copyright (c) 2009 Nicira Networks
*
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * http://www.apache.org/licenses/LICENSE-2.0
*
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
#include
@@ -156,6 +154,12 @@ proc_net_compat_update_bond(const char *name, const struct compat_bond *bond)
"\n"
"Source load balancing info:\n",
bond->up ? "up" : "down", bond->updelay, bond->downdelay);
+
+ for (i = 0; i < bond->n_hashes; i++) {
+ const struct compat_bond_hash *cbh = &bond->hashes[i];
+ ds_put_format(&ds, " [%03d] = %s\n", cbh->hash, cbh->netdev_name);
+ }
+
for (i = 0; i < bond->n_slaves; i++) {
const struct compat_bond_slave *slave = &bond->slaves[i];
ds_put_format(
@@ -252,7 +256,7 @@ proc_net_compat_update_vlan(const char *tagged_dev, const char *trunk_dev,
}
if (!vlan) {
/* Create a new compat_vlan for (trunk_dev,vid). */
- vlan = xcalloc(1, sizeof *vlan);
+ vlan = xzalloc(sizeof *vlan);
vlan->trunk_dev = xstrdup(trunk_dev);
vlan->vid = vid;
vlan->vlan_dev = xasprintf("%s.%d", trunk_dev, vid);