diff options
| author | Ben Pfaff <blp@nicira.com> | 2009-06-15 15:11:30 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2009-06-15 15:11:30 -0700 |
| commit | a14bc59fb8f27db193d74662dc9c5cb8237177ef (patch) | |
| tree | 69fabab70edea6c66fdf2dded34d21526c898fed /third-party | |
| parent | e2ead27a7244d61e7f0f71f733f76118056f8981 (diff) | |
| download | openvswitch-a14bc59fb8f27db193d74662dc9c5cb8237177ef.tar.gz | |
Update primary code license to Apache 2.0.
Diffstat (limited to 'third-party')
| -rw-r--r-- | third-party/ofp-tcpdump.patch | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/third-party/ofp-tcpdump.patch b/third-party/ofp-tcpdump.patch index d9a23cb1e..3b4144ac8 100644 --- a/third-party/ofp-tcpdump.patch +++ b/third-party/ofp-tcpdump.patch @@ -45,20 +45,26 @@ GENSRC = version.c --- tcpdump/print-openflow.c 1969-12-31 16:00:00.000000000 -0800 +++ tcpdump/print-openflow.c 2009-05-11 15:38:41.000000000 -0700 -@@ -0,0 +1,40 @@ +@@ -0,0 +1,46 @@ +/* Copyright (C) 2007, 2008, 2009 Nicira Networks. -+ * -+ * Permission to use, copy, modify, and/or distribute this software for any -+ * purpose with or without fee is hereby granted, provided that the above -+ * copyright notice and this permission notice appear in all copies. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ++ ++ Redistribution and use in source and binary forms, with or without ++ modification, are permitted provided that the following conditions ++ are met: ++ ++ 1. Redistributions of source code must retain the above copyright ++ notice, this list of conditions and the following disclaimer. ++ 2. Redistributions in binary form must reproduce the above copyright ++ notice, this list of conditions and the following disclaimer in ++ the documentation and/or other materials provided with the ++ distribution. ++ 3. The names of the authors may not be used to endorse or promote ++ products derived from this software without specific prior ++ written permission. ++ ++ THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR ++ IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED ++ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. + */ + * + |