Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 340913
b: refs/heads/master
c: b4764c8
h: refs/heads/master
i:
  340911: abffd2a
v: v3
  • Loading branch information
Christian Lamparter authored and John W. Linville committed Oct 19, 2012
1 parent 0d19d05 commit 6caf5df
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: afe3840a1a07371cf1b8bbe01b9bb4c410e3bba1
refs/heads/master: b4764c809a306ea37b6409494896e919bbb5ec5f
6 changes: 3 additions & 3 deletions trunk/drivers/net/wireless/ath/carl9170/rx.c
Original file line number Diff line number Diff line change
Expand Up @@ -164,9 +164,6 @@ void carl9170_handle_command_response(struct ar9170 *ar, void *buf, u32 len)
struct carl9170_rsp *cmd = buf;
struct ieee80211_vif *vif;

if (carl9170_check_sequence(ar, cmd->hdr.seq))
return;

if ((cmd->hdr.cmd & CARL9170_RSP_FLAG) != CARL9170_RSP_FLAG) {
if (!(cmd->hdr.cmd & CARL9170_CMD_ASYNC_FLAG))
carl9170_cmd_callback(ar, len, buf);
Expand Down Expand Up @@ -820,6 +817,9 @@ static void carl9170_rx_untie_cmds(struct ar9170 *ar, const u8 *respbuf,
if (unlikely(i > resplen))
break;

if (carl9170_check_sequence(ar, cmd->hdr.seq))
break;

carl9170_handle_command_response(ar, cmd, cmd->hdr.len + 4);
}

Expand Down
7 changes: 7 additions & 0 deletions trunk/drivers/net/wireless/ath/carl9170/usb.c
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,13 @@ static void carl9170_usb_rx_irq_complete(struct urb *urb)
goto resubmit;
}

/*
* While the carl9170 firmware does not use this EP, the
* firmware loader in the EEPROM unfortunately does.
* Therefore we need to be ready to handle out-of-band
* responses and traps in case the firmware crashed and
* the loader took over again.
*/
carl9170_handle_command_response(ar, urb->transfer_buffer,
urb->actual_length);

Expand Down

0 comments on commit 6caf5df

Please sign in to comment.