Commit b277b90b authored by Sergio Paracuellos's avatar Sergio Paracuellos Committed by Greg Kroah-Hartman

staging: slicoss: avoid CamelCases in slic.h

Replace CamelCases to comply with the standard kernel coding style.
Signed-off-by: default avatarSergio Paracuellos <sergio.paracuellos@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent db1a4194
...@@ -52,8 +52,8 @@ ...@@ -52,8 +52,8 @@
#define GB_RCVUCODE_VERS_STRING "1.2" #define GB_RCVUCODE_VERS_STRING "1.2"
#define GB_RCVUCODE_VERS_DATE "2006/03/27 15:12:15" #define GB_RCVUCODE_VERS_DATE "2006/03/27 15:12:15"
static u32 OasisRcvUCodeLen = 512; static u32 oasis_rcv_ucode_len = 512;
static u32 GBRcvUCodeLen = 512; static u32 gb_rcv_ucode_len = 512;
#define SECTION_SIZE 65536 #define SECTION_SIZE 65536
#define SLIC_RSPQ_PAGES_GB 10 #define SLIC_RSPQ_PAGES_GB 10
...@@ -396,20 +396,20 @@ struct slic_upr { ...@@ -396,20 +396,20 @@ struct slic_upr {
struct slic_ifevents { struct slic_ifevents {
uint oflow802; uint oflow802;
uint uflow802; uint uflow802;
uint Tprtoflow; uint tprtoflow;
uint rcvearly; uint rcvearly;
uint Bufov; uint bufov;
uint Carre; uint carre;
uint Longe; uint longe;
uint Invp; uint invp;
uint Crc; uint crc;
uint Drbl; uint drbl;
uint Code; uint code;
uint IpHlen; uint ip_hlen;
uint IpLen; uint ip_len;
uint IpCsum; uint ip_csum;
uint TpCsum; uint tp_csum;
uint TpHlen; uint tp_hlen;
}; };
struct adapter { struct adapter {
......
...@@ -386,13 +386,13 @@ static int slic_card_download_gbrcv(struct adapter *adapter) ...@@ -386,13 +386,13 @@ static int slic_card_download_gbrcv(struct adapter *adapter)
index += 4; index += 4;
switch (adapter->devid) { switch (adapter->devid) {
case SLIC_2GB_DEVICE_ID: case SLIC_2GB_DEVICE_ID:
if (rcvucodelen != OasisRcvUCodeLen) { if (rcvucodelen != oasis_rcv_ucode_len) {
release_firmware(fw); release_firmware(fw);
return -EINVAL; return -EINVAL;
} }
break; break;
case SLIC_1GB_DEVICE_ID: case SLIC_1GB_DEVICE_ID:
if (rcvucodelen != GBRcvUCodeLen) { if (rcvucodelen != gb_rcv_ucode_len) {
release_firmware(fw); release_firmware(fw);
return -EINVAL; return -EINVAL;
} }
...@@ -1837,7 +1837,7 @@ static void slic_rcv_handle_error(struct adapter *adapter, ...@@ -1837,7 +1837,7 @@ static void slic_rcv_handle_error(struct adapter *adapter,
if (hdr->frame_status14 & VRHSTAT_802OE) if (hdr->frame_status14 & VRHSTAT_802OE)
adapter->if_events.oflow802++; adapter->if_events.oflow802++;
if (hdr->frame_status14 & VRHSTAT_TPOFLO) if (hdr->frame_status14 & VRHSTAT_TPOFLO)
adapter->if_events.Tprtoflow++; adapter->if_events.tprtoflow++;
if (hdr->frame_status_b14 & VRHSTATB_802UE) if (hdr->frame_status_b14 & VRHSTATB_802UE)
adapter->if_events.uflow802++; adapter->if_events.uflow802++;
if (hdr->frame_status_b14 & VRHSTATB_RCVE) { if (hdr->frame_status_b14 & VRHSTATB_RCVE) {
...@@ -1845,45 +1845,45 @@ static void slic_rcv_handle_error(struct adapter *adapter, ...@@ -1845,45 +1845,45 @@ static void slic_rcv_handle_error(struct adapter *adapter,
netdev->stats.rx_fifo_errors++; netdev->stats.rx_fifo_errors++;
} }
if (hdr->frame_status_b14 & VRHSTATB_BUFF) { if (hdr->frame_status_b14 & VRHSTATB_BUFF) {
adapter->if_events.Bufov++; adapter->if_events.bufov++;
netdev->stats.rx_over_errors++; netdev->stats.rx_over_errors++;
} }
if (hdr->frame_status_b14 & VRHSTATB_CARRE) { if (hdr->frame_status_b14 & VRHSTATB_CARRE) {
adapter->if_events.Carre++; adapter->if_events.carre++;
netdev->stats.tx_carrier_errors++; netdev->stats.tx_carrier_errors++;
} }
if (hdr->frame_status_b14 & VRHSTATB_LONGE) if (hdr->frame_status_b14 & VRHSTATB_LONGE)
adapter->if_events.Longe++; adapter->if_events.longe++;
if (hdr->frame_status_b14 & VRHSTATB_PREA) if (hdr->frame_status_b14 & VRHSTATB_PREA)
adapter->if_events.Invp++; adapter->if_events.invp++;
if (hdr->frame_status_b14 & VRHSTATB_CRC) { if (hdr->frame_status_b14 & VRHSTATB_CRC) {
adapter->if_events.Crc++; adapter->if_events.crc++;
netdev->stats.rx_crc_errors++; netdev->stats.rx_crc_errors++;
} }
if (hdr->frame_status_b14 & VRHSTATB_DRBL) if (hdr->frame_status_b14 & VRHSTATB_DRBL)
adapter->if_events.Drbl++; adapter->if_events.drbl++;
if (hdr->frame_status_b14 & VRHSTATB_CODE) if (hdr->frame_status_b14 & VRHSTATB_CODE)
adapter->if_events.Code++; adapter->if_events.code++;
if (hdr->frame_status_b14 & VRHSTATB_TPCSUM) if (hdr->frame_status_b14 & VRHSTATB_TPCSUM)
adapter->if_events.TpCsum++; adapter->if_events.tp_csum++;
if (hdr->frame_status_b14 & VRHSTATB_TPHLEN) if (hdr->frame_status_b14 & VRHSTATB_TPHLEN)
adapter->if_events.TpHlen++; adapter->if_events.tp_hlen++;
if (hdr->frame_status_b14 & VRHSTATB_IPCSUM) if (hdr->frame_status_b14 & VRHSTATB_IPCSUM)
adapter->if_events.IpCsum++; adapter->if_events.ip_csum++;
if (hdr->frame_status_b14 & VRHSTATB_IPLERR) if (hdr->frame_status_b14 & VRHSTATB_IPLERR)
adapter->if_events.IpLen++; adapter->if_events.ip_len++;
if (hdr->frame_status_b14 & VRHSTATB_IPHERR) if (hdr->frame_status_b14 & VRHSTATB_IPHERR)
adapter->if_events.IpHlen++; adapter->if_events.ip_hlen++;
} else { } else {
if (hdr->frame_statusGB & VGBSTAT_XPERR) { if (hdr->frame_statusGB & VGBSTAT_XPERR) {
u32 xerr = hdr->frame_statusGB >> VGBSTAT_XERRSHFT; u32 xerr = hdr->frame_statusGB >> VGBSTAT_XERRSHFT;
if (xerr == VGBSTAT_XCSERR) if (xerr == VGBSTAT_XCSERR)
adapter->if_events.TpCsum++; adapter->if_events.tp_csum++;
if (xerr == VGBSTAT_XUFLOW) if (xerr == VGBSTAT_XUFLOW)
adapter->if_events.Tprtoflow++; adapter->if_events.tprtoflow++;
if (xerr == VGBSTAT_XHLEN) if (xerr == VGBSTAT_XHLEN)
adapter->if_events.TpHlen++; adapter->if_events.tp_hlen++;
} }
if (hdr->frame_statusGB & VGBSTAT_NETERR) { if (hdr->frame_statusGB & VGBSTAT_NETERR) {
u32 nerr = u32 nerr =
...@@ -1891,11 +1891,11 @@ static void slic_rcv_handle_error(struct adapter *adapter, ...@@ -1891,11 +1891,11 @@ static void slic_rcv_handle_error(struct adapter *adapter,
frame_statusGB >> VGBSTAT_NERRSHFT) & frame_statusGB >> VGBSTAT_NERRSHFT) &
VGBSTAT_NERRMSK; VGBSTAT_NERRMSK;
if (nerr == VGBSTAT_NCSERR) if (nerr == VGBSTAT_NCSERR)
adapter->if_events.IpCsum++; adapter->if_events.ip_csum++;
if (nerr == VGBSTAT_NUFLOW) if (nerr == VGBSTAT_NUFLOW)
adapter->if_events.IpLen++; adapter->if_events.ip_len++;
if (nerr == VGBSTAT_NHLEN) if (nerr == VGBSTAT_NHLEN)
adapter->if_events.IpHlen++; adapter->if_events.ip_hlen++;
} }
if (hdr->frame_statusGB & VGBSTAT_LNKERR) { if (hdr->frame_statusGB & VGBSTAT_LNKERR) {
u32 lerr = hdr->frame_statusGB & VGBSTAT_LERRMSK; u32 lerr = hdr->frame_statusGB & VGBSTAT_LERRMSK;
...@@ -1903,13 +1903,13 @@ static void slic_rcv_handle_error(struct adapter *adapter, ...@@ -1903,13 +1903,13 @@ static void slic_rcv_handle_error(struct adapter *adapter,
if (lerr == VGBSTAT_LDEARLY) if (lerr == VGBSTAT_LDEARLY)
adapter->if_events.rcvearly++; adapter->if_events.rcvearly++;
if (lerr == VGBSTAT_LBOFLO) if (lerr == VGBSTAT_LBOFLO)
adapter->if_events.Bufov++; adapter->if_events.bufov++;
if (lerr == VGBSTAT_LCODERR) if (lerr == VGBSTAT_LCODERR)
adapter->if_events.Code++; adapter->if_events.code++;
if (lerr == VGBSTAT_LDBLNBL) if (lerr == VGBSTAT_LDBLNBL)
adapter->if_events.Drbl++; adapter->if_events.drbl++;
if (lerr == VGBSTAT_LCRCERR) if (lerr == VGBSTAT_LCRCERR)
adapter->if_events.Crc++; adapter->if_events.crc++;
if (lerr == VGBSTAT_LOFLO) if (lerr == VGBSTAT_LOFLO)
adapter->if_events.oflow802++; adapter->if_events.oflow802++;
if (lerr == VGBSTAT_LUFLO) if (lerr == VGBSTAT_LUFLO)
......
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