Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Rejecting non-native endian BTF overlapped with the addition
of support for it.

The rest were more simple overlapping changes, except the
renesas ravb binding update, which had to follow a file
move as well as a YAML conversion.

Signed-off-by: David S. Miller <davem@davemloft.net>
Esse commit está contido em:
David S. Miller
2020-10-05 17:33:26 -07:00
355 arquivos alterados com 3476 adições e 1834 exclusões

Ver arquivo

@@ -670,9 +670,10 @@ bool qtnf_netdev_is_qtn(const struct net_device *ndev)
return ndev->netdev_ops == &qtnf_netdev_ops;
}
static int qtnf_check_br_ports(struct net_device *dev, void *data)
static int qtnf_check_br_ports(struct net_device *dev,
struct netdev_nested_priv *priv)
{
struct net_device *ndev = data;
struct net_device *ndev = (struct net_device *)priv->data;
if (dev != ndev && netdev_port_same_parent_id(dev, ndev))
return -ENOTSUPP;
@@ -685,6 +686,9 @@ static int qtnf_core_netdevice_event(struct notifier_block *nb,
{
struct net_device *ndev = netdev_notifier_info_to_dev(ptr);
const struct netdev_notifier_changeupper_info *info;
struct netdev_nested_priv priv = {
.data = (void *)ndev,
};
struct net_device *brdev;
struct qtnf_vif *vif;
struct qtnf_bus *bus;
@@ -724,7 +728,7 @@ static int qtnf_core_netdevice_event(struct notifier_block *nb,
} else {
ret = netdev_walk_all_lower_dev(brdev,
qtnf_check_br_ports,
ndev);
&priv);
}
break;