X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=vswitchd%2Fproc-net-compat.h;h=82d550f5c1b6796e1e2c88316289be0011744268;hb=f48667811c04d848dc345aa0bbda29d889b5f960;hp=ce97176bc91fa52ef13bda1fa76229d2e0accb1d;hpb=064af42167bf4fc9aaea2702d80ce08074b889c0;p=openvswitch diff --git a/vswitchd/proc-net-compat.h b/vswitchd/proc-net-compat.h index ce97176b..82d550f5 100644 --- a/vswitchd/proc-net-compat.h +++ b/vswitchd/proc-net-compat.h @@ -1,27 +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. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - * In addition, as a special exception, Nicira Networks gives permission - * to link the code of its release of vswitchd with the OpenSSL project's - * "OpenSSL" library (or with modified versions of it that use the same - * license as the "OpenSSL" library), and distribute the linked - * executables. You must obey the GNU General Public License in all - * respects for all of the code used other than "OpenSSL". If you modify - * this file, you may extend this exception to your version of the file, - * but you are not obligated to do so. If you do not wish to do so, - * delete this exception statement from your version. + * 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. */ #ifndef VSWITCHD_PROC_NET_COMPAT_H @@ -33,10 +22,19 @@ struct compat_bond { bool up; int updelay; int downdelay; + + int n_hashes; + struct compat_bond_hash *hashes; + int n_slaves; struct compat_bond_slave *slaves; }; +struct compat_bond_hash { + int hash; + const char *netdev_name; +}; + struct compat_bond_slave { const char *name; bool up;