diff options
Diffstat (limited to 'drivers/net/wireless/airo.c')
-rw-r--r-- | drivers/net/wireless/airo.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c index 57a79b0475f6..4e5c7a11f04a 100644 --- a/drivers/net/wireless/airo.c +++ b/drivers/net/wireless/airo.c | |||
@@ -1884,7 +1884,7 @@ static int airo_open(struct net_device *dev) { | |||
1884 | /* Make sure the card is configured. | 1884 | /* Make sure the card is configured. |
1885 | * Wireless Extensions may postpone config changes until the card | 1885 | * Wireless Extensions may postpone config changes until the card |
1886 | * is open (to pipeline changes and speed-up card setup). If | 1886 | * is open (to pipeline changes and speed-up card setup). If |
1887 | * those changes are not yet commited, do it now - Jean II */ | 1887 | * those changes are not yet committed, do it now - Jean II */ |
1888 | if (test_bit(FLAG_COMMIT, &ai->flags)) { | 1888 | if (test_bit(FLAG_COMMIT, &ai->flags)) { |
1889 | disable_MAC(ai, 1); | 1889 | disable_MAC(ai, 1); |
1890 | writeConfigRid(ai, 1); | 1890 | writeConfigRid(ai, 1); |
@@ -1992,7 +1992,7 @@ static int mpi_send_packet (struct net_device *dev) | |||
1992 | /* | 1992 | /* |
1993 | * Magic, the cards firmware needs a length count (2 bytes) in the host buffer | 1993 | * Magic, the cards firmware needs a length count (2 bytes) in the host buffer |
1994 | * right after TXFID_HDR.The TXFID_HDR contains the status short so payloadlen | 1994 | * right after TXFID_HDR.The TXFID_HDR contains the status short so payloadlen |
1995 | * is immediatly after it. ------------------------------------------------ | 1995 | * is immediately after it. ------------------------------------------------ |
1996 | * |TXFIDHDR+STATUS|PAYLOADLEN|802.3HDR|PACKETDATA| | 1996 | * |TXFIDHDR+STATUS|PAYLOADLEN|802.3HDR|PACKETDATA| |
1997 | * ------------------------------------------------ | 1997 | * ------------------------------------------------ |
1998 | */ | 1998 | */ |
@@ -2006,7 +2006,7 @@ static int mpi_send_packet (struct net_device *dev) | |||
2006 | sizeof(wifictlhdr8023) + 2 ; | 2006 | sizeof(wifictlhdr8023) + 2 ; |
2007 | 2007 | ||
2008 | /* | 2008 | /* |
2009 | * Firmware automaticly puts 802 header on so | 2009 | * Firmware automatically puts 802 header on so |
2010 | * we don't need to account for it in the length | 2010 | * we don't need to account for it in the length |
2011 | */ | 2011 | */ |
2012 | if (test_bit(FLAG_MIC_CAPABLE, &ai->flags) && ai->micstats.enabled && | 2012 | if (test_bit(FLAG_MIC_CAPABLE, &ai->flags) && ai->micstats.enabled && |
@@ -2531,7 +2531,7 @@ static int mpi_init_descriptors (struct airo_info *ai) | |||
2531 | /* | 2531 | /* |
2532 | * We are setting up three things here: | 2532 | * We are setting up three things here: |
2533 | * 1) Map AUX memory for descriptors: Rid, TxFid, or RxFid. | 2533 | * 1) Map AUX memory for descriptors: Rid, TxFid, or RxFid. |
2534 | * 2) Map PCI memory for issueing commands. | 2534 | * 2) Map PCI memory for issuing commands. |
2535 | * 3) Allocate memory (shared) to send and receive ethernet frames. | 2535 | * 3) Allocate memory (shared) to send and receive ethernet frames. |
2536 | */ | 2536 | */ |
2537 | static int mpi_map_card(struct airo_info *ai, struct pci_dev *pci) | 2537 | static int mpi_map_card(struct airo_info *ai, struct pci_dev *pci) |
@@ -3947,7 +3947,7 @@ static u16 issuecommand(struct airo_info *ai, Cmd *pCmd, Resp *pRsp) { | |||
3947 | 3947 | ||
3948 | if ( max_tries == -1 ) { | 3948 | if ( max_tries == -1 ) { |
3949 | airo_print_err(ai->dev->name, | 3949 | airo_print_err(ai->dev->name, |
3950 | "Max tries exceeded when issueing command"); | 3950 | "Max tries exceeded when issuing command"); |
3951 | if (IN4500(ai, COMMAND) & COMMAND_BUSY) | 3951 | if (IN4500(ai, COMMAND) & COMMAND_BUSY) |
3952 | OUT4500(ai, EVACK, EV_CLEARCOMMANDBUSY); | 3952 | OUT4500(ai, EVACK, EV_CLEARCOMMANDBUSY); |
3953 | return ERROR; | 3953 | return ERROR; |
@@ -4173,7 +4173,7 @@ done: | |||
4173 | } | 4173 | } |
4174 | 4174 | ||
4175 | /* Note, that we are using BAP1 which is also used by transmit, so | 4175 | /* Note, that we are using BAP1 which is also used by transmit, so |
4176 | * make sure this isnt called when a transmit is happening */ | 4176 | * make sure this isn't called when a transmit is happening */ |
4177 | static int PC4500_writerid(struct airo_info *ai, u16 rid, | 4177 | static int PC4500_writerid(struct airo_info *ai, u16 rid, |
4178 | const void *pBuf, int len, int lock) | 4178 | const void *pBuf, int len, int lock) |
4179 | { | 4179 | { |
@@ -4776,7 +4776,7 @@ static int proc_stats_rid_open( struct inode *inode, | |||
4776 | if (!statsLabels[i]) continue; | 4776 | if (!statsLabels[i]) continue; |
4777 | if (j+strlen(statsLabels[i])+16>4096) { | 4777 | if (j+strlen(statsLabels[i])+16>4096) { |
4778 | airo_print_warn(apriv->dev->name, | 4778 | airo_print_warn(apriv->dev->name, |
4779 | "Potentially disasterous buffer overflow averted!"); | 4779 | "Potentially disastrous buffer overflow averted!"); |
4780 | break; | 4780 | break; |
4781 | } | 4781 | } |
4782 | j+=sprintf(data->rbuffer+j, "%s: %u\n", statsLabels[i], | 4782 | j+=sprintf(data->rbuffer+j, "%s: %u\n", statsLabels[i], |