mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-26 11:28:28 +00:00
net: l3mdev: remove get_rtable method
No longer used Signed-off-by: David Ahern <dsa@cumulusnetworks.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
ca28b8f2b8
commit
afb460fe0e
@ -843,26 +843,6 @@ static u32 vrf_fib_table(const struct net_device *dev)
|
||||
return vrf->tb_id;
|
||||
}
|
||||
|
||||
static struct rtable *vrf_get_rtable(const struct net_device *dev,
|
||||
const struct flowi4 *fl4)
|
||||
{
|
||||
struct rtable *rth = NULL;
|
||||
|
||||
if (!(fl4->flowi4_flags & FLOWI_FLAG_L3MDEV_SRC)) {
|
||||
struct net_vrf *vrf = netdev_priv(dev);
|
||||
|
||||
rcu_read_lock();
|
||||
|
||||
rth = rcu_dereference(vrf->rth);
|
||||
if (likely(rth))
|
||||
dst_hold(&rth->dst);
|
||||
|
||||
rcu_read_unlock();
|
||||
}
|
||||
|
||||
return rth;
|
||||
}
|
||||
|
||||
static int vrf_rcv_finish(struct net *net, struct sock *sk, struct sk_buff *skb)
|
||||
{
|
||||
return 0;
|
||||
@ -1088,7 +1068,6 @@ static struct dst_entry *vrf_link_scope_lookup(const struct net_device *dev,
|
||||
|
||||
static const struct l3mdev_ops vrf_l3mdev_ops = {
|
||||
.l3mdev_fib_table = vrf_fib_table,
|
||||
.l3mdev_get_rtable = vrf_get_rtable,
|
||||
.l3mdev_l3_rcv = vrf_l3_rcv,
|
||||
.l3mdev_l3_out = vrf_l3_out,
|
||||
#if IS_ENABLED(CONFIG_IPV6)
|
||||
|
@ -23,8 +23,6 @@
|
||||
*
|
||||
* @l3mdev_l3_out: Hook in L3 output path
|
||||
*
|
||||
* @l3mdev_get_rtable: Get cached IPv4 rtable (dst_entry) for device
|
||||
*
|
||||
* @l3mdev_link_scope_lookup: IPv6 lookup for linklocal and mcast destinations
|
||||
*/
|
||||
|
||||
@ -36,10 +34,6 @@ struct l3mdev_ops {
|
||||
struct sock *sk, struct sk_buff *skb,
|
||||
u16 proto);
|
||||
|
||||
/* IPv4 ops */
|
||||
struct rtable * (*l3mdev_get_rtable)(const struct net_device *dev,
|
||||
const struct flowi4 *fl4);
|
||||
|
||||
/* IPv6 ops */
|
||||
struct dst_entry * (*l3mdev_link_scope_lookup)(const struct net_device *dev,
|
||||
struct flowi6 *fl6);
|
||||
@ -120,15 +114,6 @@ static inline u32 l3mdev_fib_table(const struct net_device *dev)
|
||||
return tb_id;
|
||||
}
|
||||
|
||||
static inline struct rtable *l3mdev_get_rtable(const struct net_device *dev,
|
||||
const struct flowi4 *fl4)
|
||||
{
|
||||
if (netif_is_l3_master(dev) && dev->l3mdev_ops->l3mdev_get_rtable)
|
||||
return dev->l3mdev_ops->l3mdev_get_rtable(dev, fl4);
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static inline bool netif_index_is_l3_master(struct net *net, int ifindex)
|
||||
{
|
||||
struct net_device *dev;
|
||||
@ -241,12 +226,6 @@ static inline u32 l3mdev_fib_table_by_index(struct net *net, int ifindex)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline struct rtable *l3mdev_get_rtable(const struct net_device *dev,
|
||||
const struct flowi4 *fl4)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static inline bool netif_index_is_l3_master(struct net *net, int ifindex)
|
||||
{
|
||||
return false;
|
||||
|
Loading…
Reference in New Issue
Block a user