summaryrefslogtreecommitdiffstats
path: root/drivers/net/atlx/atl1.h
diff options
context:
space:
mode:
authorJay Cliburn <jacliburn@bellsouth.net>2008-10-29 11:01:36 -0500
committerJeff Garzik <jgarzik@redhat.com>2008-10-31 00:46:34 -0400
commitdc5596d920b504d263c7ca38bd76326179b13dee (patch)
tree2dcee3b1b6cd54decd335dec2abdf5de9f48c8a5 /drivers/net/atlx/atl1.h
parent51ac3beffd4afaea4350526cf01fe74aaff25eff (diff)
downloadop-kernel-dev-dc5596d920b504d263c7ca38bd76326179b13dee.zip
op-kernel-dev-dc5596d920b504d263c7ca38bd76326179b13dee.tar.gz
atl1: fix vlan tag regression
Commit 401c0aabec4b97320f962a0161a846d230a6f7aa introduced a regression in the atl1 driver by storing the VLAN tag in the wrong TX descriptor field. This patch causes the VLAN tag to be stored in its proper location. Tested-by: Ramon Casellas <ramon.casellas@cttc.es> Signed-off-by: Jay Cliburn <jacliburn@bellsouth.net> Cc: stable@kernel.org Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/net/atlx/atl1.h')
-rw-r--r--drivers/net/atlx/atl1.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/atlx/atl1.h b/drivers/net/atlx/atl1.h
index a5015b1..ffa73fc 100644
--- a/drivers/net/atlx/atl1.h
+++ b/drivers/net/atlx/atl1.h
@@ -504,7 +504,7 @@ struct rx_free_desc {
#define TPD_PKTNT_MASK 0x0001
#define TPD_PKTINT_SHIFT 15
#define TPD_VLANTAG_MASK 0xFFFF
-#define TPD_VLAN_SHIFT 16
+#define TPD_VLANTAG_SHIFT 16
/* tpd word 3 bits 0:13 */
#define TPD_EOP_MASK 0x0001
OpenPOWER on IntegriCloud