diff options
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/ethernet/chelsio/cxgb4vf/sge.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/sis/sis900.h | 2 | ||||
-rw-r--r-- | drivers/net/irda/nsc-ircc.c | 2 | ||||
-rw-r--r-- | drivers/net/irda/via-ircc.c | 4 | ||||
-rw-r--r-- | drivers/net/irda/w83977af_ir.c | 2 | ||||
-rw-r--r-- | drivers/net/wimax/i2400m/i2400m.h | 2 | ||||
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8192de/hw.c | 4 |
7 files changed, 9 insertions, 9 deletions
diff --git a/drivers/net/ethernet/chelsio/cxgb4vf/sge.c b/drivers/net/ethernet/chelsio/cxgb4vf/sge.c index c381db23e713..0bd585bba39d 100644 --- a/drivers/net/ethernet/chelsio/cxgb4vf/sge.c +++ b/drivers/net/ethernet/chelsio/cxgb4vf/sge.c | |||
@@ -683,7 +683,7 @@ out: | |||
683 | /* | 683 | /* |
684 | * Update our accounting state to incorporate the new Free List | 684 | * Update our accounting state to incorporate the new Free List |
685 | * buffers, tell the hardware about them and return the number of | 685 | * buffers, tell the hardware about them and return the number of |
686 | * bufers which we were able to allocate. | 686 | * buffers which we were able to allocate. |
687 | */ | 687 | */ |
688 | cred = fl->avail - cred; | 688 | cred = fl->avail - cred; |
689 | fl->pend_cred += cred; | 689 | fl->pend_cred += cred; |
diff --git a/drivers/net/ethernet/sis/sis900.h b/drivers/net/ethernet/sis/sis900.h index 150511a922ef..1341f33e6084 100644 --- a/drivers/net/ethernet/sis/sis900.h +++ b/drivers/net/ethernet/sis/sis900.h | |||
@@ -205,7 +205,7 @@ enum sis900_tx_buffer_status { | |||
205 | EXCCOLL = 0x00100000, COLCNT = 0x000F0000 | 205 | EXCCOLL = 0x00100000, COLCNT = 0x000F0000 |
206 | }; | 206 | }; |
207 | 207 | ||
208 | enum sis900_rx_bufer_status { | 208 | enum sis900_rx_buffer_status { |
209 | OVERRUN = 0x02000000, DEST = 0x00800000, BCAST = 0x01800000, | 209 | OVERRUN = 0x02000000, DEST = 0x00800000, BCAST = 0x01800000, |
210 | MCAST = 0x01000000, UNIMATCH = 0x00800000, TOOLONG = 0x00400000, | 210 | MCAST = 0x01000000, UNIMATCH = 0x00800000, TOOLONG = 0x00400000, |
211 | RUNT = 0x00200000, RXISERR = 0x00100000, CRCERR = 0x00080000, | 211 | RUNT = 0x00200000, RXISERR = 0x00100000, CRCERR = 0x00080000, |
diff --git a/drivers/net/irda/nsc-ircc.c b/drivers/net/irda/nsc-ircc.c index b56636da6cc3..2a4f2f153244 100644 --- a/drivers/net/irda/nsc-ircc.c +++ b/drivers/net/irda/nsc-ircc.c | |||
@@ -1664,7 +1664,7 @@ static int nsc_ircc_dma_xmit_complete(struct nsc_ircc_cb *self) | |||
1664 | switch_bank(iobase, BANK0); | 1664 | switch_bank(iobase, BANK0); |
1665 | outb(inb(iobase+MCR) & ~MCR_DMA_EN, iobase+MCR); | 1665 | outb(inb(iobase+MCR) & ~MCR_DMA_EN, iobase+MCR); |
1666 | 1666 | ||
1667 | /* Check for underrrun! */ | 1667 | /* Check for underrun! */ |
1668 | if (inb(iobase+ASCR) & ASCR_TXUR) { | 1668 | if (inb(iobase+ASCR) & ASCR_TXUR) { |
1669 | self->netdev->stats.tx_errors++; | 1669 | self->netdev->stats.tx_errors++; |
1670 | self->netdev->stats.tx_fifo_errors++; | 1670 | self->netdev->stats.tx_fifo_errors++; |
diff --git a/drivers/net/irda/via-ircc.c b/drivers/net/irda/via-ircc.c index 6d6479049aa1..2d456dd164fb 100644 --- a/drivers/net/irda/via-ircc.c +++ b/drivers/net/irda/via-ircc.c | |||
@@ -942,14 +942,14 @@ static int via_ircc_dma_xmit_complete(struct via_ircc_cb *self) | |||
942 | iobase = self->io.fir_base; | 942 | iobase = self->io.fir_base; |
943 | /* Disable DMA */ | 943 | /* Disable DMA */ |
944 | // DisableDmaChannel(self->io.dma); | 944 | // DisableDmaChannel(self->io.dma); |
945 | /* Check for underrrun! */ | 945 | /* Check for underrun! */ |
946 | /* Clear bit, by writing 1 into it */ | 946 | /* Clear bit, by writing 1 into it */ |
947 | Tx_status = GetTXStatus(iobase); | 947 | Tx_status = GetTXStatus(iobase); |
948 | if (Tx_status & 0x08) { | 948 | if (Tx_status & 0x08) { |
949 | self->netdev->stats.tx_errors++; | 949 | self->netdev->stats.tx_errors++; |
950 | self->netdev->stats.tx_fifo_errors++; | 950 | self->netdev->stats.tx_fifo_errors++; |
951 | hwreset(self); | 951 | hwreset(self); |
952 | // how to clear underrrun ? | 952 | /* how to clear underrun? */ |
953 | } else { | 953 | } else { |
954 | self->netdev->stats.tx_packets++; | 954 | self->netdev->stats.tx_packets++; |
955 | ResetChip(iobase, 3); | 955 | ResetChip(iobase, 3); |
diff --git a/drivers/net/irda/w83977af_ir.c b/drivers/net/irda/w83977af_ir.c index c4366601b067..7d43506c7032 100644 --- a/drivers/net/irda/w83977af_ir.c +++ b/drivers/net/irda/w83977af_ir.c | |||
@@ -677,7 +677,7 @@ static void w83977af_dma_xmit_complete(struct w83977af_ir *self) | |||
677 | switch_bank(iobase, SET0); | 677 | switch_bank(iobase, SET0); |
678 | outb(inb(iobase+HCR) & ~HCR_EN_DMA, iobase+HCR); | 678 | outb(inb(iobase+HCR) & ~HCR_EN_DMA, iobase+HCR); |
679 | 679 | ||
680 | /* Check for underrrun! */ | 680 | /* Check for underrun! */ |
681 | if (inb(iobase+AUDR) & AUDR_UNDR) { | 681 | if (inb(iobase+AUDR) & AUDR_UNDR) { |
682 | IRDA_DEBUG(0, "%s(), Transmit underrun!\n", __func__ ); | 682 | IRDA_DEBUG(0, "%s(), Transmit underrun!\n", __func__ ); |
683 | 683 | ||
diff --git a/drivers/net/wimax/i2400m/i2400m.h b/drivers/net/wimax/i2400m/i2400m.h index c421a6141854..c806d4550212 100644 --- a/drivers/net/wimax/i2400m/i2400m.h +++ b/drivers/net/wimax/i2400m/i2400m.h | |||
@@ -75,7 +75,7 @@ | |||
75 | * device is up and running or shutdown (through ifconfig up / | 75 | * device is up and running or shutdown (through ifconfig up / |
76 | * down). Bus-generic only. | 76 | * down). Bus-generic only. |
77 | * | 77 | * |
78 | * - control ops: control.c - implements various commmands for | 78 | * - control ops: control.c - implements various commands for |
79 | * controlling the device. bus-generic only. | 79 | * controlling the device. bus-generic only. |
80 | * | 80 | * |
81 | * - device model glue: driver.c - implements helpers for the | 81 | * - device model glue: driver.c - implements helpers for the |
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/hw.c b/drivers/net/wireless/rtlwifi/rtl8192de/hw.c index f5bd3a3cd34a..9d89d7ccdafb 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192de/hw.c +++ b/drivers/net/wireless/rtlwifi/rtl8192de/hw.c | |||
@@ -466,8 +466,8 @@ void rtl92de_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) | |||
466 | bool int_migration = *(bool *) (val); | 466 | bool int_migration = *(bool *) (val); |
467 | 467 | ||
468 | if (int_migration) { | 468 | if (int_migration) { |
469 | /* Set interrrupt migration timer and | 469 | /* Set interrupt migration timer and |
470 | * corresponging Tx/Rx counter. | 470 | * corresponding Tx/Rx counter. |
471 | * timer 25ns*0xfa0=100us for 0xf packets. | 471 | * timer 25ns*0xfa0=100us for 0xf packets. |
472 | * 0x306:Rx, 0x307:Tx */ | 472 | * 0x306:Rx, 0x307:Tx */ |
473 | rtl_write_dword(rtlpriv, REG_INT_MIG, 0xfe000fa0); | 473 | rtl_write_dword(rtlpriv, REG_INT_MIG, 0xfe000fa0); |