ath6kl: Bringing in the upstream version

chromeos/drivers/ath6kl/os/linux/netbuf.c

Index: chromeos/drivers/ath6kl/os/linux/netbuf.c
diff --git a/chromeos/drivers/ath6kl/os/linux/netbuf.c b/chromeos/drivers/ath6kl/os/linux/netbuf.c
index 62b26c540449e1941c577aa59e5d197e5b8b12e1..15e5d0475202ecb13cb48d50a220032a3e22a0a2 100644
--- a/chromeos/drivers/ath6kl/os/linux/netbuf.c
+++ b/chromeos/drivers/ath6kl/os/linux/netbuf.c
@@ -1,24 +1,25 @@
-
-/*
- * 
- * Copyright (c) 2004-2007 Atheros Communications Inc.
- * All rights reserved.
- *
- * 
-// 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;
+//------------------------------------------------------------------------------
+// Copyright (c) 2004-2010 Atheros Communications Inc.
+// All rights reserved.
 //
-// Software distributed under the License is distributed on an "AS
-// IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-// implied. See the License for the specific language governing
-// rights and limitations under the License.
+// 
 //
+// 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.
 //
- * 
- */
-#include <linux/kernel.h>
-#include <linux/skbuff.h>
+// 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.
+//
+//
+//
+// Author(s): ="Atheros"
+//------------------------------------------------------------------------------
 #include <a_config.h>
 #include "athdefs.h"
 #include "a_types.h"