From: David S. Miller <davem@davemloft.net>
Date: Wed, 5 Mar 2008 20:26:41 +0000 (-0800)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.26-rc1~1138^2~474
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=255333c1db3ec63921de29b134418a4e56e5921e;p=linux.git

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:

	net/mac80211/rc80211_pid_algo.c
---

255333c1db3ec63921de29b134418a4e56e5921e
diff --cc drivers/net/wireless/libertas/cmdresp.c
index a0a5dbe81b3b,bdc6a1cc2103..5d90b83f28eb
--- a/drivers/net/wireless/libertas/cmdresp.c
+++ b/drivers/net/wireless/libertas/cmdresp.c
@@@ -568,13 -566,13 +566,13 @@@ int lbs_process_rx_command(struct lbs_p
  	respcmd = le16_to_cpu(resp->command);
  	result = le16_to_cpu(resp->result);
  
 -	lbs_deb_host("CMD_RESP: response 0x%04x, seq %d, size %d, jiffies %lu\n",
 +	lbs_deb_cmd("CMD_RESP: response 0x%04x, seq %d, size %d, jiffies %lu\n",
  		     respcmd, le16_to_cpu(resp->seqnum), priv->upld_len, jiffies);
 -	lbs_deb_hex(LBS_DEB_HOST, "CMD_RESP", (void *) resp, priv->upld_len);
 +	lbs_deb_hex(LBS_DEB_CMD, "CMD_RESP", (void *) resp, priv->upld_len);
  
- 	if (resp->seqnum != resp->seqnum) {
+ 	if (resp->seqnum != priv->cur_cmd->cmdbuf->seqnum) {
  		lbs_pr_info("Received CMD_RESP with invalid sequence %d (expected %d)\n",
- 			    le16_to_cpu(resp->seqnum), le16_to_cpu(resp->seqnum));
+ 			    le16_to_cpu(resp->seqnum), le16_to_cpu(priv->cur_cmd->cmdbuf->seqnum));
  		spin_unlock_irqrestore(&priv->driver_lock, flags);
  		ret = -1;
  		goto done;
diff --cc drivers/net/wireless/p54common.c
index 84cc000e71aa,d191e055a788..63f9badf3f52
--- a/drivers/net/wireless/p54common.c
+++ b/drivers/net/wireless/p54common.c
@@@ -289,12 -254,9 +294,13 @@@ int p54_parse_eeprom(struct ieee80211_h
  			priv->version = *(u8 *)(entry->data + 1);
  			break;
  		case PDR_END:
- 			i = len;
+ 			/* make it overrun */
+ 			entry_len = len;
  			break;
 +		default:
 +			printk(KERN_INFO "p54: unknown eeprom code : 0x%x\n",
 +				le16_to_cpu(entry->code));
 +			break;
  		}
  
  		entry = (void *)entry + (entry_len + 1)*2;