mlx4_core: Support ICM tables in coherent memory

[pandora-kernel.git] / drivers / net / ps3_gelic_net.h

diff --git a/drivers/net/ps3_gelic_net.h b/drivers/net/ps3_gelic_net.h
index 5e1c286..a9c4c4f 100644 (file)
--- a/drivers/net/ps3_gelic_net.h
+++ b/drivers/net/ps3_gelic_net.h
@@ -28,21 +28,12 @@
 #ifndef _GELIC_NET_H
 #define _GELIC_NET_H
 
-#define GELIC_NET_DRV_NAME "Gelic Network Driver"
-#define GELIC_NET_DRV_VERSION "1.0"
-
-#define GELIC_NET_ETHTOOL               /* use ethtool */
-
-/* ioctl */
-#define GELIC_NET_GET_MODE              (SIOCDEVPRIVATE + 0)
-#define GELIC_NET_SET_MODE              (SIOCDEVPRIVATE + 1)
-
 /* descriptors */
 #define GELIC_NET_RX_DESCRIPTORS        128 /* num of descriptors */
 #define GELIC_NET_TX_DESCRIPTORS        128 /* num of descriptors */
 
-#define GELIC_NET_MAX_MTU               2308
-#define GELIC_NET_MIN_MTU               64
+#define GELIC_NET_MAX_MTU               VLAN_ETH_FRAME_LEN
+#define GELIC_NET_MIN_MTU               VLAN_ETH_ZLEN
 #define GELIC_NET_RXBUF_ALIGN           128
 #define GELIC_NET_RX_CSUM_DEFAULT       1 /* hw chksum */
 #define GELIC_NET_WATCHDOG_TIMEOUT      5*HZ
@@ -90,7 +81,8 @@ enum gelic_net_int1_status {
                                            */
 #define GELIC_NET_RXVLNPKT     0x00200000 /* VLAN packet */
 /* bit 20..16 reserved */
-#define GELIC_NET_RXRECNUM     0x0000ff00 /* reception receipt number */
+#define GELIC_NET_RXRRECNUM    0x0000ff00 /* reception receipt number */
+#define GELIC_NET_RXRRECNUM_SHIFT      8
 /* bit 7..0 reserved */
 
 #define GELIC_NET_TXDESC_TAIL          0
@@ -133,19 +125,19 @@ enum gelic_net_int1_status {
                                                      * interrupt status */
 
 #define GELIC_NET_DMAC_CMDSTAT_CHAIN_END  0x00000002 /* RXDCEIS:DMA stopped */
-#define GELIC_NET_DMAC_CMDSTAT_NOT_IN_USE 0xb0000000
 #define GELIC_NET_DESCR_IND_PROC_SHIFT    28
 #define GELIC_NET_DESCR_IND_PROC_MASKO    0x0fffffff
 
 
 enum gelic_net_descr_status {
-       GELIC_NET_DESCR_COMPLETE            = 0x00, /* used in rx and tx */
+       GELIC_NET_DESCR_COMPLETE            = 0x00, /* used in tx */
+       GELIC_NET_DESCR_BUFFER_FULL         = 0x00, /* used in rx */
        GELIC_NET_DESCR_RESPONSE_ERROR      = 0x01, /* used in rx and tx */
        GELIC_NET_DESCR_PROTECTION_ERROR    = 0x02, /* used in rx and tx */
        GELIC_NET_DESCR_FRAME_END           = 0x04, /* used in rx */
        GELIC_NET_DESCR_FORCE_END           = 0x05, /* used in rx and tx */
        GELIC_NET_DESCR_CARDOWNED           = 0x0a, /* used in rx and tx */
-       GELIC_NET_DESCR_NOT_IN_USE                  /* any other value */
+       GELIC_NET_DESCR_NOT_IN_USE          = 0x0b  /* any other value */
 };
 /* for lv1_net_control */
 #define GELIC_NET_GET_MAC_ADDRESS               0x0000000000000001
@@ -216,10 +208,10 @@ struct gelic_net_card {
 
        struct gelic_net_descr_chain tx_chain;
        struct gelic_net_descr_chain rx_chain;
+       int rx_dma_restart_required;
        /* gurad dmac descriptor chain*/
        spinlock_t chain_lock;
 
-       struct net_device_stats netdev_stats;
        int rx_csum;
        /* guard tx_dma_progress */
        spinlock_t tx_dma_lock;