Ben Greear <greearb@xxxxxxxxxxxxxxx> writes: > net/core/dev.c now assigns a default ethtool ops, so > the net/wireless/core.c check for existing ops is always true > so the wireless ops would never be assigned. > > Simply remove the check for existing ops and always assign > the wireless ops. > > Signed-off-by: Ben Greear <greearb@xxxxxxxxxxxxxxx> > --- > net/wireless/core.c | 3 +-- > 1 files changed, 1 insertions(+), 2 deletions(-) > > diff --git a/net/wireless/core.c b/net/wireless/core.c > index 4e6fe62..6309699 100644 > --- a/net/wireless/core.c > +++ b/net/wireless/core.c > @@ -863,8 +863,7 @@ static int cfg80211_netdev_notifier_call(struct notifier_block *nb, > /* allow mac80211 to determine the timeout */ > wdev->ps_timeout = -1; > > - if (!dev->ethtool_ops) > - dev->ethtool_ops = &cfg80211_ethtool_ops; > + dev->ethtool_ops = &cfg80211_ethtool_ops; > > if ((wdev->iftype == NL80211_IFTYPE_STATION || > wdev->iftype == NL80211_IFTYPE_P2P_CLIENT || Won't this break drivers which for some reason have their own ethtool_ops? bjorn@nemi:/usr/local/src/git/linux$ git grep -- "->ethtool_ops" drivers/net/wireless/ drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c: ndev->ethtool_ops = &brcmf_ethtool_ops; drivers/net/wireless/ipw2x00/ipw2100.c: dev->ethtool_ops = &ipw2100_ethtool_ops; drivers/net/wireless/ipw2x00/ipw2200.c: net_dev->ethtool_ops = &ipw_ethtool_ops; drivers/net/wireless/libertas/main.c: dev->ethtool_ops = &lbs_ethtool_ops; drivers/net/wireless/libertas/mesh.c: mesh_dev->ethtool_ops = &lbs_ethtool_ops; drivers/net/wireless/prism54/islpci_dev.c: ndev->ethtool_ops = &islpci_ethtool_ops; Bjørn -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
