diff options
| author | Jay Cliburn <jacliburn@bellsouth.net> | 2008-10-29 17:01:36 +0100 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2008-10-31 05:46:34 +0100 |
| commit | dc5596d920b504d263c7ca38bd76326179b13dee (patch) | |
| tree | 2dcee3b1b6cd54decd335dec2abdf5de9f48c8a5 /drivers/net/atlx/atl1.h | |
| parent | SMC91x: delete unused local variable "lp" (diff) | |
| download | linux-dc5596d920b504d263c7ca38bd76326179b13dee.tar.xz linux-dc5596d920b504d263c7ca38bd76326179b13dee.zip | |
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.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/atlx/atl1.h b/drivers/net/atlx/atl1.h index a5015b14a429..ffa73fc8d95e 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 |