Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
David S. Miller [Sat, 6 Dec 2008 06:54:40 +0000 (22:54 -0800)]
Conflicts:

drivers/net/wireless/iwlwifi/iwl-core.c
drivers/net/wireless/iwlwifi/iwl-sta.c

12 files changed:
1  2 
drivers/isdn/hysdn/hysdn_net.c
drivers/net/bnx2.c
drivers/net/bnx2.h
drivers/net/enc28j60.c
drivers/net/netx-eth.c
drivers/net/wireless/ipw2x00/ipw2200.c
drivers/net/wireless/iwlwifi/iwl-core.c
drivers/net/wireless/iwlwifi/iwl-sta.c
drivers/net/wireless/zd1211rw/zd_mac.c
net/atm/svc.c
net/ipv4/tcp_output.c
net/mac80211/sta_info.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -238,7 -271,32 +238,6 @@@ int iwl_hw_nic_init(struct iwl_priv *pr
  }
  EXPORT_SYMBOL(iwl_hw_nic_init);
  
 -/**
 - * iwl_clear_stations_table - Clear the driver's station table
 - *
 - * NOTE:  This does not clear or otherwise alter the device's station table.
 - */
 -void iwl_clear_stations_table(struct iwl_priv *priv)
 -{
 -      unsigned long flags;
 -
 -      spin_lock_irqsave(&priv->sta_lock, flags);
 -
 -      if (iwl_is_alive(priv) &&
 -         !test_bit(STATUS_EXIT_PENDING, &priv->status) &&
 -         iwl_send_cmd_pdu_async(priv, REPLY_REMOVE_ALL_STA, 0, NULL, NULL))
 -              IWL_ERROR("Couldn't clear the station table\n");
 -
 -      priv->num_stations = 0;
 -      memset(priv->stations, 0, sizeof(priv->stations));
 -
 -      /* clean ucode key table bit map */
 -      priv->ucode_key_table = 0;
 -
 -      spin_unlock_irqrestore(&priv->sta_lock, flags);
 -}
 -EXPORT_SYMBOL(iwl_clear_stations_table);
 -
  void iwl_reset_qos(struct iwl_priv *priv)
  {
        u16 cw_min = 15;
@@@ -615,10 -615,10 +615,10 @@@ static int filter_ack(struct ieee80211_
                struct ieee80211_hdr *tx_hdr;
  
                tx_hdr = (struct ieee80211_hdr *)skb->data;
-               if (likely(!compare_ether_addr(tx_hdr->addr2, rx_hdr->addr1)))
+               if (likely(!memcmp(tx_hdr->addr2, rx_hdr->addr1, ETH_ALEN)))
                {
                        __skb_unlink(skb, q);
 -                      tx_status(hw, skb, IEEE80211_TX_STAT_ACK, stats->signal, 1);
 +                      tx_status(hw, skb, stats->signal, 1);
                        goto out;
                }
        }
diff --cc net/atm/svc.c
Simple merge
Simple merge
Simple merge