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

Commit cd2a9e62 authored by David Ahern's avatar David Ahern Committed by David S. Miller
Browse files

net: l3mdev: Remove const from flowi6 arg to get_rt6_dst 



Allow drivers to pass flow arg to functions where the arg is not const
and allow the driver to make updates as needed (eg., setting oif).

Signed-off-by: default avatarDavid Ahern <dsa@cumulusnetworks.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c9ad5a65

drivers/net/vrf.c

+1 −1
Original line number Diff line number Diff line
@@ -861,7 +861,7 @@ static struct sk_buff *vrf_l3_rcv(struct net_device *vrf_dev, 


#if IS_ENABLED(CONFIG_IPV6)

static struct dst_entry *vrf_get_rt6_dst(const struct net_device *dev,

					 const struct flowi6 *fl6)

					 struct flowi6 *fl6)

{

	struct dst_entry *dst = NULL;

include/net/l3mdev.h

+3 −3
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ struct l3mdev_ops { 


	/* IPv6 ops */

	struct dst_entry * (*l3mdev_get_rt6_dst)(const struct net_device *dev,

						 const struct flowi6 *fl6);

						 struct flowi6 *fl6);

};



#ifdef CONFIG_NET_L3_MASTER_DEV
@@ -139,7 +139,7 @@ static inline bool netif_index_is_l3_master(struct net *net, int ifindex) 


int l3mdev_get_saddr(struct net *net, int ifindex, struct flowi4 *fl4);



struct dst_entry *l3mdev_get_rt6_dst(struct net *net, const struct flowi6 *fl6);

struct dst_entry *l3mdev_get_rt6_dst(struct net *net, struct flowi6 *fl6);



static inline

struct sk_buff *l3mdev_l3_rcv(struct sk_buff *skb, u16 proto)
@@ -225,7 +225,7 @@ static inline int l3mdev_get_saddr(struct net *net, int ifindex, 
}



static inline

struct dst_entry *l3mdev_get_rt6_dst(struct net *net, const struct flowi6 *fl6)

struct dst_entry *l3mdev_get_rt6_dst(struct net *net, struct flowi6 *fl6)

{

	return NULL;

}

net/l3mdev/l3mdev.c

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ EXPORT_SYMBOL_GPL(l3mdev_fib_table_by_index); 
 */



struct dst_entry *l3mdev_get_rt6_dst(struct net *net,

				     const struct flowi6 *fl6)

				     struct flowi6 *fl6)

{

	struct dst_entry *dst = NULL;

	struct net_device *dev;