File tree Expand file tree Collapse file tree 2 files changed +132
-185
lines changed
drivers/net/ethernet/freescale Expand file tree Collapse file tree 2 files changed +132
-185
lines changed Original file line number Diff line number Diff line change @@ -448,33 +448,34 @@ struct bufdesc_ex {
448
448
/* Controller supports RACC register */
449
449
#define FEC_QUIRK_HAS_RACC (1 << 12)
450
450
451
+ struct bufdesc_prop {
452
+ int qid ;
453
+ /* Address of Rx and Tx buffers */
454
+ struct bufdesc * base ;
455
+ struct bufdesc * last ;
456
+ struct bufdesc * cur ;
457
+ dma_addr_t dma ;
458
+ unsigned short ring_size ;
459
+ unsigned char dsize ;
460
+ unsigned char dsize_log2 ;
461
+ };
462
+
451
463
struct fec_enet_priv_tx_q {
452
- int index ;
464
+ struct bufdesc_prop bd ;
453
465
unsigned char * tx_bounce [TX_RING_SIZE ];
454
466
struct sk_buff * tx_skbuff [TX_RING_SIZE ];
455
467
456
- dma_addr_t bd_dma ;
457
- struct bufdesc * tx_bd_base ;
458
- uint tx_ring_size ;
459
-
460
468
unsigned short tx_stop_threshold ;
461
469
unsigned short tx_wake_threshold ;
462
470
463
- struct bufdesc * cur_tx ;
464
471
struct bufdesc * dirty_tx ;
465
472
char * tso_hdrs ;
466
473
dma_addr_t tso_hdrs_dma ;
467
474
};
468
475
469
476
struct fec_enet_priv_rx_q {
470
- int index ;
477
+ struct bufdesc_prop bd ;
471
478
struct sk_buff * rx_skbuff [RX_RING_SIZE ];
472
-
473
- dma_addr_t bd_dma ;
474
- struct bufdesc * rx_bd_base ;
475
- uint rx_ring_size ;
476
-
477
- struct bufdesc * cur_rx ;
478
479
};
479
480
480
481
/* The FEC buffer descriptors track the ring buffers. The rx_bd_base and
@@ -514,8 +515,6 @@ struct fec_enet_private {
514
515
unsigned long work_ts ;
515
516
unsigned long work_mdio ;
516
517
517
- unsigned short bufdesc_size ;
518
-
519
518
struct platform_device * pdev ;
520
519
521
520
int dev_id ;
You can’t perform that action at this time.
0 commit comments