# HG changeset patch
# User Prakash Jalan <Prakash.Jalan@oracle.com>
# Date 1416349377 28800
# Node ID c98efe8be94ee4b50ea74d59daa2fd871c8ccd79
# Parent  b87f3edd5dd71c6c39fb6e079b396883b3320770
20023476 sfxge_ioctl.h license is incorrect

diff -r b87f3edd5dd7 -r c98efe8be94e components/ptp/patches/00-sol_sf_patch_over_community_edition.patch
--- a/components/ptp/patches/00-sol_sf_patch_over_community_edition.patch	Tue Nov 11 15:52:02 2014 -0800
+++ b/components/ptp/patches/00-sol_sf_patch_over_community_edition.patch	Tue Nov 18 14:22:57 2014 -0800
@@ -10,7 +10,7 @@
 +++ b/COPYRIGHT	Sun Oct 27 22:49:29 2013 -0700
 @@ -1,4 +1,6 @@
  /*-
-+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
 + * Copyright (c) 2011-2012 Solarflare Communications Inc
   * Copyright (c) 2009-2012 George V. Neville-Neil, 
   *                         Steven Kreuzer, 
@@ -4181,37 +4181,38 @@
  }
  
 diff -r 3f1e7d35d0ab -r 821e8eadeaff src/dep/sfxge_ioctl.h
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/dep/sfxge_ioctl.h	Sun Oct 27 22:49:29 2013 -0700
-@@ -0,0 +1,135 @@
-+/*
-+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
-+ */
-+/****************************************************************************
-+ * Driver for Solarflare network controllers
-+ *           (including support for SFE4001 10GBT NIC)
-+ *
-+ * Copyright 2005-2006: Fen Systems Ltd.
-+ * Copyright 2006-2010: Solarflare Communications Inc,
-+ *                      9501 Jeronimo Road, Suite 250,
-+ *                      Irvine, CA 92618, USA
+--- /dev/null	Fri Nov 14 16:18:09 2014
++++ b/src/dep/sfxge_ioctl.h	Fri Nov 14 12:20:13 2014
+@@ -0,0 +1,136 @@
++/*-
++ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2005-2006 Fen Systems Ltd.
++ * Copyright (c) 2006-2012 Solarflare Communications Inc
++ *                         9501 Jeronimo Road, Suite 250,
++ *                         Irvine, CA 92618, USA
 + *
-+ * Initially developed by Michael Brown <mbrown@fensystems.co.uk>
-+ * Maintained by Solarflare Communications <linux-net-drivers@solarflare.com>
-+ *
-+ * This program is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 as published
-+ * by the Free Software Foundation, incorporated herein by reference.
-+ *
-+ * 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, write to the Free Software
-+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-+ ****************************************************************************
++ * All Rights Reserved
++ * 
++ * 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.
++ * 
++ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
++ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
++ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
++ * DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
++ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
++ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
++ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
++ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
++ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
++ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
++ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 + */
 +
 +#ifndef SFXGE_IOCTL_H