Update compat-wireless to 2.6.36-5-spn

chromeos/compat-wireless/net/wireless/nl80211.c

 /*
  * This is the new netlink-based wireless configuration interface.
  *
  * Copyright 2006-2010  Johannes Berg <johannes@sipsolutions.net>
  */
 
 #include <linux/if.h>
 #include <linux/module.h>
 #include <linux/err.h>
 #include <linux/slab.h>
@@ skipping 745 matching lines @@
 static int nl80211_set_channel(struct sk_buff *skb, struct genl_info *info)
 {
         struct cfg80211_registered_device *rdev;
         struct net_device *netdev;
         int result;
 
         rtnl_lock();
 
         result = get_rdev_dev_by_info_ifindex(info, &rdev, &netdev);
         if (result)
-                goto unlock;
+                goto unlock_rtnl;
 
         result = __nl80211_set_channel(rdev, netdev->ieee80211_ptr, info);
 
- unlock:
+        dev_put(netdev);
+        cfg80211_unlock_rdev(rdev);
+ unlock_rtnl:
         rtnl_unlock();
 
         return result;
 }
 
 static int nl80211_set_wiphy(struct sk_buff *skb, struct genl_info *info)
 {
         struct cfg80211_registered_device *rdev;
         struct net_device *netdev = NULL;
         struct wireless_dev *wdev;
@@ skipping 4214 matching lines @@
         struct net_device *dev;
         int err;
 
         if (threshold > 0)
                 return -EINVAL;
 
         rtnl_lock();
 
         err = get_rdev_dev_by_info_ifindex(info, &rdev, &dev);
         if (err)
-                goto unlock_rdev;
+                goto unlock_rtnl;
 
         wdev = dev->ieee80211_ptr;
 
         if (!rdev->ops->set_cqm_rssi_config) {
                 err = -EOPNOTSUPP;
                 goto unlock_rdev;
         }
 
         if (wdev->iftype != NL80211_IFTYPE_STATION) {
                 err = -EOPNOTSUPP;
                 goto unlock_rdev;
         }
 
         err = rdev->ops->set_cqm_rssi_config(wdev->wiphy, dev,
                                              threshold, hysteresis);
 
-unlock_rdev:
+ unlock_rdev:
         cfg80211_unlock_rdev(rdev);
         dev_put(dev);
+ unlock_rtnl:
         rtnl_unlock();
 
         return err;
 }
 
 static int nl80211_set_cqm_bitrate(struct genl_info *info,
                                            u32 trigger_rate)
 {
         struct cfg80211_registered_device *rdev;
         struct wireless_dev *wdev;
@@ skipping 1298 matching lines @@
  err_out:
         genl_unregister_family(&nl80211_fam);
         return err;
 }
 
 void nl80211_exit(void)
 {
         netlink_unregister_notifier(&nl80211_netlink_notifier);
         genl_unregister_family(&nl80211_fam);
 }