X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=net%2Fcore%2Fnetpoll.c;h=209d84253dd50ae02b2b9f2b616cc7ff8d013efe;hb=86a9bad3ab6b6f858fd4443b48738cabbb6d094c;hp=8de961e67cf7d5df9d150fa8c92bd0d789237a08;hpb=1fd9b1fc310314911f66d2f14a8e4f0ef37bf47b;p=~andy%2Flinux

diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index 8de961e67cf..209d84253dd 100644
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -383,8 +383,9 @@ void netpoll_send_skb_on_dev(struct netpoll *np, struct sk_buff *skb,
 			if (__netif_tx_trylock(txq)) {
 				if (!netif_xmit_stopped(txq)) {
 					if (vlan_tx_tag_present(skb) &&
-					    !(netif_skb_features(skb) & NETIF_F_HW_VLAN_CTAG_TX)) {
-						skb = __vlan_put_tag(skb, vlan_tx_tag_get(skb));
+					    !vlan_hw_offload_capable(netif_skb_features(skb),
+								     skb->vlan_proto)) {
+						skb = __vlan_put_tag(skb, skb->vlan_proto, vlan_tx_tag_get(skb));
 						if (unlikely(!skb))
 							break;
 						skb->vlan_tci = 0;