|
@@ -7227,11 +7227,11 @@ netdev_tx_t ixgbe_xmit_frame_ring(struct sk_buff *skb,
|
|
if (!vhdr)
|
|
if (!vhdr)
|
|
goto out_drop;
|
|
goto out_drop;
|
|
|
|
|
|
- protocol = vhdr->h_vlan_encapsulated_proto;
|
|
|
|
tx_flags |= ntohs(vhdr->h_vlan_TCI) <<
|
|
tx_flags |= ntohs(vhdr->h_vlan_TCI) <<
|
|
IXGBE_TX_FLAGS_VLAN_SHIFT;
|
|
IXGBE_TX_FLAGS_VLAN_SHIFT;
|
|
tx_flags |= IXGBE_TX_FLAGS_SW_VLAN;
|
|
tx_flags |= IXGBE_TX_FLAGS_SW_VLAN;
|
|
}
|
|
}
|
|
|
|
+ protocol = vlan_get_protocol(skb);
|
|
|
|
|
|
if (unlikely(skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP) &&
|
|
if (unlikely(skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP) &&
|
|
adapter->ptp_clock &&
|
|
adapter->ptp_clock &&
|