diff options
author | David S. Miller <davem@davemloft.net> | 2008-03-18 03:37:55 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-03-18 03:37:55 -0400 |
commit | 577f99c1d08cf9cbdafd4e858dd13ff04d855090 (patch) | |
tree | 0f726bbda9b18d311d4c95198bbd96cb7ac01db0 /drivers/net/wireless/libertas/cmdresp.c | |
parent | 26c0f03f6b77c513cb7bc37b73a06819bdbb791b (diff) | |
parent | 2f633928cbba8a5858bb39b11e7219a41b0fbef5 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/rt2x00/rt2x00dev.c
net/8021q/vlan_dev.c
Diffstat (limited to 'drivers/net/wireless/libertas/cmdresp.c')
-rw-r--r-- | drivers/net/wireless/libertas/cmdresp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/libertas/cmdresp.c b/drivers/net/wireless/libertas/cmdresp.c index 15e4ebdcd477..63aa884b18f2 100644 --- a/drivers/net/wireless/libertas/cmdresp.c +++ b/drivers/net/wireless/libertas/cmdresp.c | |||
@@ -515,7 +515,7 @@ int lbs_process_rx_command(struct lbs_private *priv) | |||
515 | goto done; | 515 | goto done; |
516 | } | 516 | } |
517 | if (respcmd != CMD_RET(curcmd) && | 517 | if (respcmd != CMD_RET(curcmd) && |
518 | respcmd != CMD_802_11_ASSOCIATE && curcmd != CMD_RET_802_11_ASSOCIATE) { | 518 | respcmd != CMD_RET_802_11_ASSOCIATE && curcmd != CMD_802_11_ASSOCIATE) { |
519 | lbs_pr_info("Invalid CMD_RESP %x to command %x!\n", respcmd, curcmd); | 519 | lbs_pr_info("Invalid CMD_RESP %x to command %x!\n", respcmd, curcmd); |
520 | spin_unlock_irqrestore(&priv->driver_lock, flags); | 520 | spin_unlock_irqrestore(&priv->driver_lock, flags); |
521 | ret = -1; | 521 | ret = -1; |