diff options
| author | David S. Miller <davem@davemloft.net> | 2014-09-08 00:41:53 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-09-08 00:41:53 -0400 |
| commit | eb84d6b60491a3ca3d90d62ee5346b007770d40d (patch) | |
| tree | 22aadf9ada15e1ae5ba4c400aafab6f2541996e6 /drivers/net/ethernet/intel/i40evf | |
| parent | 97a13e5289baa96eaddd06e61d277457d837af3a (diff) | |
| parent | d030671f3f261e528dc6e396a13f10859a74ae7c (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/net/ethernet/intel/i40evf')
| -rw-r--r-- | drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c index 50cf5b8d0e15..04c7c1557a0c 100644 --- a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c +++ b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c | |||
| @@ -1599,7 +1599,7 @@ static netdev_tx_t i40e_xmit_frame_ring(struct sk_buff *skb, | |||
| 1599 | goto out_drop; | 1599 | goto out_drop; |
| 1600 | 1600 | ||
| 1601 | /* obtain protocol of skb */ | 1601 | /* obtain protocol of skb */ |
| 1602 | protocol = skb->protocol; | 1602 | protocol = vlan_get_protocol(skb); |
| 1603 | 1603 | ||
| 1604 | /* record the location of the first descriptor for this packet */ | 1604 | /* record the location of the first descriptor for this packet */ |
| 1605 | first = &tx_ring->tx_bi[tx_ring->next_to_use]; | 1605 | first = &tx_ring->tx_bi[tx_ring->next_to_use]; |