Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/borntraeger...

[firefly-linux-kernel-4.4.55.git] / net / dsa / tag_edsa.c

diff --git a/net/dsa/tag_edsa.c b/net/dsa/tag_edsa.c
index 94fcce7786796a8d534dd188ce8a6562e0543c9c..9aeda596f7ec4ec2c30df9167e87c7719535de91 100644 (file)
--- a/net/dsa/tag_edsa.c
+++ b/net/dsa/tag_edsa.c
@@ -76,8 +76,6 @@ static netdev_tx_t edsa_xmit(struct sk_buff *skb, struct net_device *dev)
                edsa_header[7] = 0x00;
        }
 
-       skb->protocol = htons(ETH_P_EDSA);
-
        skb->dev = p->parent->dst->master_netdev;
        dev_queue_xmit(skb);