X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=drivers%2Fnet%2Fsky2.h;h=6861b0e8db9a831e60f46a893630f2a1195e2000;hb=968a8516a4f6d76e022842ba774458044d80d12c;hp=80bdc404f1eaeb9c41332415ac2a618aef0a953d;hpb=4bfc2b2eccf48fef84b9adfe4f1bd8d5e6e1bc8d;p=mv-sheeva.git

diff --git a/drivers/net/sky2.h b/drivers/net/sky2.h
index 80bdc404f1e..6861b0e8db9 100644
--- a/drivers/net/sky2.h
+++ b/drivers/net/sky2.h
@@ -2236,11 +2236,8 @@ struct sky2_port {
 	u16		     rx_pending;
 	u16		     rx_data_size;
 	u16		     rx_nfrags;
-
-#ifdef SKY2_VLAN_TAG_USED
 	u16		     rx_tag;
-	struct vlan_group    *vlgrp;
-#endif
+
 	struct {
 		unsigned long last;
 		u32	mac_rp;
@@ -2284,6 +2281,7 @@ struct sky2_hw {
 #define SKY2_HW_AUTO_TX_SUM	0x00000040	/* new IP decode for Tx */
 #define SKY2_HW_ADV_POWER_CTL	0x00000080	/* additional PHY power regs */
 #define SKY2_HW_RSS_BROKEN	0x00000100
+#define SKY2_HW_VLAN_BROKEN     0x00000200
 
 	u8	     	     chip_id;
 	u8		     chip_rev;