summaryrefslogtreecommitdiffstats
path: root/drivers/net/ipg.h
diff options
context:
space:
mode:
authorPekka Enberg <penberg@cs.helsinki.fi>2008-01-24 02:01:17 -0800
committerDavid S. Miller <davem@davemloft.net>2008-01-28 15:05:52 -0800
commit9893ba16c8fb9c94729061a88bdee40ecf3a3899 (patch)
tree40c11f7346f522504fe9ab1d72efeab2259d8b4e /drivers/net/ipg.h
parentdea4a87cabc4ba0c09123c6e8392aa68fe437b31 (diff)
downloadlinux-9893ba16c8fb9c94729061a88bdee40ecf3a3899.tar.gz
linux-9893ba16c8fb9c94729061a88bdee40ecf3a3899.tar.bz2
linux-9893ba16c8fb9c94729061a88bdee40ecf3a3899.zip
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 {
#define IPG_MINUSEDRFDSTOFREE 0x80
/* 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
@@ -767,11 +767,12 @@ struct ipg_rx {
__le64 frag_info;
};
-struct SJumbo {
- int FoundStart;
- int CurrentSize;
+struct ipg_jumbo {
+ int found_start;
+ int current_size;
struct sk_buff *skb;
};
+
/* Structure of IPG NIC specific data. */
struct ipg_nic_private {
void __iomem *ioaddr;
@@ -779,14 +780,14 @@ struct ipg_nic_private {
struct ipg_rx *rxd;
dma_addr_t txd_map;
dma_addr_t rxd_map;
- struct sk_buff *TxBuff[IPG_TFDLIST_LENGTH];
- struct sk_buff *RxBuff[IPG_RFDLIST_LENGTH];
+ struct sk_buff *tx_buff[IPG_TFDLIST_LENGTH];
+ struct sk_buff *rx_buff[IPG_RFDLIST_LENGTH];
unsigned int tx_current;
unsigned int tx_dirty;
unsigned int rx_current;
unsigned int rx_dirty;
#ifdef JUMBO_FRAME
- struct SJumbo Jumbo;
+ struct ipg_jumbo jumbo;
#endif
unsigned int rx_buf_sz;
struct pci_dev *pdev;
@@ -795,12 +796,12 @@ struct ipg_nic_private {
spinlock_t lock;
int tenmbpsmode;
- u16 LED_Mode;
+ u16 led_mode;
u16 station_addr[3]; /* Station Address in EEPROM Reg 0x10..0x12 */
struct mutex mii_mutex;
struct mii_if_info mii_if;
- int ResetCurrentTFD;
+ int reset_current_tfd;
#ifdef IPG_DEBUG
int RFDlistendCount;
int RFDListCheckedCount;