p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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: David Ahern <dsa@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David Ahern 2016-06-13 13:44:17 -07:00 committed by David S. Miller
parent c9ad5a6568
commit cd2a9e62c8
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/vrf.c
View File

@ -861,7 +861,7 @@ static struct sk_buff *vrf_l3_rcv(struct net_device *vrf_dev,
#if IS_ENABLED(CONFIG_IPV6) #if IS_ENABLED(CONFIG_IPV6)
static struct dst_entry *vrf_get_rt6_dst(const struct net_device *dev, 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; struct dst_entry *dst = NULL;

6
include/net/l3mdev.h
View File

@ -38,7 +38,7 @@ struct l3mdev_ops {
/* IPv6 ops */ /* IPv6 ops */
struct dst_entry * (*l3mdev_get_rt6_dst)(const struct net_device *dev, 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 #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); 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 static inline
struct sk_buff *l3mdev_l3_rcv(struct sk_buff *skb, u16 proto) 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 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; return NULL;
} }

2
net/l3mdev/l3mdev.c
View File

@ -108,7 +108,7 @@ EXPORT_SYMBOL_GPL(l3mdev_fib_table_by_index);
*/ */
struct dst_entry *l3mdev_get_rt6_dst(struct net *net, struct dst_entry *l3mdev_get_rt6_dst(struct net *net,
const struct flowi6 *fl6) struct flowi6 *fl6)
{ {
struct dst_entry *dst = NULL; struct dst_entry *dst = NULL;
struct net_device *dev; struct net_device *dev;