net: l3mdev: Remove const from flowi6 arg to get_rt6_dst

David Ahern · davem330 · commit cd2a9e62c8a3 · 2016-06-15T12:34:34.000-07:00
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 &lt;dsa@cumulusnetworks.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/drivers/net/vrf.c b/drivers/net/vrf.c
@@ -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;
 
diff --git a/include/net/l3mdev.h b/include/net/l3mdev.h
@@ -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;
 }
diff --git a/net/l3mdev/l3mdev.c b/net/l3mdev/l3mdev.c
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -861,7 +861,7 @@ static struct sk_buff vrf_l3_rcv(struct net_device vrf_dev,`
`861`	`861`
`862`	`862`	`#if IS_ENABLED(CONFIG_IPV6)`
`863`	`863`	`static struct dst_entry vrf_get_rt6_dst(const struct net_device dev,`
`864`		`- const struct flowi6 *fl6)`
	`864`	`+ struct flowi6 *fl6)`
`865`	`865`	`{`
`866`	`866`	`struct dst_entry *dst = NULL;`
`867`	`867`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ struct l3mdev_ops {`
`38`	`38`
`39`	`39`	`/* IPv6 ops */`
`40`	`40`	`struct dst_entry * (l3mdev_get_rt6_dst)(const struct net_device dev,`
`41`		`- const struct flowi6 *fl6);`
	`41`	`+ struct flowi6 *fl6);`
`42`	`42`	`};`
`43`	`43`
`44`	`44`	`#ifdef CONFIG_NET_L3_MASTER_DEV`
`@@ -139,7 +139,7 @@ static inline bool netif_index_is_l3_master(struct net *net, int ifindex)`
`139`	`139`
`140`	`140`	`int l3mdev_get_saddr(struct net net, int ifindex, struct flowi4 fl4);`
`141`	`141`
`142`		`-struct dst_entry l3mdev_get_rt6_dst(struct net net, const struct flowi6 *fl6);`
	`142`	`+struct dst_entry l3mdev_get_rt6_dst(struct net net, struct flowi6 *fl6);`
`143`	`143`
`144`	`144`	`static inline`
`145`	`145`	`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,`
`225`	`225`	`}`
`226`	`226`
`227`	`227`	`static inline`
`228`		`-struct dst_entry l3mdev_get_rt6_dst(struct net net, const struct flowi6 *fl6)`
	`228`	`+struct dst_entry l3mdev_get_rt6_dst(struct net net, struct flowi6 *fl6)`
`229`	`229`	`{`
`230`	`230`	`return NULL;`
`231`	`231`	`}`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ EXPORT_SYMBOL_GPL(l3mdev_fib_table_by_index);`
`108`	`108`	`*/`
`109`	`109`
`110`	`110`	`struct dst_entry l3mdev_get_rt6_dst(struct net net,`
`111`		`- const struct flowi6 *fl6)`
	`111`	`+ struct flowi6 *fl6)`
`112`	`112`	`{`
`113`	`113`	`struct dst_entry *dst = NULL;`
`114`	`114`	`struct net_device *dev;`