diff options
author | David Ahern <dsa@cumulusnetworks.com> | 2016-09-10 12:09:53 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-09-10 23:12:52 -0700 |
commit | a8e3e1a9f02094145580ea7920c6a1d9aabd5539 (patch) | |
tree | 1bedde4339e71fa07c4f73d27cfc807ec9220120 /net/ipv6/ip6_output.c | |
parent | 9ee0034b8f49aaaa7e7c2da8db1038915db99c19 (diff) | |
download | linux-stable-a8e3e1a9f02094145580ea7920c6a1d9aabd5539.tar.gz linux-stable-a8e3e1a9f02094145580ea7920c6a1d9aabd5539.tar.bz2 linux-stable-a8e3e1a9f02094145580ea7920c6a1d9aabd5539.zip |
net: l3mdev: Add hook to output path
This patch adds the infrastructure to the output path to pass an skb
to an l3mdev device if it has a hook registered. This is the Tx parallel
to l3mdev_ip{6}_rcv in the receive path and is the basis for removing
the existing hook that returns the vrf dst on the fib lookup.
Signed-off-by: David Ahern <dsa@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/ip6_output.c')
-rw-r--r-- | net/ipv6/ip6_output.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index 993fd9666f1b..6ea6caace3a8 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c @@ -236,6 +236,14 @@ int ip6_xmit(const struct sock *sk, struct sk_buff *skb, struct flowi6 *fl6, if ((skb->len <= mtu) || skb->ignore_df || skb_is_gso(skb)) { IP6_UPD_PO_STATS(net, ip6_dst_idev(skb_dst(skb)), IPSTATS_MIB_OUT, skb->len); + + /* if egress device is enslaved to an L3 master device pass the + * skb to its handler for processing + */ + skb = l3mdev_ip6_out((struct sock *)sk, skb); + if (unlikely(!skb)) + return 0; + /* hooks should never assume socket lock is held. * we promote our socket to non const */ |