From: David S. Miller <davem@davemloft.net>
Date: Sat, 6 Dec 2008 06:54:40 +0000 (-0800)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v3.12-rc1~16879^2~293
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=730c30ec646bd252a9448a66ecd51d794853513f;p=kernel%2Fkernel-generic.git

Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:

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

730c30ec646bd252a9448a66ecd51d794853513f
diff --cc drivers/net/wireless/iwlwifi/iwl-core.c
index 1b021ca,01a8458..d00dfe4
--- a/drivers/net/wireless/iwlwifi/iwl-core.c
+++ b/drivers/net/wireless/iwlwifi/iwl-core.c
@@@ -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;
diff --cc drivers/net/wireless/zd1211rw/zd_mac.c
index 07513e4,cac732f..9caa96a
--- a/drivers/net/wireless/zd1211rw/zd_mac.c
+++ b/drivers/net/wireless/zd1211rw/zd_mac.c
@@@ -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;
  		}
  	}