Patch "via-rhine: fix VLAN receive handling regression." has been added to the 4.2-stable tree

This is a note to let you know that I've just added the patch titled

via-rhine: fix VLAN receive handling regression.

to the 4.2-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:
via-rhine-fix-vlan-receive-handling-regression.patch
and it can be found in the queue-4.2 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Andrej Ota <[email protected]>
Date: Thu, 15 Oct 2015 00:14:37 +0200
Subject: via-rhine: fix VLAN receive handling regression.

From: Andrej Ota <[email protected]>

[ Upstream commit 5f715c097965c0ad037f64393d0b95c50287775b ]

Because eth_type_trans() consumes ethernet header worth of bytes, a call to read TCI from end of packet using rhine_rx_vlan_tag() no longer works as it's reading from an invalid offset.

Tested to be working on PCEngines Alix board.

---
 drivers/net/ethernet/via/via-rhine.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

@@ -2134,10 +2134,11 @@ static int rhine_rx(struct net_device *d
 			}
 
 			skb_put(skb, pkt_len);
-			skb->protocol = eth_type_trans(skb, dev);
 
 			rhine_rx_vlan_tag(skb, desc, data_size);
 
+			skb->protocol = eth_type_trans(skb, dev);
+
 			netif_receive_skb(skb);
 
 			u64_stats_update_begin(&rp->rx_stats.syncp);

Patches currently in stable-queue which might be from [email protected] are

queue-4.2/via-rhine-fix-vlan-receive-handling-regression.patch