X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=drivers%2Fnet%2F8139cp.c;h=ac422cd332eadd687823fcc4db7ca2eaef997fea;hb=6fe8efb2211fe61caa7b0e1c36c521670b8a10a9;hp=4a4f6b81e32de9ae8c85f9dd6aa379927d0ffaa0;hpb=628cfe870f0b413b0a15b26fe3b949eb02fe2dc2;p=deliverable%2Flinux.git

diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c
index 4a4f6b81e32d..ac422cd332ea 100644
--- a/drivers/net/8139cp.c
+++ b/drivers/net/8139cp.c
@@ -561,7 +561,7 @@ rx_status_loop:
 		if (cp_rx_csum_ok(status))
 			skb->ip_summed = CHECKSUM_UNNECESSARY;
 		else
-			skb->ip_summed = CHECKSUM_NONE;
+			skb_checksum_none_assert(skb);
 
 		skb_put(skb, len);
 
@@ -754,7 +754,7 @@ static netdev_tx_t cp_start_xmit (struct sk_buff *skb,
 	}
 
 #if CP_VLAN_TAG_USED
-	if (cp->vlgrp && vlan_tx_tag_present(skb))
+	if (vlan_tx_tag_present(skb))
 		vlan_tag = TxVlanTag | swab16(vlan_tx_tag_get(skb));
 #endif