From: "John W. Linville" <linville@tuxdriver.com> To: linux-wireless@vger.kernel.org Cc: netdev@vger.kernel.org, Kalle Valo <kalle.valo@nokia.com>, Kalle Valo <kalle.valo@iki.fi>, "Luis R. Rodriguez" <mcgrof@gmail.com>, "John W. Linville" <linville@tuxdriver.com> Subject: [PATCH 1/3] wireless: implement basic ethtool support for cfg80211 devices Date: Wed, 30 Sep 2009 21:19:00 -0400 [thread overview] Message-ID: <1254359942-3483-1-git-send-email-linville@tuxdriver.com> (raw) In-Reply-To: <20091001011340.GA3123@tuxdriver.com> Signed-off-by: John W. Linville <linville@tuxdriver.com> --- net/wireless/Makefile | 2 +- net/wireless/core.c | 3 +++ net/wireless/ethtool.c | 27 +++++++++++++++++++++++++++ net/wireless/ethtool.h | 10 ++++++++++ 4 files changed, 41 insertions(+), 1 deletions(-) create mode 100644 net/wireless/ethtool.c create mode 100644 net/wireless/ethtool.h diff --git a/net/wireless/Makefile b/net/wireless/Makefile index c814150..f07c8dc 100644 --- a/net/wireless/Makefile +++ b/net/wireless/Makefile @@ -10,7 +10,7 @@ obj-$(CONFIG_WEXT_SPY) += wext-spy.o obj-$(CONFIG_WEXT_PRIV) += wext-priv.o cfg80211-y += core.o sysfs.o radiotap.o util.o reg.o scan.o nl80211.o -cfg80211-y += mlme.o ibss.o sme.o chan.o +cfg80211-y += mlme.o ibss.o sme.o chan.o ethtool.o cfg80211-$(CONFIG_CFG80211_DEBUGFS) += debugfs.o cfg80211-$(CONFIG_CFG80211_WEXT) += wext-compat.o wext-sme.o diff --git a/net/wireless/core.c b/net/wireless/core.c index c761532..faada5c 100644 --- a/net/wireless/core.c +++ b/net/wireless/core.c @@ -21,6 +21,7 @@ #include "sysfs.h" #include "debugfs.h" #include "wext-compat.h" +#include "ethtool.h" /* name for sysfs, %d is appended */ #define PHY_NAME "phy" @@ -683,6 +684,8 @@ static int cfg80211_netdev_notifier_call(struct notifier_block * nb, wdev->wext.ps = false; } #endif + if (!dev->ethtool_ops) + dev->ethtool_ops = &cfg80211_ethtool_ops; break; case NETDEV_GOING_DOWN: switch (wdev->iftype) { diff --git a/net/wireless/ethtool.c b/net/wireless/ethtool.c new file mode 100644 index 0000000..94ca377 --- /dev/null +++ b/net/wireless/ethtool.c @@ -0,0 +1,27 @@ +#include <linux/utsrelease.h> +#include <net/cfg80211.h> +#include "ethtool.h" + +const struct ethtool_ops cfg80211_ethtool_ops = { + .get_drvinfo = cfg80211_get_drvinfo, + .get_link = ethtool_op_get_link, +}; + +void cfg80211_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info) +{ + struct wireless_dev *wdev = dev->ieee80211_ptr; + + strncpy(info->driver, wiphy_dev(wdev->wiphy)->driver->name, + sizeof(info->driver)); + info->driver[sizeof(info->driver) - 1] = '\0'; + + strncpy(info->version, UTS_RELEASE, sizeof(info->version)); + info->version[sizeof(info->version) - 1] = '\0'; + + strncpy(info->fw_version, "N/A", sizeof(info->fw_version)); + info->fw_version[sizeof(info->fw_version) - 1] = '\0'; + + strncpy(info->bus_info, dev_name(wiphy_dev(wdev->wiphy)), + sizeof(info->bus_info)); + info->bus_info[sizeof(info->bus_info) - 1] = '\0'; +} diff --git a/net/wireless/ethtool.h b/net/wireless/ethtool.h new file mode 100644 index 0000000..a51b470 --- /dev/null +++ b/net/wireless/ethtool.h @@ -0,0 +1,10 @@ +#ifndef __CFG80211_ETHTOOL__ +#define __CFG80211_ETHTOOL__ + +#include <linux/ethtool.h> + +extern void cfg80211_get_drvinfo(struct net_device *, struct ethtool_drvinfo *); + +extern const struct ethtool_ops cfg80211_ethtool_ops; + +#endif /* __CFG80211_ETHTOOL__ */ -- 1.6.2.5
WARNING: multiple messages have this Message-ID (diff)
From: "John W. Linville" <linville-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org> To: linux-wireless-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Kalle Valo <kalle.valo-xNZwKgViW5gAvxtiuMwx3w@public.gmane.org>, Kalle Valo <kalle.valo-X3B1VOXEql0@public.gmane.org>, "Luis R. Rodriguez" <mcgrof-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>, "John W. Linville" <linville-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org> Subject: [PATCH 1/3] wireless: implement basic ethtool support for cfg80211 devices Date: Wed, 30 Sep 2009 21:19:00 -0400 [thread overview] Message-ID: <1254359942-3483-1-git-send-email-linville@tuxdriver.com> (raw) In-Reply-To: <20091001011340.GA3123-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org> Signed-off-by: John W. Linville <linville-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org> --- net/wireless/Makefile | 2 +- net/wireless/core.c | 3 +++ net/wireless/ethtool.c | 27 +++++++++++++++++++++++++++ net/wireless/ethtool.h | 10 ++++++++++ 4 files changed, 41 insertions(+), 1 deletions(-) create mode 100644 net/wireless/ethtool.c create mode 100644 net/wireless/ethtool.h diff --git a/net/wireless/Makefile b/net/wireless/Makefile index c814150..f07c8dc 100644 --- a/net/wireless/Makefile +++ b/net/wireless/Makefile @@ -10,7 +10,7 @@ obj-$(CONFIG_WEXT_SPY) += wext-spy.o obj-$(CONFIG_WEXT_PRIV) += wext-priv.o cfg80211-y += core.o sysfs.o radiotap.o util.o reg.o scan.o nl80211.o -cfg80211-y += mlme.o ibss.o sme.o chan.o +cfg80211-y += mlme.o ibss.o sme.o chan.o ethtool.o cfg80211-$(CONFIG_CFG80211_DEBUGFS) += debugfs.o cfg80211-$(CONFIG_CFG80211_WEXT) += wext-compat.o wext-sme.o diff --git a/net/wireless/core.c b/net/wireless/core.c index c761532..faada5c 100644 --- a/net/wireless/core.c +++ b/net/wireless/core.c @@ -21,6 +21,7 @@ #include "sysfs.h" #include "debugfs.h" #include "wext-compat.h" +#include "ethtool.h" /* name for sysfs, %d is appended */ #define PHY_NAME "phy" @@ -683,6 +684,8 @@ static int cfg80211_netdev_notifier_call(struct notifier_block * nb, wdev->wext.ps = false; } #endif + if (!dev->ethtool_ops) + dev->ethtool_ops = &cfg80211_ethtool_ops; break; case NETDEV_GOING_DOWN: switch (wdev->iftype) { diff --git a/net/wireless/ethtool.c b/net/wireless/ethtool.c new file mode 100644 index 0000000..94ca377 --- /dev/null +++ b/net/wireless/ethtool.c @@ -0,0 +1,27 @@ +#include <linux/utsrelease.h> +#include <net/cfg80211.h> +#include "ethtool.h" + +const struct ethtool_ops cfg80211_ethtool_ops = { + .get_drvinfo = cfg80211_get_drvinfo, + .get_link = ethtool_op_get_link, +}; + +void cfg80211_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info) +{ + struct wireless_dev *wdev = dev->ieee80211_ptr; + + strncpy(info->driver, wiphy_dev(wdev->wiphy)->driver->name, + sizeof(info->driver)); + info->driver[sizeof(info->driver) - 1] = '\0'; + + strncpy(info->version, UTS_RELEASE, sizeof(info->version)); + info->version[sizeof(info->version) - 1] = '\0'; + + strncpy(info->fw_version, "N/A", sizeof(info->fw_version)); + info->fw_version[sizeof(info->fw_version) - 1] = '\0'; + + strncpy(info->bus_info, dev_name(wiphy_dev(wdev->wiphy)), + sizeof(info->bus_info)); + info->bus_info[sizeof(info->bus_info) - 1] = '\0'; +} diff --git a/net/wireless/ethtool.h b/net/wireless/ethtool.h new file mode 100644 index 0000000..a51b470 --- /dev/null +++ b/net/wireless/ethtool.h @@ -0,0 +1,10 @@ +#ifndef __CFG80211_ETHTOOL__ +#define __CFG80211_ETHTOOL__ + +#include <linux/ethtool.h> + +extern void cfg80211_get_drvinfo(struct net_device *, struct ethtool_drvinfo *); + +extern const struct ethtool_ops cfg80211_ethtool_ops; + +#endif /* __CFG80211_ETHTOOL__ */ -- 1.6.2.5 -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2009-10-01 1:20 UTC|newest] Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top 2009-09-24 18:02 [PATCH 0/2] cfg80211: firmware and hardware version Kalle Valo 2009-09-24 18:02 ` [PATCH 1/2] cfg80211: add firmware and hardware version to wiphy Kalle Valo 2009-09-24 18:32 ` Luis R. Rodriguez 2009-09-24 19:14 ` Kalle Valo 2009-09-24 20:08 ` Luis R. Rodriguez 2009-09-24 18:02 ` [PATCH 2/2] at76c50x-usb: set firmware and hardware version in wiphy Kalle Valo 2009-09-24 18:35 ` Luis R. Rodriguez 2009-09-24 19:10 ` Kalle Valo 2009-09-24 20:11 ` Luis R. Rodriguez 2009-09-25 19:11 ` Kalle Valo 2009-09-25 19:27 ` Luis R. Rodriguez 2009-09-26 12:07 ` Johannes Berg 2009-09-26 13:59 ` Kalle Valo 2009-09-24 21:13 ` Joerg Albert 2009-09-25 19:06 ` Kalle Valo 2009-09-24 18:09 ` [PATCH 1/2] iw: update nl80211.h from wireless-testing Kalle Valo 2009-09-24 18:09 ` [PATCH 2/2] iw: print firmware and hardware version Kalle Valo 2009-09-24 20:20 ` [PATCH 0/2] cfg80211: " Luis R. Rodriguez 2009-09-25 4:42 ` John W. Linville 2009-09-25 16:47 ` Kalle Valo 2009-09-25 16:53 ` Luis R. Rodriguez 2009-10-01 1:13 ` John W. Linville 2009-10-01 1:19 ` John W. Linville [this message] 2009-10-01 1:19 ` [PATCH 1/3] wireless: implement basic ethtool support for cfg80211 devices John W. Linville 2009-10-01 1:19 ` [PATCH 2/3] cfg80211: add firmware and hardware version to wiphy John W. Linville 2009-10-01 1:19 ` [PATCH 3/3] at76c50x-usb: set firmware and hardware version in wiphy John W. Linville 2009-10-01 1:19 ` John W. Linville 2009-10-01 1:32 ` Ben Hutchings 2009-10-01 14:27 ` Kalle Valo 2009-10-01 1:30 ` [PATCH 1/3] wireless: implement basic ethtool support for cfg80211 devices Ben Hutchings 2009-10-01 8:51 ` Johannes Berg 2009-10-01 8:51 ` Johannes Berg 2009-10-01 14:18 ` [PATCH 0/2] cfg80211: firmware and hardware version Kalle Valo 2009-10-01 15:18 ` John W. Linville 2009-10-01 15:33 ` Ben Hutchings 2009-10-01 16:56 ` John W. Linville 2009-10-01 16:56 ` John W. Linville 2009-10-01 16:20 ` Kalle Valo 2009-10-01 17:07 ` John W. Linville 2009-10-01 19:56 ` Luis R. Rodriguez 2009-10-01 19:56 ` Luis R. Rodriguez 2009-10-01 20:12 ` Inaky Perez-Gonzalez
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1254359942-3483-1-git-send-email-linville@tuxdriver.com \ --to=linville@tuxdriver.com \ --cc=kalle.valo@iki.fi \ --cc=kalle.valo@nokia.com \ --cc=linux-wireless@vger.kernel.org \ --cc=mcgrof@gmail.com \ --cc=netdev@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.