diff options
| author |   David S. Miller <davem@davemloft.net> | 2014-11-06 22:01:18 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-11-06 22:01:18 -0500 |
| commit | 4e84b496fd2a226883920e0e0de4ed3f94898adf (patch) | |
| tree | 662e314870fabf5d6e3bf25b955bd537eb72de54 /drivers/net/ethernet/apm/xgene/xgene_enet_main.h | |
| parent | vxlan: Fix to enable UDP checksums on interface (diff) | |
| parent | netxen: Fix link event handling. (diff) | |
| download | linux-dev-4e84b496fd2a226883920e0e0de4ed3f94898adf.tar.xz linux-dev-4e84b496fd2a226883920e0e0de4ed3f94898adf.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/net/ethernet/apm/xgene/xgene_enet_main.h')
| -rw-r--r-- | drivers/net/ethernet/apm/xgene/xgene_enet_main.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.h b/drivers/net/ethernet/apm/xgene/xgene_enet_main.h index 874e5a01161f..f9958fae6ffd 100644 --- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.h +++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.h @@ -38,6 +38,9 @@ #define SKB_BUFFER_SIZE (XGENE_ENET_MAX_MTU - NET_IP_ALIGN) #define NUM_PKT_BUF 64 #define NUM_BUFPOOL 32 +#define START_ETH_BUFNUM 2 +#define START_BP_BUFNUM 0x22 +#define START_RING_NUM 8 #define PHY_POLL_LINK_ON (10 * HZ) #define PHY_POLL_LINK_OFF (PHY_POLL_LINK_ON / 5) @@ -83,7 +86,7 @@ struct xgene_mac_ops { }; struct xgene_port_ops { - void (*reset)(struct xgene_enet_pdata *pdata); + int (*reset)(struct xgene_enet_pdata *pdata); void (*cle_bypass)(struct xgene_enet_pdata *pdata, u32 dst_ring_num, u16 bufpool_id); void (*shutdown)(struct xgene_enet_pdata *pdata); |