Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
David S. Miller [Thu, 15 May 2008 07:34:44 +0000 (00:34 -0700)]
Conflicts:

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

18 files changed:
1  2 
drivers/net/dm9000.c
drivers/net/gianfar.c
drivers/net/niu.h
drivers/net/pcnet32.c
drivers/net/ucc_geth_ethtool.c
drivers/net/wireless/iwlwifi/Kconfig
drivers/net/wireless/iwlwifi/iwl-3945.c
drivers/net/wireless/iwlwifi/iwl-4965-rs.c
drivers/net/wireless/iwlwifi/iwl-4965.c
drivers/net/wireless/rt2x00/rt2x00dev.c
drivers/net/wireless/rt2x00/rt2x00pci.c
drivers/net/wireless/rt2x00/rt61pci.c
net/mac80211/iface.c
net/mac80211/main.c
net/mac80211/mlme.c
net/mac80211/rx.c
net/mac80211/wme.c
net/tipc/core.h

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -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,
@@@ -2411,11 -2403,21 +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;
  }
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc net/tipc/core.h
Simple merge