Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d07d7507 authored by Stanislaw Gruszka's avatar Stanislaw Gruszka Committed by David S. Miller
Browse files

net, wireless: overwrite default_ethtool_ops 



Since:

commit 2c60db03
Author: Eric Dumazet <edumazet@google.com>
Date:   Sun Sep 16 09:17:26 2012 +0000

    net: provide a default dev->ethtool_ops

wireless core does not correctly assign ethtool_ops.

After alloc_netdev*() call, some cfg80211 drivers provide they own
ethtool_ops, but some do not. For them, wireless core provide generic
cfg80211_ethtool_ops, which is assigned in NETDEV_REGISTER notify call:

        if (!dev->ethtool_ops)
                dev->ethtool_ops = &cfg80211_ethtool_ops;

But after Eric's commit, dev->ethtool_ops is no longer NULL (on cfg80211
drivers without custom ethtool_ops), but points to &default_ethtool_ops.

In order to fix the problem, provide function which will overwrite
default_ethtool_ops and use it by wireless core.

Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Acked-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Acked-by: default avatarBen Hutchings <bhutchings@solarflare.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f7e9e230

include/linux/netdevice.h

+3 −0
Original line number Diff line number Diff line
@@ -60,6 +60,9 @@ struct wireless_dev; 
#define SET_ETHTOOL_OPS(netdev,ops) \

	( (netdev)->ethtool_ops = (ops) )



extern void netdev_set_default_ethtool_ops(struct net_device *dev,

					   const struct ethtool_ops *ops);



/* hardware address assignment types */

#define NET_ADDR_PERM		0	/* address is permanent (default) */

#define NET_ADDR_RANDOM		1	/* address is generated randomly */

net/core/dev.c

+8 −0
Original line number Diff line number Diff line
@@ -6121,6 +6121,14 @@ struct netdev_queue *dev_ingress_queue_create(struct net_device *dev) 


static const struct ethtool_ops default_ethtool_ops;



void netdev_set_default_ethtool_ops(struct net_device *dev,

				    const struct ethtool_ops *ops)

{

	if (dev->ethtool_ops == &default_ethtool_ops)

		dev->ethtool_ops = ops;

}

EXPORT_SYMBOL_GPL(netdev_set_default_ethtool_ops);



/**

 *	alloc_netdev_mqs - allocate network device

 *	@sizeof_priv:	size of private data to allocate space for

net/wireless/core.c

+1 −2
Original line number Diff line number Diff line
@@ -866,8 +866,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;

		netdev_set_default_ethtool_ops(dev, &cfg80211_ethtool_ops);



		if ((wdev->iftype == NL80211_IFTYPE_STATION ||

		     wdev->iftype == NL80211_IFTYPE_P2P_CLIENT ||