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

Commit ee9b9596 authored by Nicolas Dichtel's avatar Nicolas Dichtel Committed by David S. Miller
Browse files

ipmr,ip6mr: implement ndo_get_iflink 



Don't use dev->iflink anymore.

Signed-off-by: default avatarNicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1e99584b

net/ipv4/ipmr.c

+6 −1
Original line number Diff line number Diff line
@@ -473,8 +473,14 @@ static netdev_tx_t reg_vif_xmit(struct sk_buff *skb, struct net_device *dev) 
	return NETDEV_TX_OK;

}



static int reg_vif_get_iflink(const struct net_device *dev)

{

	return 0;

}



static const struct net_device_ops reg_vif_netdev_ops = {

	.ndo_start_xmit	= reg_vif_xmit,

	.ndo_get_iflink = reg_vif_get_iflink,

};



static void reg_vif_setup(struct net_device *dev)
@@ -509,7 +515,6 @@ static struct net_device *ipmr_reg_vif(struct net *net, struct mr_table *mrt) 
		free_netdev(dev);

		return NULL;

	}

	dev->iflink = 0;



	rcu_read_lock();

	in_dev = __in_dev_get_rcu(dev);

net/ipv6/ip6mr.c

+6 −1
Original line number Diff line number Diff line
@@ -718,8 +718,14 @@ static netdev_tx_t reg_vif_xmit(struct sk_buff *skb, 
	return NETDEV_TX_OK;

}



static int reg_vif_get_iflink(const struct net_device *dev)

{

	return 0;

}



static const struct net_device_ops reg_vif_netdev_ops = {

	.ndo_start_xmit	= reg_vif_xmit,

	.ndo_get_iflink = reg_vif_get_iflink,

};



static void reg_vif_setup(struct net_device *dev)
@@ -752,7 +758,6 @@ static struct net_device *ip6mr_reg_vif(struct net *net, struct mr6_table *mrt) 
		free_netdev(dev);

		return NULL;

	}

	dev->iflink = 0;



	if (dev_open(dev))

		goto failure;