aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ipg.h
diff options
context:
space:
mode:
authorPekka Enberg <penberg@cs.helsinki.fi>2008-01-24 05:01:17 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 18:05:52 -0500
commit9893ba16c8fb9c94729061a88bdee40ecf3a3899 (patch)
tree40c11f7346f522504fe9ab1d72efeab2259d8b4e /drivers/net/ipg.h
parentdea4a87cabc4ba0c09123c6e8392aa68fe437b31 (diff)
ipg: naming convention fixes
This changes some camel-case names to follow proper kernel naming convention. Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi> Cc: Francois Romieu <romieu@fr.zoreil.com> Cc: Sorbica Shieh <sorbica@icplus.com.tw> Cc: Jesse Huang <jesse@icplus.com.tw> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ipg.h')
-rw-r--r--drivers/net/ipg.h19
1 files changed, 10 insertions, 9 deletions
diff --git a/drivers/net/ipg.h b/drivers/net/ipg.h
index a328221d7abb..8b10d6333408 100644
--- a/drivers/net/ipg.h
+++ b/drivers/net/ipg.h
@@ -626,7 +626,7 @@ enum ipg_regs {
626#define IPG_MINUSEDRFDSTOFREE 0x80 626#define IPG_MINUSEDRFDSTOFREE 0x80
627 627
628/* specify the jumbo frame maximum size 628/* specify the jumbo frame maximum size
629 * per unit is 0x600 (the RxBuffer size that one RFD can carry) 629 * per unit is 0x600 (the rx_buffer size that one RFD can carry)
630 */ 630 */
631#define MAX_JUMBOSIZE 0x8 // max is 12K 631#define MAX_JUMBOSIZE 0x8 // max is 12K
632 632
@@ -767,11 +767,12 @@ struct ipg_rx {
767 __le64 frag_info; 767 __le64 frag_info;
768}; 768};
769 769
770struct SJumbo { 770struct ipg_jumbo {
771 int FoundStart; 771 int found_start;
772 int CurrentSize; 772 int current_size;
773 struct sk_buff *skb; 773 struct sk_buff *skb;
774}; 774};
775
775/* Structure of IPG NIC specific data. */ 776/* Structure of IPG NIC specific data. */
776struct ipg_nic_private { 777struct ipg_nic_private {
777 void __iomem *ioaddr; 778 void __iomem *ioaddr;
@@ -779,14 +780,14 @@ struct ipg_nic_private {
779 struct ipg_rx *rxd; 780 struct ipg_rx *rxd;
780 dma_addr_t txd_map; 781 dma_addr_t txd_map;
781 dma_addr_t rxd_map; 782 dma_addr_t rxd_map;
782 struct sk_buff *TxBuff[IPG_TFDLIST_LENGTH]; 783 struct sk_buff *tx_buff[IPG_TFDLIST_LENGTH];
783 struct sk_buff *RxBuff[IPG_RFDLIST_LENGTH]; 784 struct sk_buff *rx_buff[IPG_RFDLIST_LENGTH];
784 unsigned int tx_current; 785 unsigned int tx_current;
785 unsigned int tx_dirty; 786 unsigned int tx_dirty;
786 unsigned int rx_current; 787 unsigned int rx_current;
787 unsigned int rx_dirty; 788 unsigned int rx_dirty;
788#ifdef JUMBO_FRAME 789#ifdef JUMBO_FRAME
789 struct SJumbo Jumbo; 790 struct ipg_jumbo jumbo;
790#endif 791#endif
791 unsigned int rx_buf_sz; 792 unsigned int rx_buf_sz;
792 struct pci_dev *pdev; 793 struct pci_dev *pdev;
@@ -795,12 +796,12 @@ struct ipg_nic_private {
795 spinlock_t lock; 796 spinlock_t lock;
796 int tenmbpsmode; 797 int tenmbpsmode;
797 798
798 u16 LED_Mode; 799 u16 led_mode;
799 u16 station_addr[3]; /* Station Address in EEPROM Reg 0x10..0x12 */ 800 u16 station_addr[3]; /* Station Address in EEPROM Reg 0x10..0x12 */
800 801
801 struct mutex mii_mutex; 802 struct mutex mii_mutex;
802 struct mii_if_info mii_if; 803 struct mii_if_info mii_if;
803 int ResetCurrentTFD; 804 int reset_current_tfd;
804#ifdef IPG_DEBUG 805#ifdef IPG_DEBUG
805 int RFDlistendCount; 806 int RFDlistendCount;
806 int RFDListCheckedCount; 807 int RFDListCheckedCount;