Commit 9893ba16 authored by Pekka Enberg's avatar Pekka Enberg Committed by David S. Miller

ipg: naming convention fixes

This changes some camel-case names to follow proper kernel naming convention.
Signed-off-by: default avatarPekka 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: default avatarDavid S. Miller <davem@davemloft.net>
parent dea4a87c
This diff is collapsed.
...@@ -626,7 +626,7 @@ enum ipg_regs { ...@@ -626,7 +626,7 @@ enum ipg_regs {
#define IPG_MINUSEDRFDSTOFREE 0x80 #define IPG_MINUSEDRFDSTOFREE 0x80
/* specify the jumbo frame maximum size /* specify the jumbo frame maximum size
* per unit is 0x600 (the RxBuffer size that one RFD can carry) * per unit is 0x600 (the rx_buffer size that one RFD can carry)
*/ */
#define MAX_JUMBOSIZE 0x8 // max is 12K #define MAX_JUMBOSIZE 0x8 // max is 12K
...@@ -767,11 +767,12 @@ struct ipg_rx { ...@@ -767,11 +767,12 @@ struct ipg_rx {
__le64 frag_info; __le64 frag_info;
}; };
struct SJumbo { struct ipg_jumbo {
int FoundStart; int found_start;
int CurrentSize; int current_size;
struct sk_buff *skb; struct sk_buff *skb;
}; };
/* Structure of IPG NIC specific data. */ /* Structure of IPG NIC specific data. */
struct ipg_nic_private { struct ipg_nic_private {
void __iomem *ioaddr; void __iomem *ioaddr;
...@@ -779,14 +780,14 @@ struct ipg_nic_private { ...@@ -779,14 +780,14 @@ struct ipg_nic_private {
struct ipg_rx *rxd; struct ipg_rx *rxd;
dma_addr_t txd_map; dma_addr_t txd_map;
dma_addr_t rxd_map; dma_addr_t rxd_map;
struct sk_buff *TxBuff[IPG_TFDLIST_LENGTH]; struct sk_buff *tx_buff[IPG_TFDLIST_LENGTH];
struct sk_buff *RxBuff[IPG_RFDLIST_LENGTH]; struct sk_buff *rx_buff[IPG_RFDLIST_LENGTH];
unsigned int tx_current; unsigned int tx_current;
unsigned int tx_dirty; unsigned int tx_dirty;
unsigned int rx_current; unsigned int rx_current;
unsigned int rx_dirty; unsigned int rx_dirty;
#ifdef JUMBO_FRAME #ifdef JUMBO_FRAME
struct SJumbo Jumbo; struct ipg_jumbo jumbo;
#endif #endif
unsigned int rx_buf_sz; unsigned int rx_buf_sz;
struct pci_dev *pdev; struct pci_dev *pdev;
...@@ -795,12 +796,12 @@ struct ipg_nic_private { ...@@ -795,12 +796,12 @@ struct ipg_nic_private {
spinlock_t lock; spinlock_t lock;
int tenmbpsmode; int tenmbpsmode;
u16 LED_Mode; u16 led_mode;
u16 station_addr[3]; /* Station Address in EEPROM Reg 0x10..0x12 */ u16 station_addr[3]; /* Station Address in EEPROM Reg 0x10..0x12 */
struct mutex mii_mutex; struct mutex mii_mutex;
struct mii_if_info mii_if; struct mii_if_info mii_if;
int ResetCurrentTFD; int reset_current_tfd;
#ifdef IPG_DEBUG #ifdef IPG_DEBUG
int RFDlistendCount; int RFDlistendCount;
int RFDListCheckedCount; int RFDListCheckedCount;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment