Skip to content

Commit

Permalink
net: l3mdev: Remove const from flowi6 arg to get_rt6_dst
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
David Ahern authored and davem330 committed Jun 15, 2016
1 parent c9ad5a6 commit cd2a9e6
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion drivers/net/vrf.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
6 changes: 3 additions & 3 deletions include/net/l3mdev.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion net/l3mdev/l3mdev.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit cd2a9e6

Please sign in to comment.