OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire fileIgnore whitespace
Rev 2 Rev 3
Line 163... Line 163...
163 MV_GLOBAL_VTU_OP = 0x05, 163 MV_GLOBAL_VTU_OP = 0x05,
164 MV_GLOBAL_VTU_VID = 0x06, 164 MV_GLOBAL_VTU_VID = 0x06,
165 MV_GLOBAL_VTU_DATA1 = 0x07, 165 MV_GLOBAL_VTU_DATA1 = 0x07,
166 MV_GLOBAL_VTU_DATA2 = 0x08, 166 MV_GLOBAL_VTU_DATA2 = 0x08,
167 MV_GLOBAL_VTU_DATA3 = 0x09, 167 MV_GLOBAL_VTU_DATA3 = 0x09,
168 MV_GLOBAL_MONITOR_CTRL = 0x1a, -  
169 MV_GLOBAL_CONTROL2 = 0x1c, 168 MV_GLOBAL_CONTROL2 = 0x1c,
170 }; 169 };
171 #define MV_GLOBALREG(_type) MV_SWITCH_GLOBAL, MV_GLOBAL_##_type 170 #define MV_GLOBALREG(_type) MV_SWITCH_GLOBAL, MV_GLOBAL_##_type
Line 172... Line 171...
172   171  
Line 241... Line 240...
241 #define MV_FDB_HI_MASK 0x00ff 240 #define MV_FDB_HI_MASK 0x00ff
242 #define MV_FDB_LO_MASK 0xf000 241 #define MV_FDB_LO_MASK 0xf000
243 #define MV_FDB_HI_SHIFT 4 242 #define MV_FDB_HI_SHIFT 4
244 #define MV_FDB_LO_SHIFT 12 243 #define MV_FDB_LO_SHIFT 12
Line 245... Line -...
245   -  
246 #define MV_MIRROR_RX_DEST_MASK 0xf000 -  
247 #define MV_MIRROR_TX_DEST_MASK 0x0f00 -  
248 #define MV_MIRROR_RX_DEST_SHIFT 12 -  
249 #define MV_MIRROR_TX_DEST_SHIFT 8 -  
250   -  
251 #define MV_MIRROR_RX_SRC_SHIFT 4 -  
252 #define MV_MIRROR_RX_SRC_MASK (1 << MV_MIRROR_RX_SRC_SHIFT) -  
253 #define MV_MIRROR_TX_SRC_SHIFT 5 -  
254 #define MV_MIRROR_TX_SRC_MASK (1 << MV_MIRROR_TX_SRC_SHIFT) -  
255   244  
256 /* Marvell Specific PHY register */ 245 /* Marvell Specific PHY register */
257 #define MII_MV_SPEC_CTRL 16 246 #define MII_MV_SPEC_CTRL 16
258 enum { 247 enum {
259 MV_SPEC_MDI_CROSS_AUTO = (0x6 << 4), 248 MV_SPEC_MDI_CROSS_AUTO = (0x6 << 4),
Line 293... Line 282...
293 u16 vid; 282 u16 vid;
294 u32 port_mode; 283 u32 port_mode;
295 u32 port_sstate; 284 u32 port_sstate;
296 } vlans[MV_VLANS]; 285 } vlans[MV_VLANS];
Line 297... Line -...
297   -  
298 /* mirroring */ -  
299 bool mirror_rx; -  
300 bool mirror_tx; -  
301 int source_port; -  
302 int monitor_port; -  
303   286  
304 char buf[128]; 287 char buf[128];
Line 305... Line 288...
305 }; 288 };