From: David S. Miller Date: Wed, 11 May 2016 23:31:40 +0000 (-0400) Subject: Merge branch 'vrf-pktinfo' X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=c3f1010b30f7fc611139cfb702a8685741aa6827;hp=-c;p=deliverable%2Flinux.git Merge branch 'vrf-pktinfo' David Ahern says: ==================== net: vrf: Fixup PKTINFO to return enslaved device index Applications such as OSPF and BFD need the original ingress device not the VRF device; the latter can be derived from the former. To that end move the packet intercept from an rx handler that is invoked by __netif_receive_skb_core to the ipv4 and ipv6 receive processing. IPv6 already saves the skb_iif to the control buffer in ipv6_rcv. Since the skb->dev has not been switched the cb has the enslaved device. Make the same happen for IPv4 by adding the skb_iif to inet_skb_parm and set it in ipv4 code after clearing the skb control buffer similar to IPv6. From there the pktinfo can just pull it from cb with the PKTINFO_SKB_CB cast. ==================== Signed-off-by: David S. Miller --- c3f1010b30f7fc611139cfb702a8685741aa6827