diff options
| author | David Ahern <dsa@cumulusnetworks.com> | 2016-05-10 11:19:51 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-05-11 19:31:40 -0400 |
| commit | 0b922b7a829c06e3b0790c58cd9ca026de86096e (patch) | |
| tree | b68c8a9b5148687c7bce7c6a5ab14e26a5c47050 /net/ipv4/ip_input.c | |
| parent | 74b20582ac389ee9f18a6fcc0eef244658ce8de0 (diff) | |
| download | linux-stable-0b922b7a829c06e3b0790c58cd9ca026de86096e.tar.gz linux-stable-0b922b7a829c06e3b0790c58cd9ca026de86096e.tar.bz2 linux-stable-0b922b7a829c06e3b0790c58cd9ca026de86096e.zip | |
net: original ingress device index in PKTINFO
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
add 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.
The previous patch moving the skb->dev change to L3 means nothing else
is needed for IPv6; it just works.
Signed-off-by: David Ahern <dsa@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ip_input.c')
| -rw-r--r-- | net/ipv4/ip_input.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv4/ip_input.c b/net/ipv4/ip_input.c index 37375eedeef9..4b351af3e67b 100644 --- a/net/ipv4/ip_input.c +++ b/net/ipv4/ip_input.c @@ -478,6 +478,7 @@ int ip_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt, /* Remove any debris in the socket control block */ memset(IPCB(skb), 0, sizeof(struct inet_skb_parm)); + IPCB(skb)->iif = skb->skb_iif; /* Must drop socket now because of tproxy. */ skb_orphan(skb); |