---

yaml --- r: 287948 b: refs/heads/master c: 11aad99 h: refs/heads/master v: v3
git-mirror · Feb 19, 2012 · 22c4fa9 · 22c4fa9
1 parent f1eecbf
commit 22c4fa9
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cd961c2ca98efbe7d738ca8720673fc03538b2b1
+refs/heads/master: 11aad99af6ef629ff3b05d1c9f0936589b204316
diff --git a/trunk/drivers/net/ethernet/atheros/atl1c/atl1c_main.c b/trunk/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
@@ -2244,10 +2244,6 @@ static netdev_tx_t atl1c_xmit_frame(struct sk_buff *skb,
 			dev_info(&adapter->pdev->dev, "tx locked\n");
 		return NETDEV_TX_LOCKED;
 	}
-	if (skb->mark == 0x01)
-		type = atl1c_trans_high;
-	else
-		type = atl1c_trans_normal;
 
 	if (atl1c_tpd_avail(adapter, type) < tpd_req) {
 		/* no enough descriptor, just stop queue */