From: David S. Miller <davem@davemloft.net>
Date: Thu, 15 May 2008 07:34:44 +0000 (-0700)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.27-rc1~969^2~442
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=63fe46da9c380b3f2bbdf3765044649517cc717c;p=linux-2.6-omap-h63xx.git

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

Conflicts:

	drivers/net/wireless/iwlwifi/iwl-4965-rs.c
	drivers/net/wireless/rt2x00/rt61pci.c
---

63fe46da9c380b3f2bbdf3765044649517cc717c
diff --cc drivers/net/wireless/iwlwifi/iwl-4965-rs.c
index 67356d9a0c5,c9847b1a67f..24dee00b0e8
--- a/drivers/net/wireless/iwlwifi/iwl-4965-rs.c
+++ b/drivers/net/wireless/iwlwifi/iwl-4965-rs.c
@@@ -167,9 -162,9 +167,9 @@@ struct iwl4965_lq_sta 
  #ifdef CONFIG_IWL4965_HT
  	struct dentry *rs_sta_dbgfs_tx_agg_tid_en_file;
  #endif
 -	struct iwl4965_rate dbg_fixed;
 +	u32 dbg_fixed_rate;
- 	struct iwl_priv *drv;
  #endif
+ 	struct iwl_priv *drv;
  };
  
  static void rs_rate_scale_perform(struct iwl_priv *priv,
diff --cc drivers/net/wireless/rt2x00/rt61pci.c
index 98af4d26583,14bc7b28165..b64f2f5d0d5
--- a/drivers/net/wireless/rt2x00/rt61pci.c
+++ b/drivers/net/wireless/rt2x00/rt61pci.c
@@@ -2411,11 -2411,13 +2399,14 @@@ static int rt61pci_beacon_update(struc
  	 * Write entire beacon with descriptor to register,
  	 * and kick the beacon generator.
  	 */
 +	rt2x00lib_write_tx_desc(rt2x00dev, skb, control);
  	beacon_base = HW_BEACON_OFFSET(intf->beacon->entry_idx);
  	rt2x00pci_register_multiwrite(rt2x00dev, beacon_base,
- 				      skb->data, skb->len);
+ 				      skbdesc->desc, skbdesc->desc_len);
+ 	rt2x00pci_register_multiwrite(rt2x00dev,
+ 				      beacon_base + skbdesc->desc_len,
+ 				      skbdesc->data, skbdesc->data_len);
 -	rt61pci_kick_tx_queue(rt2x00dev, control->queue);
 +	rt61pci_kick_tx_queue(rt2x00dev, QID_BEACON);
  
  	return 0;
  }