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

Conflicts:
	drivers/net/bnx2x_main.c
	drivers/net/wireless/iwlwifi/iwl3945-base.c
	drivers/net/wireless/rt2x00/rt73usb.c

diff --cc drivers/net/bnx2x.h
index 408eae7d6cc613b8ce059c49f75d2db0b2486140,3cf2b92eef3be0c12b19fbd834195bb6c73d4907..a329bee25550ded2b08b6903b889d702037464d6
--- 1/drivers/net/bnx2x.h
--- 2/drivers/net/bnx2x.h
+++ b/drivers/net/bnx2x.h
@@@ -160,8 -152,10 +160,8 @@@ struct sw_rx_page 
  #define PAGES_PER_SGE                 (1 << PAGES_PER_SGE_SHIFT)
  #define SGE_PAGE_SIZE                 PAGE_SIZE
  #define SGE_PAGE_SHIFT                        PAGE_SHIFT
- #define SGE_PAGE_ALIGN(addr)          PAGE_ALIGN(addr)
+ #define SGE_PAGE_ALIGN(addr)          PAGE_ALIGN((typeof(PAGE_SIZE))addr)
  
 -#define BCM_RX_ETH_PAYLOAD_ALIGN      64
 -
  /* SGE ring related macros */
  #define NUM_RX_SGE_PAGES              2
  #define RX_SGE_CNT            (BCM_PAGE_SIZE / sizeof(struct eth_rx_sge))

diff --cc drivers/net/wireless/iwlwifi/iwl-agn.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl3945-base.c
index a2bde78e548d3a09b3d69cc7a4bd2d8e25fa73c9,57dd34e256d84c1be242785749c22c3bf839bcf8..d37679c69a5c1f0a31bc3e0ddacaabb18db26a73
--- 1/drivers/net/wireless/iwlwifi/iwl3945-base.c
--- 2/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@@ -5107,10 -7902,15 +5107,10 @@@ static int iwl3945_pci_probe(struct pci
         * PCI Tx retries from interfering with C3 CPU state */
        pci_write_config_byte(pdev, 0x41, 0x00);
  
 -      /* nic init */
 -      iwl3945_set_bit(priv, CSR_GIO_CHICKEN_BITS,
 -                      CSR_GIO_CHICKEN_BITS_REG_BIT_DIS_L0S_EXIT_TIMER);
 -
 -      iwl3945_set_bit(priv, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_FLAG_INIT_DONE);
 -      err = iwl3945_poll_direct_bit(priv, CSR_GP_CNTRL,
 -                              CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY, 25000);
 +      /* amp init */
 +      err = priv->cfg->ops->lib->apm_ops.init(priv);
        if (err < 0) {
-               IWL_DEBUG_INFO(priv, "Failed to init APMG\n");
 -              IWL_DEBUG_INFO("Failed to init the card\n");
++              IWL_DEBUG_INFO(priv, "Failed to init the card\n");
                goto out_iounmap;
        }
  

diff --cc drivers/net/wireless/p54/p54common.c
index fcf43bcae9794dec27c2b611d4b60fa1a6a061f8,f170106bf0aee74388d428e57377ead260dba8a5..14438a642fddee9e0764c83590f50842149aa924
--- 1/drivers/net/wireless/p54/p54common.c
--- 2/drivers/net/wireless/p54/p54common.c
+++ b/drivers/net/wireless/p54/p54common.c
@@@ -871,9 -733,9 +872,9 @@@ static void p54_rx_frame_sent(struct ie
        struct p54_common *priv = dev->priv;
        struct p54_hdr *hdr = (struct p54_hdr *) skb->data;
        struct p54_frame_sent *payload = (struct p54_frame_sent *) hdr->data;
-       struct sk_buff *entry = (struct sk_buff *) priv->tx_queue.next;
+       struct sk_buff *entry;
        u32 addr = le32_to_cpu(hdr->req_id) - priv->headroom;
 -      struct memrecord *range = NULL;
 +      struct p54_tx_info *range = NULL;
        u32 freed = 0;
        u32 last_addr = priv->rx_start;
        unsigned long flags;
@@@ -1122,10 -978,10 +1124,10 @@@ static int p54_assign_address(struct ie
                               struct p54_hdr *data, u32 len)
  {
        struct p54_common *priv = dev->priv;
-       struct sk_buff *entry = priv->tx_queue.next;
+       struct sk_buff *entry;
        struct sk_buff *target_skb = NULL;
        struct ieee80211_tx_info *info;
 -      struct memrecord *range;
 +      struct p54_tx_info *range;
        u32 last_addr = priv->rx_start;
        u32 largest_hole = 0;
        u32 target_addr = priv->rx_start;

diff --cc drivers/net/wireless/rt2x00/rt2500usb.c
Simple merge

diff --cc drivers/net/wireless/rt2x00/rt73usb.c
Simple merge

diff --cc net/wireless/reg.c
Simple merge