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

Commit e71ba91e authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'mac80211-for-davem-2016-06-09' of... 

Merge tag 'mac80211-for-davem-2016-06-09' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211



Johannes Berg says:

====================
Two more fixes for now:
 * a fix for a long-standing iwpriv 32/64 compat issue
 * two fairly recently introduced (4.6) warning asking for
   symmetric operations are erroneous and I remove them
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 60d6f36f 3d5fdff4

net/wireless/core.c

+0 −2
Original line number Diff line number Diff line
@@ -363,8 +363,6 @@ struct wiphy *wiphy_new_nm(const struct cfg80211_ops *ops, int sizeof_priv, 
	WARN_ON(ops->remain_on_channel && !ops->cancel_remain_on_channel);

	WARN_ON(ops->tdls_channel_switch && !ops->tdls_cancel_channel_switch);

	WARN_ON(ops->add_tx_ts && !ops->del_tx_ts);

	WARN_ON(ops->set_tx_power && !ops->get_tx_power);

	WARN_ON(ops->set_antenna && !ops->get_antenna);



	alloc_size = sizeof(*rdev) + sizeof_priv;

net/wireless/wext-core.c

+23 −2
Original line number Diff line number Diff line
@@ -958,8 +958,29 @@ static int wireless_process_ioctl(struct net *net, struct ifreq *ifr, 
			return private(dev, iwr, cmd, info, handler);

	}

	/* Old driver API : call driver ioctl handler */

	if (dev->netdev_ops->ndo_do_ioctl)

	if (dev->netdev_ops->ndo_do_ioctl) {

#ifdef CONFIG_COMPAT

		if (info->flags & IW_REQUEST_FLAG_COMPAT) {

			int ret = 0;

			struct iwreq iwr_lcl;

			struct compat_iw_point *iwp_compat = (void *) &iwr->u.data;



			memcpy(&iwr_lcl, iwr, sizeof(struct iwreq));

			iwr_lcl.u.data.pointer = compat_ptr(iwp_compat->pointer);

			iwr_lcl.u.data.length = iwp_compat->length;

			iwr_lcl.u.data.flags = iwp_compat->flags;



			ret = dev->netdev_ops->ndo_do_ioctl(dev, (void *) &iwr_lcl, cmd);



			iwp_compat->pointer = ptr_to_compat(iwr_lcl.u.data.pointer);

			iwp_compat->length = iwr_lcl.u.data.length;

			iwp_compat->flags = iwr_lcl.u.data.flags;



			return ret;

		} else

#endif

			return dev->netdev_ops->ndo_do_ioctl(dev, ifr, cmd);

	}

	return -EOPNOTSUPP;

}