Merge branch 'sunvnet-next'

[cascardo/linux.git] / net / dsa / tag_trailer.c

diff --git a/net/dsa/tag_trailer.c b/net/dsa/tag_trailer.c
index 115fdca..e268f9d 100644 (file)
--- a/net/dsa/tag_trailer.c
+++ b/net/dsa/tag_trailer.c
@@ -57,8 +57,6 @@ static netdev_tx_t trailer_xmit(struct sk_buff *skb, struct net_device *dev)
        trailer[2] = 0x10;
        trailer[3] = 0x00;
 
-       nskb->protocol = htons(ETH_P_TRAILER);
-
        nskb->dev = p->parent->dst->master_netdev;
        dev_queue_xmit(nskb);