Merge branch 'upstream'

[karo-tx-linux.git] / include / net / ieee80211softmac.h

diff --git a/include/net/ieee80211softmac.h b/include/net/ieee80211softmac.h
index 0b5f2df29f0287f5f1bef916e17143ccae467ad4..b971d8c82bdd6fbd92fb65795766438fa6300fbb 100644 (file)
--- a/include/net/ieee80211softmac.h
+++ b/include/net/ieee80211softmac.h
@@ -1,3 +1,29 @@
+/*
+ * ieee80211softmac.h - public interface to the softmac
+ *
+ * Copyright (c) 2005 Johannes Berg <johannes@sipsolutions.net>
+ *                    Joseph Jezak <josejx@gentoo.org>
+ *                    Larry Finger <Larry.Finger@lwfinger.net>
+ *                    Danny van Dyk <kugelfang@gentoo.org>
+ *                    Michael Buesch <mbuesch@freenet.de>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * 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
+ *
+ * The full GNU General Public License is included in this distribution in the
+ * file called COPYING.
+ */
+
 #ifndef IEEE80211SOFTMAC_H_
 #define IEEE80211SOFTMAC_H_
 
@@ -177,9 +203,6 @@ struct ieee80211softmac_device {
        u8 scanning:1, /* protects scanning from being done multiple times at once */
           associated:1;
        
-       /* workquere for scannning, ... */
-       struct workqueue_struct *workqueue;
-
        struct ieee80211softmac_scaninfo *scaninfo;
        struct ieee80211softmac_assoc_info associnfo;