From: Johannes Berg <johannes@sipsolutions.net>
To: netdev@vger.kernel.org
Cc: Jouni Malinen <jkm@devicescape.com>,
"John W. Linville" <linville@tuxdriver.com>,
Jiri Benc <jbenc@suse.cz>,
Johannes Berg <johannes@sipsolutions.net>
Subject: [PATCH 10/18] d80211: clean up includes
Date: Mon, 21 Aug 2006 09:41:17 +0200 [thread overview]
Message-ID: <20060821075200.732186689@sipsolutions.net> (raw)
In-Reply-To: 20060821074107.648561364@sipsolutions.net
[-- Attachment #1: d80211-includes.patch --]
[-- Type: text/plain, Size: 6724 bytes --]
This patch cleans up includes all over d80211. It might
not be complete, but this was the best I could do without
analysing it completely.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
--- wireless-dev.orig/net/d80211/fifo_qdisc.c 2006-08-20 14:56:19.058192788 +0200
+++ wireless-dev/net/d80211/fifo_qdisc.c 2006-08-20 14:56:22.698192788 +0200
@@ -10,9 +10,7 @@
* This is a simple replacement for sch_fifo.
*/
-#include <linux/config.h>
-#include <linux/version.h>
-#include <linux/netdevice.h>
+#include <linux/skbuff.h>
#include <net/pkt_sched.h>
#include <net/d80211.h>
#include "ieee80211_i.h"
--- wireless-dev.orig/net/d80211/ieee80211.c 2006-08-20 14:56:22.008192788 +0200
+++ wireless-dev/net/d80211/ieee80211.c 2006-08-20 14:56:22.708192788 +0200
@@ -7,8 +7,6 @@
* published by the Free Software Foundation.
*/
-#include <linux/config.h>
-#include <linux/version.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/netdevice.h>
--- wireless-dev.orig/net/d80211/ieee80211_ioctl.c 2006-08-20 14:56:20.588192788 +0200
+++ wireless-dev/net/d80211/ieee80211_ioctl.c 2006-08-20 14:56:22.708192788 +0200
@@ -7,8 +7,6 @@
* published by the Free Software Foundation.
*/
-#include <linux/config.h>
-#include <linux/version.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/netdevice.h>
--- wireless-dev.orig/net/d80211/ieee80211_scan.c 2006-08-20 14:56:17.398192788 +0200
+++ wireless-dev/net/d80211/ieee80211_scan.c 2006-08-20 14:56:22.708192788 +0200
@@ -6,8 +6,6 @@
* published by the Free Software Foundation.
*/
-#include <linux/config.h>
-#include <linux/version.h>
#include <linux/module.h>
#include <linux/netdevice.h>
#include <linux/types.h>
--- wireless-dev.orig/net/d80211/ieee80211_sta.c 2006-08-20 14:56:17.418192788 +0200
+++ wireless-dev/net/d80211/ieee80211_sta.c 2006-08-20 14:56:22.718192788 +0200
@@ -15,8 +15,6 @@
* scan result table filtering (by capability (privacy, IBSS/BSS, WPA/RSN IE,
* SSID)
*/
-#include <linux/config.h>
-#include <linux/version.h>
#include <linux/if_ether.h>
#include <linux/skbuff.h>
#include <linux/netdevice.h>
--- wireless-dev.orig/net/d80211/rate_control_simple.c 2006-08-20 14:56:19.768192788 +0200
+++ wireless-dev/net/d80211/rate_control_simple.c 2006-08-20 14:56:22.718192788 +0200
@@ -7,8 +7,6 @@
* published by the Free Software Foundation.
*/
-#include <linux/config.h>
-#include <linux/version.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/netdevice.h>
--- wireless-dev.orig/net/d80211/sta_info.c 2006-08-20 14:56:21.318192788 +0200
+++ wireless-dev/net/d80211/sta_info.c 2006-08-20 14:56:22.718192788 +0200
@@ -6,8 +6,6 @@
* published by the Free Software Foundation.
*/
-#include <linux/config.h>
-#include <linux/version.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/kobject.h>
@@ -20,6 +18,7 @@
#include <net/d80211.h>
#include "ieee80211_i.h"
#include "rate_control.h"
+#include "sta_info.h"
/* Caller must hold local->sta_lock */
--- wireless-dev.orig/net/d80211/tkip.c 2006-08-20 14:56:06.998192788 +0200
+++ wireless-dev/net/d80211/tkip.c 2006-08-20 14:56:22.718192788 +0200
@@ -7,28 +7,13 @@
* published by the Free Software Foundation.
*/
-#ifdef CONFIG_TKIP_DEBUG
-#include <linux/config.h>
-#include <linux/version.h>
-#include <linux/module.h>
#include <linux/kernel.h>
-#include <linux/skbuff.h>
-#endif /* CONFIG_TKIP_DEBUG */
-
#include <linux/types.h>
#include <linux/netdevice.h>
#include <net/d80211.h>
#include "ieee80211_key.h"
-#ifdef CONFIG_TKIP_DEBUG
-#include "ieee80211_i.h"
-#endif /* CONFIG_TKIP_DEBUG */
#include "tkip.h"
-
-/* Dummy prototypes for structures used in wep.h, but not really needed for
- * TKIP. */
-struct ieee80211_local;
-struct sk_buff;
#include "wep.h"
--- wireless-dev.orig/net/d80211/wep.c 2006-08-20 14:56:17.408192788 +0200
+++ wireless-dev/net/d80211/wep.c 2006-08-20 14:56:22.718192788 +0200
@@ -8,8 +8,6 @@
* published by the Free Software Foundation.
*/
-#include <linux/config.h>
-#include <linux/version.h>
#include <linux/netdevice.h>
#include <linux/types.h>
#include <linux/random.h>
--- wireless-dev.orig/net/d80211/wme.c 2006-08-20 14:56:19.058192788 +0200
+++ wireless-dev/net/d80211/wme.c 2006-08-20 14:56:22.718192788 +0200
@@ -6,8 +6,6 @@
* published by the Free Software Foundation.
*/
-#include <linux/config.h>
-#include <linux/version.h>
#include <linux/netdevice.h>
#include <linux/skbuff.h>
#include <linux/module.h>
--- wireless-dev.orig/net/d80211/wpa.c 2006-08-20 14:56:17.418192788 +0200
+++ wireless-dev/net/d80211/wpa.c 2006-08-20 14:56:22.718192788 +0200
@@ -6,15 +6,11 @@
* published by the Free Software Foundation.
*/
-#include <linux/config.h>
-#include <linux/version.h>
-#include <linux/module.h>
#include <linux/netdevice.h>
#include <linux/types.h>
#include <linux/slab.h>
#include <linux/skbuff.h>
#include <linux/compiler.h>
-#include <linux/wireless.h>
#include <net/iw_handler.h>
#include <net/d80211.h>
--- wireless-dev.orig/net/d80211/aes_ccm.c 2006-08-20 14:56:17.408192788 +0200
+++ wireless-dev/net/d80211/aes_ccm.c 2006-08-20 14:56:22.728192788 +0200
@@ -8,7 +8,6 @@
*/
#include <linux/types.h>
-#include <linux/netdevice.h>
#include <linux/crypto.h>
#include <asm/scatterlist.h>
--- wireless-dev.orig/net/d80211/aes_ccm.h 2006-08-20 14:56:07.198192788 +0200
+++ wireless-dev/net/d80211/aes_ccm.h 2006-08-20 14:56:22.728192788 +0200
@@ -10,7 +10,7 @@
#ifndef AES_CCM_H
#define AES_CCM_H
-#include <linux/types.h>
+#include <linux/crypto.h>
#define AES_BLOCK_LEN 16
--- wireless-dev.orig/net/d80211/ieee80211_key.h 2006-08-20 14:56:07.218192788 +0200
+++ wireless-dev/net/d80211/ieee80211_key.h 2006-08-20 14:56:22.728192788 +0200
@@ -11,6 +11,7 @@
#define IEEE80211_KEY_H
#include <linux/types.h>
+#include <linux/kobject.h>
#include <net/d80211.h>
/* ALG_TKIP
--- wireless-dev.orig/net/d80211/sta_info.h 2006-08-20 14:56:07.258192788 +0200
+++ wireless-dev/net/d80211/sta_info.h 2006-08-20 14:56:22.728192788 +0200
@@ -9,9 +9,9 @@
#ifndef STA_INFO_H
#define STA_INFO_H
-#include <linux/if_ether.h>
+#include <linux/list.h>
#include <linux/types.h>
-#include "ieee80211_i.h"
+#include <linux/if_ether.h>
#include "ieee80211_key.h"
/* Stations flags (struct sta_info::flags) */
--- wireless-dev.orig/net/d80211/tkip.h 2006-08-20 14:56:07.308192788 +0200
+++ wireless-dev/net/d80211/tkip.h 2006-08-20 14:56:22.728192788 +0200
@@ -10,6 +10,7 @@
#define TKIP_H
#include <linux/types.h>
+#include <linux/crypto.h>
#include "ieee80211_key.h"
u8 * ieee80211_tkip_add_iv(u8 *pos, struct ieee80211_key *key,
--
next prev parent reply other threads:[~2006-08-21 8:02 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-08-21 7:41 [PATCH 00/18] d80211: various cleanups/fixes/changes Johannes Berg
2006-08-21 7:41 ` [PATCH 01/18] d80211: LED triggers Johannes Berg
2006-08-22 0:30 ` [PATCH 01/3] d80211: add support for SIOCSIWRATE, SIOCSIWTXPOW and SIOCSIWPOWER Mohamed Abbas
2006-08-22 0:36 ` [PATCH 02/3] d80211: iwlist scan Mohamed Abbas
2006-08-23 15:46 ` Jiri Benc
2006-08-28 20:37 ` [PATCH 0/7] d80211: support more wireless command mabbas
2006-08-22 0:38 ` [PATCH 03/3] d80211: adhoc Mohamed Abbas
2006-08-23 15:51 ` Jiri Benc
2006-08-23 15:19 ` [PATCH 01/3] d80211: add support for SIOCSIWRATE, SIOCSIWTXPOW and SIOCSIWPOWER Jiri Benc
2006-08-25 18:37 ` Jouni Malinen
2006-08-25 18:46 ` Mohamed Abbas
2006-08-22 16:54 ` [PATCH 01/18] d80211: LED triggers Jouni Malinen
2006-08-22 18:38 ` Jiri Benc
2006-08-23 7:02 ` Johannes Berg
2006-08-23 18:16 ` Jiri Benc
2006-08-24 7:03 ` Johannes Berg
2006-09-22 11:59 ` Jiri Benc
2006-08-21 7:41 ` [PATCH 02/18] d80211: master link Johannes Berg
2006-08-21 8:13 ` Johannes Berg
2006-08-21 19:08 ` Jiri Benc
2006-08-22 7:49 ` Johannes Berg
2006-08-21 7:41 ` [PATCH 03/18] d80211: pointers as extended booleans Johannes Berg
2006-08-22 6:43 ` Bill Fink
2006-08-22 8:39 ` Johannes Berg
2006-08-21 7:41 ` [PATCH 04/18] d80211: use kzalloc() Johannes Berg
2006-08-21 7:41 ` [PATCH 05/18] d80211: get rid of WME bitfield Johannes Berg
2006-08-21 7:41 ` [PATCH 06/18] d80211: rework rate control registration Johannes Berg
2006-08-21 19:19 ` Jiri Benc
2006-08-22 8:33 ` Johannes Berg
2006-08-21 7:41 ` [PATCH 07/18] d80211: get rid of sta_aid in favour of keeping track of TIM Johannes Berg
2006-08-22 18:36 ` Jiri Benc
2006-08-23 7:04 ` Johannes Berg
2006-08-23 10:04 ` [PATCH] " Johannes Berg
2006-08-23 10:05 ` Johannes Berg
2006-08-23 10:16 ` [PATCH ] " Johannes Berg
2006-08-21 7:41 ` [PATCH 08/18] d80211: clean up exports Johannes Berg
2006-08-22 16:44 ` Jouni Malinen
2006-08-23 7:01 ` Johannes Berg
2006-08-23 10:03 ` [PATCH] " Johannes Berg
2006-08-21 7:41 ` [PATCH 09/18] d80211: move out rate control registration code Johannes Berg
2006-08-21 7:41 ` Johannes Berg [this message]
2006-08-21 7:41 ` [PATCH 11/18] d80211: clean up qdisc requeue Johannes Berg
2006-08-21 19:31 ` Jiri Benc
2006-08-22 7:48 ` Johannes Berg
2006-08-21 7:41 ` [PATCH 12/18] d80211: fix some sparse warnings Johannes Berg
2006-08-22 18:55 ` Jiri Benc
2006-08-21 7:41 ` [PATCH 13/18] d80211: clean up some coding style issues Johannes Berg
2006-08-21 19:35 ` Jiri Benc
2006-08-22 8:27 ` Johannes Berg
2006-08-21 7:41 ` [PATCH 14/18] d80211: make lowlevel TX framedump option visible Johannes Berg
2006-08-21 7:41 ` [PATCH 15/18] d80211: surface IBSS debug Johannes Berg
2006-08-21 7:41 ` [PATCH 16/18] d80211: get rid of MICHAEL_MIC_HWACCEL define Johannes Berg
2006-08-22 19:00 ` Jiri Benc
2006-08-23 7:05 ` Johannes Berg
2006-08-23 9:46 ` Jiri Benc
2006-08-21 7:41 ` [PATCH 17/18] d80211: surface powersave debug switch Johannes Berg
2006-08-21 7:41 ` [PATCH 18/18] d80211: fix some documentation Johannes Berg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20060821075200.732186689@sipsolutions.net \
--to=johannes@sipsolutions.net \
--cc=jbenc@suse.cz \
--cc=jkm@devicescape.com \
--cc=linville@tuxdriver.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).