diff options
author | Winkler, Tomas <tomas.winkler@intel.com> | 2008-12-21 22:31:21 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-01-29 15:58:45 -0500 |
commit | b306b82c58069159791df5a377a1f1f49b42c4d3 (patch) | |
tree | 38aa5acc19b581d5f30725e61cfa32f4424c1119 | |
parent | 2ddfa129bbf3dca708ffb0eb29d08de32cacd547 (diff) |
iwlwifi: kill retry_rate sysfs for iwlagn
This patch kills retry_rate in sysfs for iwlagn. It's not used.
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Zhu Yi <yi.zhu@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.c | 26 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-core.c | 1 |
2 files changed, 0 insertions, 27 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index 01e744962d6c..1e5aadd9e6ad 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c | |||
@@ -3525,31 +3525,6 @@ static ssize_t store_filter_flags(struct device *d, | |||
3525 | static DEVICE_ATTR(filter_flags, S_IWUSR | S_IRUGO, show_filter_flags, | 3525 | static DEVICE_ATTR(filter_flags, S_IWUSR | S_IRUGO, show_filter_flags, |
3526 | store_filter_flags); | 3526 | store_filter_flags); |
3527 | 3527 | ||
3528 | static ssize_t store_retry_rate(struct device *d, | ||
3529 | struct device_attribute *attr, | ||
3530 | const char *buf, size_t count) | ||
3531 | { | ||
3532 | struct iwl_priv *priv = dev_get_drvdata(d); | ||
3533 | long val; | ||
3534 | int ret = strict_strtol(buf, 10, &val); | ||
3535 | if (!ret) | ||
3536 | return ret; | ||
3537 | |||
3538 | priv->retry_rate = (val > 0) ? val : 1; | ||
3539 | |||
3540 | return count; | ||
3541 | } | ||
3542 | |||
3543 | static ssize_t show_retry_rate(struct device *d, | ||
3544 | struct device_attribute *attr, char *buf) | ||
3545 | { | ||
3546 | struct iwl_priv *priv = dev_get_drvdata(d); | ||
3547 | return sprintf(buf, "%d", priv->retry_rate); | ||
3548 | } | ||
3549 | |||
3550 | static DEVICE_ATTR(retry_rate, S_IWUSR | S_IRUSR, show_retry_rate, | ||
3551 | store_retry_rate); | ||
3552 | |||
3553 | static ssize_t store_power_level(struct device *d, | 3528 | static ssize_t store_power_level(struct device *d, |
3554 | struct device_attribute *attr, | 3529 | struct device_attribute *attr, |
3555 | const char *buf, size_t count) | 3530 | const char *buf, size_t count) |
@@ -3705,7 +3680,6 @@ static struct attribute *iwl_sysfs_entries[] = { | |||
3705 | &dev_attr_flags.attr, | 3680 | &dev_attr_flags.attr, |
3706 | &dev_attr_filter_flags.attr, | 3681 | &dev_attr_filter_flags.attr, |
3707 | &dev_attr_power_level.attr, | 3682 | &dev_attr_power_level.attr, |
3708 | &dev_attr_retry_rate.attr, | ||
3709 | &dev_attr_statistics.attr, | 3683 | &dev_attr_statistics.attr, |
3710 | &dev_attr_temperature.attr, | 3684 | &dev_attr_temperature.attr, |
3711 | &dev_attr_tx_power.attr, | 3685 | &dev_attr_tx_power.attr, |
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c index 73d7973707eb..313976b29dab 100644 --- a/drivers/net/wireless/iwlwifi/iwl-core.c +++ b/drivers/net/wireless/iwlwifi/iwl-core.c | |||
@@ -863,7 +863,6 @@ int iwl_init_drv(struct iwl_priv *priv) | |||
863 | { | 863 | { |
864 | int ret; | 864 | int ret; |
865 | 865 | ||
866 | priv->retry_rate = 1; | ||
867 | priv->ibss_beacon = NULL; | 866 | priv->ibss_beacon = NULL; |
868 | 867 | ||
869 | spin_lock_init(&priv->lock); | 868 | spin_lock_init(&priv->lock); |