aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXin LI <delphij@FreeBSD.org>2017-02-15 07:19:23 +0000
committerXin LI <delphij@FreeBSD.org>2017-02-15 07:19:23 +0000
commit5ca946f041e6241d5cf55541828970a621f3e349 (patch)
tree8ba5263ddadb267e4a467630123210cf747a5ce0
parentc8c6d70e300aa9261c4766502c179fc4cd2b22a0 (diff)
downloadsrc-5ca946f041e6241d5cf55541828970a621f3e349.tar.gz
src-5ca946f041e6241d5cf55541828970a621f3e349.zip
Import license changes from upstream 5c5039637f2be0e3167ff6806b4c2741ebab2181.
Notes
Notes: svn path=/vendor/libpcap/dist/; revision=313759
-rw-r--r--pcap/bpf.h6
-rw-r--r--pcap/dlt.h6
2 files changed, 2 insertions, 10 deletions
diff --git a/pcap/bpf.h b/pcap/bpf.h
index 78ad8905d02d..1a63d603008c 100644
--- a/pcap/bpf.h
+++ b/pcap/bpf.h
@@ -15,11 +15,7 @@
* 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. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/pcap/dlt.h b/pcap/dlt.h
index 2d74713e8ab7..b88303c149e2 100644
--- a/pcap/dlt.h
+++ b/pcap/dlt.h
@@ -15,11 +15,7 @@
* 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. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*