Skip to content

Commit fb1749c

Browse files
lwhsulwhsu
committed
wtap(4): Clean up includes
Sponsored by: The FreeBSD Foundation
1 parent 2982c70 commit fb1749c

File tree

6 files changed

+3
-107
lines changed

6 files changed

+3
-107
lines changed

‎sys/dev/wtap/if_wtap.c‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,8 @@
3333
*/
3434
#include "if_wtapvar.h"
3535
#include <sys/uio.h> /* uio struct */
36-
#include <net/if.h>
3736
#include <net/if_var.h>
38-
#include <net/vnet.h>
3937

40-
#include <net80211/ieee80211_ratectl.h>
4138
#include "if_medium.h"
4239
#include "wtap_hal/hal.h"
4340

‎sys/dev/wtap/if_wtap_module.c‎

Lines changed: 1 addition & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -28,52 +28,19 @@
2828
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
2929
* THE POSSIBILITY OF SUCH DAMAGES.
3030
*/
31+
3132
#include <sys/param.h>
3233
#include <sys/module.h>
33-
#include <sys/kernel.h>
34-
#include <sys/systm.h>
35-
#include <sys/sysctl.h>
36-
#include <sys/mbuf.h>
3734
#include <sys/malloc.h>
38-
#include <sys/lock.h>
39-
#include <sys/mutex.h>
40-
#include <sys/proc.h>
41-
#include <sys/ucred.h>
4235
#include <sys/jail.h>
4336

44-
#include <sys/sockio.h>
4537
#include <sys/socket.h>
46-
#include <sys/socketvar.h>
47-
#include <sys/errno.h>
48-
#include <sys/callout.h>
49-
#include <sys/endian.h>
50-
#include <sys/kthread.h>
51-
#include <sys/taskqueue.h>
52-
#include <sys/priv.h>
53-
#include <sys/sysctl.h>
54-
55-
#include <machine/bus.h>
5638

5739
#include <net/if.h>
58-
#include <net/if_dl.h>
5940
#include <net/if_media.h>
60-
#include <net/if_types.h>
61-
#include <net/if_arp.h>
6241
#include <net/ethernet.h>
63-
#include <net/if_llc.h>
64-
#include <net/vnet.h>
65-
66-
#include <net80211/ieee80211_var.h>
67-
#include <net80211/ieee80211_regdomain.h>
68-
69-
#include <net/bpf.h>
70-
71-
#include <sys/errno.h>
72-
#include <sys/conf.h> /* cdevsw struct */
73-
#include <sys/uio.h> /* uio struct */
7442

7543
#include <netinet/in.h>
76-
#include <netinet/if_ether.h>
7744

7845
#include "if_wtapvar.h"
7946
#include "if_wtapioctl.h"

‎sys/dev/wtap/if_wtapioctl.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
#ifndef _DEV_WTAP_WTAPIOCTL_H
4141
#define _DEV_WTAP_WTAPIOCTL_H
4242

43-
#include <sys/param.h>
43+
#include <sys/types.h>
4444
#include <net80211/ieee80211_radiotap.h>
4545

4646
#define SIOCGATHSTATS _IOWR('i', 137, struct ifreq)

‎sys/dev/wtap/if_wtapvar.h‎

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -34,46 +34,18 @@
3434

3535
#include <sys/param.h>
3636
#include <sys/conf.h>
37-
#include <sys/module.h>
38-
#include <sys/kernel.h>
39-
#include <sys/systm.h>
40-
#include <sys/sysctl.h>
41-
#include <sys/mbuf.h>
4237
#include <sys/malloc.h>
43-
#include <sys/lock.h>
44-
#include <sys/mutex.h>
4538

4639
#include <sys/sockio.h>
4740
#include <sys/socket.h>
48-
#include <sys/socketvar.h>
49-
#include <sys/errno.h>
50-
#include <sys/callout.h>
51-
#include <sys/endian.h>
52-
#include <sys/kthread.h>
53-
#include <sys/taskqueue.h>
54-
#include <sys/priv.h>
55-
#include <sys/sysctl.h>
56-
57-
#include <machine/bus.h>
5841

5942
#include <net/if.h>
60-
#include <net/if_dl.h>
6143
#include <net/if_media.h>
62-
#include <net/if_types.h>
63-
#include <net/if_arp.h>
6444
#include <net/ethernet.h>
65-
#include <net/if_llc.h>
6645

6746
#include <net80211/ieee80211_var.h>
6847
#include <net80211/ieee80211_regdomain.h>
6948

70-
#include <net/bpf.h>
71-
72-
#include <net/vnet.h>
73-
74-
#include <netinet/in.h>
75-
#include <netinet/if_ether.h>
76-
7749
#if 0
7850
#define DWTAP_PRINTF(...) printf(__VA_ARGS__)
7951
#else

‎sys/dev/wtap/plugins/visibility.c‎

Lines changed: 1 addition & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -28,52 +28,14 @@
2828
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
2929
* THE POSSIBILITY OF SUCH DAMAGES.
3030
*/
31+
3132
#include <sys/param.h>
32-
#include <sys/module.h>
33-
#include <sys/kernel.h>
34-
#include <sys/systm.h>
35-
#include <sys/sysctl.h>
36-
#include <sys/mbuf.h>
37-
#include <sys/malloc.h>
38-
#include <sys/lock.h>
39-
#include <sys/mutex.h>
40-
#include <sys/proc.h>
41-
#include <sys/ucred.h>
4233
#include <sys/jail.h>
4334

44-
#include <sys/sockio.h>
4535
#include <sys/socket.h>
46-
#include <sys/socketvar.h>
47-
#include <sys/errno.h>
48-
#include <sys/callout.h>
49-
#include <sys/endian.h>
50-
#include <sys/kthread.h>
51-
#include <sys/taskqueue.h>
52-
#include <sys/priv.h>
53-
#include <sys/sysctl.h>
54-
55-
#include <machine/bus.h>
5636

5737
#include <net/if.h>
58-
#include <net/if_dl.h>
59-
#include <net/if_media.h>
60-
#include <net/if_types.h>
61-
#include <net/if_arp.h>
62-
#include <net/ethernet.h>
63-
#include <net/if_llc.h>
64-
#include <net/vnet.h>
65-
66-
#include <net80211/ieee80211_var.h>
67-
#include <net80211/ieee80211_regdomain.h>
68-
69-
#include <net/bpf.h>
70-
71-
#include <sys/errno.h>
72-
#include <sys/conf.h> /* cdevsw struct */
73-
#include <sys/uio.h> /* uio struct */
74-
7538
#include <netinet/in.h>
76-
#include <netinet/if_ether.h>
7739

7840
#include "visibility.h"
7941

‎sys/dev/wtap/plugins/visibility_ioctl.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@
3636
#ifndef _VISIBILITY_IOCTL_H
3737
#define _VISIBILITY_IOCTL_H
3838

39-
#include <sys/param.h>
40-
4139
struct link {
4240
int op; //0 remove, 1 link
4341
int id1;

0 commit comments

Comments
 (0)