Patch "net: vrf: Add missing Rx counters" has been added to the 4.9-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
net: vrf: Add missing Rx counters
to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
net-vrf-add-missing-rx-counters.patch
and it can be found in the queue-4.9 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From foo@baz Thu Jan 12 21:37:26 CET 2017
From: David Ahern <[email protected]>
Date: Tue, 3 Jan 2017 09:37:55 -0800
Subject: net: vrf: Add missing Rx counters
From: David Ahern <[email protected]>
[ Upstream commit 926d93a33e59b2729afdbad357233c17184de9d2 ]
The move from rx-handler to L3 receive handler inadvertantly dropped the rx counters. Restore them.
--- drivers/net/vrf.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/vrf.c +3 -0
@@ -968,6 +968,7 @@ static struct sk_buff *vrf_ip6_rcv(struc*/ need_strict =rt6_need_strict (&ipv6_hdr (skb)->daddr);if (!ipv6_ndisc_frame (skb) && !need_strict) { +vrf_rx_stats (vrf_dev, skb->len); skb->dev = vrf_dev; skb->skb_iif = vrf_dev->ifindex;
@@ -1009,6 +1010,8 @@ static struct sk_buff *vrf_ip_rcv(struct goto out; } +vrf_rx_stats (vrf_dev, skb->len); +skb_push (skb, skb->mac_len);dev_queue_xmit_nit (skb, vrf_dev);skb_pull (skb, skb->mac_len);
Patches currently in stable-queue which might be from [email protected] are
queue-4.9/net-vrf-drop-conntrack-data-after-pass-through-vrf-device-on-tx.patch queue-4.9/net-ipv4-fix-multipath-selection-with-vrf.patch queue-4.9/net-ipv4-dst-for-local-input-routes-should-use-l3mdev-if-relevant.patch queue-4.9/net-vrf-add-missing-rx-counters.patch queue-4.9/net-vrf-do-not-allow-table-id-0.patch queue-4.9/net-vrf-fix-nat-within-a-vrf.patch queue-4.9/net-fix-incorrect-original-ingress-device-index-in-pktinfo.patch