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

Conflicts:
	drivers/net/wireless/iwmc3200wifi/netdev.c
	net/wireless/scan.c

diff --cc Documentation/connector/cn_test.c
Simple merge

diff --cc Documentation/connector/ucon.c
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/connector/cn_queue.c
Simple merge

diff --cc drivers/connector/connector.c
Simple merge

diff --cc drivers/net/arm/at91_ether.c
Simple merge

diff --cc drivers/net/benet/be_main.c
Simple merge

diff --cc drivers/net/bnx2x_link.c
Simple merge

diff --cc drivers/net/can/sja1000/sja1000.c
Simple merge

diff --cc drivers/net/gianfar.c
Simple merge

diff --cc drivers/net/hamradio/6pack.c
Simple merge

diff --cc drivers/net/ixgbe/ixgbe.h
Simple merge

diff --cc drivers/net/ixgbe/ixgbe_main.c
Simple merge

diff --cc drivers/net/jazzsonic.c
Simple merge

diff --cc drivers/net/pcmcia/3c589_cs.c
Simple merge

diff --cc drivers/net/ucc_geth.c
Simple merge

diff --cc drivers/net/wireless/ath/ath5k/base.c
Simple merge

diff --cc drivers/net/wireless/ath/regd.c
Simple merge

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

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

diff --cc drivers/net/wireless/iwlwifi/iwl3945-base.c
Simple merge

diff --cc drivers/net/wireless/iwmc3200wifi/netdev.c
index e94e96955b99ba2268a0f0f3e3343125298eb676,aea5ccf24ccf573533a48a22345aa5c464030010..092d28ae56a070c0c0f14fa6cc5f87d109bd622c
--- 1/drivers/net/wireless/iwmc3200wifi/netdev.c
--- 2/drivers/net/wireless/iwmc3200wifi/netdev.c
+++ b/drivers/net/wireless/iwmc3200wifi/netdev.c
@@@ -156,10 -151,8 +156,10 @@@ void iwm_if_free(struct iwm_priv *iwm
                return;
  
        free_netdev(iwm_to_ndev(iwm));
-       iwm_wdev_free(iwm);
        iwm_priv_deinit(iwm);
 +      kfree(iwm->umac_profile);
 +      iwm->umac_profile = NULL;
+       iwm_wdev_free(iwm);
  }
  
  int iwm_if_add(struct iwm_priv *iwm)

diff --cc drivers/net/wireless/mac80211_hwsim.c
Simple merge

diff --cc drivers/net/wireless/p54/p54spi.c
Simple merge

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

diff --cc include/linux/rfkill.h
Simple merge

diff --cc net/ipv4/tcp_output.c
Simple merge

diff --cc net/mac80211/Kconfig
Simple merge

diff --cc net/mac80211/tx.c
Simple merge

diff --cc net/rfkill/core.c
Simple merge

diff --cc net/wireless/nl80211.c
index 2a04beba436933c4a3a81552ccbc52bb0528b9ee,634496b3ed77cb7adf5e1ec1356a307b6b897356..4478760b7dc3ba332c3184d5e8c42ab63b7075f7
--- 1/net/wireless/nl80211.c
--- 2/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@@ -1035,9 -1022,10 +1035,10 @@@ static int nl80211_get_key(struct sk_bu
  
   nla_put_failure:
        err = -ENOBUFS;
+  free_msg:
        nlmsg_free(msg);
   out:
 -      cfg80211_put_dev(drv);
 +      cfg80211_unlock_rdev(rdev);
        dev_put(dev);
   unlock_rtnl:
        rtnl_unlock();

diff --cc net/wireless/scan.c
index 4f552c3f29a3e7e8e29d2803cb2dff40832f25fd,9271118e1fc48c492b69cdae50fab2981f4345d8..decc59fe0ee8f95ab9a88d4263fd5173e9d777b1
--- 1/net/wireless/scan.c
--- 2/net/wireless/scan.c
+++ b/net/wireless/scan.c
@@@ -48,10 -35,8 +48,8 @@@ void __cfg80211_scan_done(struct work_s
        else
                nl80211_send_scan_done(wiphy_to_dev(request->wiphy), dev);
  
-       wiphy_to_dev(request->wiphy)->scan_req = NULL;
- 
  #ifdef CONFIG_WIRELESS_EXT
 -      if (!aborted) {
 +      if (!request->aborted) {
                memset(&wrqu, 0, sizeof(wrqu));
  
                wireless_send_event(dev, SIOCGIWSCAN, &wrqu, NULL);
@@@ -61,24 -46,9 +59,25 @@@
        dev_put(dev);
  
   out:
 +      cfg80211_unlock_rdev(rdev);
+       wiphy_to_dev(request->wiphy)->scan_req = NULL;
        kfree(request);
  }
 +
 +void cfg80211_scan_done(struct cfg80211_scan_request *request, bool aborted)
 +{
 +      struct net_device *dev = dev_get_by_index(&init_net, request->ifidx);
 +      if (WARN_ON(!dev)) {
 +              kfree(request);
 +              return;
 +      }
 +
 +      WARN_ON(request != wiphy_to_dev(request->wiphy)->scan_req);
 +
 +      request->aborted = aborted;
 +      schedule_work(&wiphy_to_dev(request->wiphy)->scan_done_wk);
 +      dev_put(dev);
 +}
  EXPORT_SYMBOL(cfg80211_scan_done);
  
  static void bss_release(struct kref *ref)