diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 12:30:29 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 12:30:29 -0400 |
commit | 35ebbae2836a361330b784706b7140c90a346a53 (patch) | |
tree | ada3c046a8b6bfdf21bcb0932b4b65c95c2af073 /drivers/net/wireless/wavelan.p.h | |
parent | c6a33e2464edd87f8c12cc2d11369a5b44c65b77 (diff) | |
parent | 5fadd053d9bb4345ec6f405d24db4e7eb49cf81e (diff) | |
download | kernel_samsung_smdk4412-35ebbae2836a361330b784706b7140c90a346a53.tar.gz kernel_samsung_smdk4412-35ebbae2836a361330b784706b7140c90a346a53.tar.bz2 kernel_samsung_smdk4412-35ebbae2836a361330b784706b7140c90a346a53.zip |
Merge branch 'master'
Diffstat (limited to 'drivers/net/wireless/wavelan.p.h')
-rw-r--r-- | drivers/net/wireless/wavelan.p.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/wireless/wavelan.p.h b/drivers/net/wireless/wavelan.p.h index 509ff22a6ca..166e28b9a4f 100644 --- a/drivers/net/wireless/wavelan.p.h +++ b/drivers/net/wireless/wavelan.p.h @@ -409,11 +409,9 @@ #define MULTICAST_AVOID /* Avoid extra multicast (I'm sceptical). */ #undef SET_MAC_ADDRESS /* Experimental */ -#ifdef WIRELESS_EXT /* If wireless extensions exist in the kernel */ /* Warning: this stuff will slow down the driver. */ #define WIRELESS_SPY /* Enable spying addresses. */ #undef HISTOGRAM /* Enable histogram of signal level. */ -#endif /****************************** DEBUG ******************************/ @@ -506,12 +504,10 @@ struct net_local u_short tx_first_free; u_short tx_first_in_use; -#ifdef WIRELESS_EXT iw_stats wstats; /* Wireless-specific statistics */ struct iw_spy_data spy_data; struct iw_public_data wireless_data; -#endif #ifdef HISTOGRAM int his_number; /* number of intervals */ |