Update Chelsio gige net driver.
- Use extern prefix for functions required. - Removed a lot of wrappers, including t1_read/write_reg_4. - Removed various macros, using native kernel calls now. - Enumerated various #defines. - Removed a lot of shared code which is not currently used in "NIC only" mode. - Removed dead code. Documentation/networking/cxgb.txt: - Updated release notes for version 2.1.1 drivers/net/chelsio/ch_ethtool.h - removed file, no longer using ETHTOOL namespace. drivers/net/chelsio/common.h - moved code from osdep.h to common.h - added comment to #endif indicating which symbol it closes. drivers/net/chelsio/cphy.h - removed dead code. - added comment to #endif indicating which symbol it closes. drivers/net/chelsio/cxgb2.c - use DMA_{32,64}BIT_MASK in include/linux/dma-mapping.h. - removed unused code. - use printk message for link info resembling drivers/net/mii.c. - no longer using the MODULE_xxx namespace. - no longer using "pci_" namespace. - no longer using ETHTOOL namespace. drivers/net/chelsio/cxgb2.h - removed file, merged into common.h drivers/net/chelsio/elmer0.h - removed dead code. - added various enums. - added comment to #endif indicating which symbol it closes. drivers/net/chelsio/espi.c - removed various macros, using native kernel calls now. - removed a lot of wrappers, including t1_read/write_reg_4. drivers/net/chelsio/espi.h - added comment to #endif indicating which symbol it closes. drivers/net/chelsio/gmac.h - added comment to #endif indicating which symbol it closes. drivers/net/chelsio/mv88x201x.c - changes to sync with Chelsio TOT. drivers/net/chelsio/osdep.h - removed file, consolidation. osdep was used to translate wrapper functions since our code supports multiple OSs. removed wrappers. drivers/net/chelsio/pm3393.c - removed various macros, using native kernel calls now. - removed a lot of wrappers, including t1_read/write_reg_4. - removed unused code. drivers/net/chelsio/regs.h - added a few register entries for future and current feature support. - added comment to #endif indicating which symbol it closes. drivers/net/chelsio/sge.c - rewrote large portion of scatter-gather engine to stabilize performance. - using u8/u16/u32 kernel types instead of __u8/__u16/__u32 compiler types. drivers/net/chelsio/sge.h - rewrote large portion of scatter-gather engine to stabilize performance. - added comment to #endif indicating which symbol it closes. drivers/net/chelsio/subr.c - merged tp.c into subr.c - removed various macros, using native kernel calls now. - removed a lot of wrappers, including t1_read/write_reg_4. - removed unused code. drivers/net/chelsio/suni1x10gexp_regs.h - modified copyright and authorship of file. - added comment to #endif indicating which symbol it closes. drivers/net/chelsio/tp.c - removed file, merged into subr.c. drivers/net/chelsio/tp.h - removed file. include/linux/pci_ids.h - patched to include PCI_VENDOR_ID_CHELSIO 0x1425, removed define from our code.
This commit is contained in:

committed by
Jeff Garzik

parent
a532434395
commit
559fb51ba7
@@ -1,8 +1,8 @@
|
||||
/*****************************************************************************
|
||||
* *
|
||||
* File: cpl5_cmd.h *
|
||||
* $Revision: 1.4 $ *
|
||||
* $Date: 2005/03/23 07:15:58 $ *
|
||||
* $Revision: 1.6 $ *
|
||||
* $Date: 2005/06/21 18:29:47 $ *
|
||||
* Description: *
|
||||
* part of the Chelsio 10Gb Ethernet Driver. *
|
||||
* *
|
||||
@@ -36,8 +36,8 @@
|
||||
* *
|
||||
****************************************************************************/
|
||||
|
||||
#ifndef _CPL5_CMD_H
|
||||
#define _CPL5_CMD_H
|
||||
#ifndef _CXGB_CPL5_CMD_H_
|
||||
#define _CXGB_CPL5_CMD_H_
|
||||
|
||||
#include <asm/byteorder.h>
|
||||
|
||||
@@ -59,12 +59,12 @@ enum { /* TX_PKT_LSO ethernet types */
|
||||
};
|
||||
|
||||
struct cpl_rx_data {
|
||||
__u32 rsvd0;
|
||||
__u32 len;
|
||||
__u32 seq;
|
||||
__u16 urg;
|
||||
__u8 rsvd1;
|
||||
__u8 status;
|
||||
u32 rsvd0;
|
||||
u32 len;
|
||||
u32 seq;
|
||||
u16 urg;
|
||||
u8 rsvd1;
|
||||
u8 status;
|
||||
};
|
||||
|
||||
/*
|
||||
@@ -73,73 +73,73 @@ struct cpl_rx_data {
|
||||
* used so we break it into 2 16-bit parts to easily meet our alignment needs.
|
||||
*/
|
||||
struct cpl_tx_pkt {
|
||||
__u8 opcode;
|
||||
u8 opcode;
|
||||
#if defined(__LITTLE_ENDIAN_BITFIELD)
|
||||
__u8 iff:4;
|
||||
__u8 ip_csum_dis:1;
|
||||
__u8 l4_csum_dis:1;
|
||||
__u8 vlan_valid:1;
|
||||
__u8 rsvd:1;
|
||||
u8 iff:4;
|
||||
u8 ip_csum_dis:1;
|
||||
u8 l4_csum_dis:1;
|
||||
u8 vlan_valid:1;
|
||||
u8 rsvd:1;
|
||||
#else
|
||||
__u8 rsvd:1;
|
||||
__u8 vlan_valid:1;
|
||||
__u8 l4_csum_dis:1;
|
||||
__u8 ip_csum_dis:1;
|
||||
__u8 iff:4;
|
||||
u8 rsvd:1;
|
||||
u8 vlan_valid:1;
|
||||
u8 l4_csum_dis:1;
|
||||
u8 ip_csum_dis:1;
|
||||
u8 iff:4;
|
||||
#endif
|
||||
__u16 vlan;
|
||||
__u16 len_hi;
|
||||
__u16 len_lo;
|
||||
u16 vlan;
|
||||
u16 len_hi;
|
||||
u16 len_lo;
|
||||
};
|
||||
|
||||
struct cpl_tx_pkt_lso {
|
||||
__u8 opcode;
|
||||
u8 opcode;
|
||||
#if defined(__LITTLE_ENDIAN_BITFIELD)
|
||||
__u8 iff:4;
|
||||
__u8 ip_csum_dis:1;
|
||||
__u8 l4_csum_dis:1;
|
||||
__u8 vlan_valid:1;
|
||||
__u8 rsvd:1;
|
||||
u8 iff:4;
|
||||
u8 ip_csum_dis:1;
|
||||
u8 l4_csum_dis:1;
|
||||
u8 vlan_valid:1;
|
||||
u8 rsvd:1;
|
||||
#else
|
||||
__u8 rsvd:1;
|
||||
__u8 vlan_valid:1;
|
||||
__u8 l4_csum_dis:1;
|
||||
__u8 ip_csum_dis:1;
|
||||
__u8 iff:4;
|
||||
u8 rsvd:1;
|
||||
u8 vlan_valid:1;
|
||||
u8 l4_csum_dis:1;
|
||||
u8 ip_csum_dis:1;
|
||||
u8 iff:4;
|
||||
#endif
|
||||
__u16 vlan;
|
||||
__u32 len;
|
||||
u16 vlan;
|
||||
u32 len;
|
||||
|
||||
__u32 rsvd2;
|
||||
__u8 rsvd3;
|
||||
u32 rsvd2;
|
||||
u8 rsvd3;
|
||||
#if defined(__LITTLE_ENDIAN_BITFIELD)
|
||||
__u8 tcp_hdr_words:4;
|
||||
__u8 ip_hdr_words:4;
|
||||
u8 tcp_hdr_words:4;
|
||||
u8 ip_hdr_words:4;
|
||||
#else
|
||||
__u8 ip_hdr_words:4;
|
||||
__u8 tcp_hdr_words:4;
|
||||
u8 ip_hdr_words:4;
|
||||
u8 tcp_hdr_words:4;
|
||||
#endif
|
||||
__u16 eth_type_mss;
|
||||
u16 eth_type_mss;
|
||||
};
|
||||
|
||||
struct cpl_rx_pkt {
|
||||
__u8 opcode;
|
||||
u8 opcode;
|
||||
#if defined(__LITTLE_ENDIAN_BITFIELD)
|
||||
__u8 iff:4;
|
||||
__u8 csum_valid:1;
|
||||
__u8 bad_pkt:1;
|
||||
__u8 vlan_valid:1;
|
||||
__u8 rsvd:1;
|
||||
u8 iff:4;
|
||||
u8 csum_valid:1;
|
||||
u8 bad_pkt:1;
|
||||
u8 vlan_valid:1;
|
||||
u8 rsvd:1;
|
||||
#else
|
||||
__u8 rsvd:1;
|
||||
__u8 vlan_valid:1;
|
||||
__u8 bad_pkt:1;
|
||||
__u8 csum_valid:1;
|
||||
__u8 iff:4;
|
||||
u8 rsvd:1;
|
||||
u8 vlan_valid:1;
|
||||
u8 bad_pkt:1;
|
||||
u8 csum_valid:1;
|
||||
u8 iff:4;
|
||||
#endif
|
||||
__u16 csum;
|
||||
__u16 vlan;
|
||||
__u16 len;
|
||||
u16 csum;
|
||||
u16 vlan;
|
||||
u16 len;
|
||||
};
|
||||
|
||||
#endif
|
||||
#endif /* _CXGB_CPL5_CMD_H_ */
|
||||
|
Reference in New Issue
Block a user