Commit mwlwifi driver 10.3.0.8

1. Synchronized PATCH v6 sent to LWN.
2. Add code to support AMSDU.

Signed-off-by: David Lin <dlin@marvell.com>

1 files changed, 15 insertions, 8 deletions

diff --git a/tx.h b/tx.h
index df485f9..0dafc80 100644
--- a/tx.h
+++ b/tx.h
@@ -1,16 +1,22 @@
 /*
  * Copyright (C) 2006-2015, Marvell International Ltd.
  *
- * 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.
+ * This software file (the "File") is distributed by Marvell International
+ * Ltd. under the terms of the GNU General Public License Version 2, June 1991
+ * (the "License").  You may use, redistribute and/or modify this File in
+ * accordance with the terms and conditions of the License, a copy of which
+ * is available by writing to the Free Software Foundation, Inc.
+ *
+ * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
+ * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about
+ * this warranty disclaimer.
  */
 
-/* Description:  This file defines transmit related functions.
- */
+/* Description:  This file defines transmit related functions. */
 
-#ifndef _mwl_tx_h_
-#define _mwl_tx_h_
+#ifndef _tx_h_
+#define _tx_h_
 
 int mwl_tx_init(struct ieee80211_hw *hw);
 void mwl_tx_deinit(struct ieee80211_hw *hw);
@@ -18,5 +24,6 @@ void mwl_tx_xmit(struct ieee80211_hw *hw,
 		 struct ieee80211_tx_control *control,
 		 struct sk_buff *skb);
 void mwl_tx_done(unsigned long data);
+void mwl_tx_flush_amsdu(unsigned long data);
 
-#endif /* _mwl_tx_h_ */
+#endif /* _tx_h_ */