Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2014-09-07 21:41:53 -07:00
parent 97a13e5289 d030671f3f
commit eb84d6b604
694 changed files with 6362 additions and 3447 deletions
--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
@@ -2323,7 +2323,7 @@ static netdev_tx_t i40e_xmit_frame_ring(struct sk_buff *skb,
 		goto out_drop;

 	/* obtain protocol of skb */
-	protocol = skb->protocol;
+	protocol = vlan_get_protocol(skb);

 	/* record the location of the first descriptor for this packet */
 	first = &tx_ring->tx_bi[tx_ring->next_to_use];