Patch "macsec: set actual real device for xmit when !protect_frames" has been added to the 4.6-stable tree

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

macsec: set actual real device for xmit when !protect_frames

to the 4.6-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:
macsec-set-actual-real-device-for-xmit-when-protect_frames.patch
and it can be found in the queue-4.6 subdirectory.

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

From: Daniel Borkmann <[email protected]>
Date: Fri, 1 Jul 2016 00:00:54 +0200
Subject: macsec: set actual real device for xmit when !protect_frames

From: Daniel Borkmann <[email protected]>

[ Upstream commit 79c62220d74a4a3f961a2cb7320da09eebf5daf7 ]

Avoid recursions of dev_queue_xmit() to the wrong net device when frames are unprotected, since at that time skb->dev still points to our own macsec dev and unlike macsec_encrypt_finish() dev pointer doesn't get updated to real underlying device.

---
 drivers/net/macsec.c |    1 +
 1 file changed, 1 insertion(+)

@@ -2564,6 +2564,7 @@ static netdev_tx_t macsec_start_xmit(str
 		u64_stats_update_begin(&secy_stats->syncp);
 		secy_stats->stats.OutPktsUntagged++;
 		u64_stats_update_end(&secy_stats->syncp);
+		skb->dev = macsec->real_dev;
 		len = skb->len;
 		ret = dev_queue_xmit(skb);
 		count_tx(dev, ret, len);

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

queue-4.6/macsec-set-actual-real-device-for-xmit-when-protect_frames.patch