From: Dan Williams <dcbw@redhat.com>
To: Johannes Berg <johannes@sipsolutions.net>
Cc: linux-wireless@vger.kernel.org, Johannes Berg <johannes.berg@intel.com>
Subject: Re: [PATCH] Revert "wireless: Support of IFLA_INFO_KIND rtnl attribute"
Date: Mon, 19 Jan 2015 13:22:04 -0600 [thread overview]
Message-ID: <1421695324.23826.9.camel@dcbw.local> (raw)
In-Reply-To: <1421689943-13264-1-git-send-email-johannes@sipsolutions.net>
On Mon, 2015-01-19 at 18:52 +0100, Johannes Berg wrote:
> From: Johannes Berg <johannes.berg@intel.com>
>
> This reverts commit ba1debdfed974f25aa598c283567878657b292ee.
>
> Oliver reported that it breaks network-manager, for some reason with
> this patch NM decides that the device isn't wireless but "generic"
> (ethernet), sees no carrier (as expected with wifi) and fails to do
> anything else with it.
Hmm, which NM version? NM uses either DEVTYPE (from 'uevent' in sysfs),
the phy80211 link in sysfs, or (if enabled) WEXT to figure out whether a
network interface with arptype=1 is WiFi or not. I can't think of why
IFLA_INFO_KIND would break that... what are the userspace visible
effects of the patch before reversion?
Dan
> Revert this to unbreak userspace.
>
> Reported-by: Oliver Hartkopp <socketcan@hartkopp.net>
> Tested-by: Oliver Hartkopp <socketcan@hartkopp.net>
> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
> ---
> net/wireless/core.c | 6 ------
> 1 file changed, 6 deletions(-)
>
> diff --git a/net/wireless/core.c b/net/wireless/core.c
> index 456e4c38c279..3af0ecf1cc16 100644
> --- a/net/wireless/core.c
> +++ b/net/wireless/core.c
> @@ -21,7 +21,6 @@
> #include <linux/sched.h>
> #include <net/genetlink.h>
> #include <net/cfg80211.h>
> -#include <net/rtnetlink.h>
> #include "nl80211.h"
> #include "core.h"
> #include "sysfs.h"
> @@ -964,10 +963,6 @@ void cfg80211_stop_iface(struct wiphy *wiphy, struct wireless_dev *wdev,
> }
> EXPORT_SYMBOL(cfg80211_stop_iface);
>
> -static const struct rtnl_link_ops wireless_link_ops = {
> - .kind = "wlan",
> -};
> -
> static int cfg80211_netdev_notifier_call(struct notifier_block *nb,
> unsigned long state, void *ptr)
> {
> @@ -986,7 +981,6 @@ static int cfg80211_netdev_notifier_call(struct notifier_block *nb,
> switch (state) {
> case NETDEV_POST_INIT:
> SET_NETDEV_DEVTYPE(dev, &wiphy_type);
> - dev->rtnl_link_ops = &wireless_link_ops;
> break;
> case NETDEV_REGISTER:
> /*
next prev parent reply other threads:[~2015-01-19 19:22 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-19 17:52 [PATCH] Revert "wireless: Support of IFLA_INFO_KIND rtnl attribute" Johannes Berg
2015-01-19 18:02 ` Johannes Berg
2015-01-19 18:32 ` Vadim Kochan
2015-01-19 19:22 ` Dan Williams [this message]
2015-01-19 21:09 ` Dan Williams
2015-01-19 21:51 ` Dan Williams
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=1421695324.23826.9.camel@dcbw.local \
--to=dcbw@redhat.com \
--cc=johannes.berg@intel.com \
--cc=johannes@sipsolutions.net \
--cc=linux-wireless@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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).