From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrey Borzenkov Subject: Re: [PATCH][2.6.14.5] fix /sys/class/net//wireless without dev->get_wireless_stats Date: Mon, 2 Jan 2006 20:15:12 +0300 Message-ID: <200601022015.16580.arvidjaar@mail.ru> References: <200601021349.32823.arvidjaar@mail.ru> <200601021545.59097.ismail@uludag.org.tr> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Cc: linux-kernel@vger.kernel.org Return-path: To: netdev@vger.kernel.org In-Reply-To: <200601021545.59097.ismail@uludag.org.tr> Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-Id: netdev.vger.kernel.org -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 I accidentally used wrong lkml address, so I resend it now with proper format. dev->get_wireless_stats is deprecated but removing it also removes wireless subdirectory in sysfs. This patch puts it back. Signed-off-by: Andrey Borzenkov - --- - --- linux-2.6.14.5/net/core/net-sysfs.c.orig 2005-12-27 03:26:33.000000000 +0300 +++ linux-2.6.14.5/net/core/net-sysfs.c 2006-01-02 13:33:34.000000000 +0300 @@ -16,6 +16,7 @@ #include #include #include +#include #define to_class_dev(obj) container_of(obj,struct class_device,kobj) #define to_net_dev(class) container_of(class, struct net_device, class_dev) @@ -313,13 +314,19 @@ static ssize_t wireless_show(struct clas char *)) { struct net_device *dev = to_net_dev(cd); - - const struct iw_statistics *iw; + const struct iw_statistics *iw = NULL; ssize_t ret = -EINVAL; read_lock(&dev_base_lock); - - if (dev_isalive(dev) && dev->get_wireless_stats - - && (iw = dev->get_wireless_stats(dev)) != NULL) - - ret = (*format)(iw, buf); + if (dev_isalive(dev)) { + if(dev->wireless_handlers && + dev->wireless_handlers->get_wireless_stats) + iw = dev->wireless_handlers->get_wireless_stats(dev); + else if (dev->get_wireless_stats) + iw = dev->get_wireless_stats(dev); + if (iw != NULL) + ret = (*format)(iw, buf); + } read_unlock(&dev_base_lock); return ret; @@ -420,7 +427,8 @@ void netdev_unregister_sysfs(struct net_ sysfs_remove_group(&class_dev->kobj, &netstat_group); #ifdef WIRELESS_EXT - - if (net->get_wireless_stats) + if ((net->get_wireless_stats || + net->wireless_handlers && net->wireless_handlers->get_wireless_stats)) sysfs_remove_group(&class_dev->kobj, &wireless_group); #endif class_device_del(class_dev); @@ -453,7 +461,8 @@ int netdev_register_sysfs(struct net_dev goto out_unreg; #ifdef WIRELESS_EXT - - if (net->get_wireless_stats && + if ((net->get_wireless_stats || + net->wireless_handlers && net->wireless_handlers->get_wireless_stats) && (ret = sysfs_create_group(&class_dev->kobj, &wireless_group))) goto out_cleanup; -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (GNU/Linux) iD8DBQFDuV+kR6LMutpd94wRAugpAKChYCaH91dykwqMPGb6Xm5kXmIa0ACePENS QwHqJFgsCyblXHkUKdZM9j0= =37cH -----END PGP SIGNATURE-----