aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/rt2860/rt_main_dev.c
diff options
context:
space:
mode:
authorAlexander Beregalov <a.beregalov@gmail.com>2009-08-06 19:09:34 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2009-09-15 15:02:06 -0400
commite82bf85ec92e9cb2db9b226c1a29e2219b489b94 (patch)
tree7ed5ac9113a026e45d796868bb006cb53f932d44 /drivers/staging/rt2860/rt_main_dev.c
parent7d5efd61999c8d0e63f995339f76bbfc653b645a (diff)
Staging: rt2860: remove dependency on WIRELESS_EXT version
As the driver is in mainline now we can remove such dependencies. WIRELESS_EXT is 22 now. Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rt2860/rt_main_dev.c')
-rw-r--r--drivers/staging/rt2860/rt_main_dev.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/staging/rt2860/rt_main_dev.c b/drivers/staging/rt2860/rt_main_dev.c
index 495d5db0970..1148b5a1c8a 100644
--- a/drivers/staging/rt2860/rt_main_dev.c
+++ b/drivers/staging/rt2860/rt_main_dev.c
@@ -74,11 +74,9 @@ static void CfgInitHook(PRTMP_ADAPTER pAd);
74 74
75extern const struct iw_handler_def rt28xx_iw_handler_def; 75extern const struct iw_handler_def rt28xx_iw_handler_def;
76 76
77#if WIRELESS_EXT >= 12
78// This function will be called when query /proc 77// This function will be called when query /proc
79struct iw_statistics *rt28xx_get_wireless_stats( 78struct iw_statistics *rt28xx_get_wireless_stats(
80 IN struct net_device *net_dev); 79 IN struct net_device *net_dev);
81#endif
82 80
83struct net_device_stats *RT28xx_get_ether_stats( 81struct net_device_stats *RT28xx_get_ether_stats(
84 IN struct net_device *net_dev); 82 IN struct net_device *net_dev);
@@ -695,16 +693,11 @@ static NDIS_STATUS rt_ieee80211_if_setup(struct net_device *dev, PRTMP_ADAPTER p
695 CHAR slot_name[IFNAMSIZ]; 693 CHAR slot_name[IFNAMSIZ];
696 struct net_device *device; 694 struct net_device *device;
697 695
698#if WIRELESS_EXT >= 12
699 if (pAd->OpMode == OPMODE_STA) 696 if (pAd->OpMode == OPMODE_STA)
700 { 697 {
701 dev->wireless_handlers = &rt28xx_iw_handler_def; 698 dev->wireless_handlers = &rt28xx_iw_handler_def;
702 } 699 }
703#endif //WIRELESS_EXT >= 12
704 700
705#if WIRELESS_EXT < 21
706 dev->get_wireless_stats = rt28xx_get_wireless_stats;
707#endif
708 dev->priv_flags = INT_MAIN; 701 dev->priv_flags = INT_MAIN;
709 dev->netdev_ops = &rt2860_netdev_ops; 702 dev->netdev_ops = &rt2860_netdev_ops;
710 // find available device name 703 // find available device name
@@ -942,7 +935,6 @@ void CfgInitHook(PRTMP_ADAPTER pAd)
942} /* End of CfgInitHook */ 935} /* End of CfgInitHook */
943 936
944 937
945#if WIRELESS_EXT >= 12
946// This function will be called when query /proc 938// This function will be called when query /proc
947struct iw_statistics *rt28xx_get_wireless_stats( 939struct iw_statistics *rt28xx_get_wireless_stats(
948 IN struct net_device *net_dev) 940 IN struct net_device *net_dev)
@@ -976,7 +968,6 @@ struct iw_statistics *rt28xx_get_wireless_stats(
976 DBGPRINT(RT_DEBUG_TRACE, ("<--- rt28xx_get_wireless_stats\n")); 968 DBGPRINT(RT_DEBUG_TRACE, ("<--- rt28xx_get_wireless_stats\n"));
977 return &pAd->iw_stats; 969 return &pAd->iw_stats;
978} /* End of rt28xx_get_wireless_stats */ 970} /* End of rt28xx_get_wireless_stats */
979#endif // WIRELESS_EXT //
980 971
981 972
982 973