From: David S. Miller <davem@davemloft.net>
Date: Thu, 30 Apr 2009 03:30:35 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=aba7453037c3a90714caae77a622dceaf1173786;p=linux-beck.git

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

Conflicts:
	Documentation/isdn/00-INDEX
	drivers/net/wireless/iwlwifi/iwl-scan.c
	drivers/net/wireless/rndis_wlan.c
	net/mac80211/main.c
---

aba7453037c3a90714caae77a622dceaf1173786
diff --cc Documentation/isdn/00-INDEX
index 33543ac7d81f,5a2d69989a8c..f6010a536590
--- a/Documentation/isdn/00-INDEX
+++ b/Documentation/isdn/00-INDEX
@@@ -12,10 -14,24 +14,19 @@@ READM
  	- general info on what you need and what to do for Linux ISDN.
  README.FAQ
  	- general info for FAQ.
+ README.audio
+ 	- info for running audio over ISDN.
+ README.fax
+ 	- info for using Fax over ISDN.
+ README.gigaset
+ 	- info on the drivers for Siemens Gigaset ISDN adapters.
+ README.icn
+ 	- info on the ICN-ISDN-card and its driver.
++>>>>>>> 93af7aca44f0e82e67bda10a0fb73d383edcc8bd:Documentation/isdn/00-INDEX
  README.HiSax
  	- info on the HiSax driver which replaces the old teles.
 -README.hfc-pci
 -	- info on hfc-pci based cards.
 -README.pcbit
 -	- info on the PCBIT-D ISDN adapter and driver.
 -README.syncppp
 -	- info on running Sync PPP over ISDN.
 -syncPPP.FAQ
 -	- frequently asked questions about running PPP over ISDN.
 +README.audio
 +	- info for running audio over ISDN.
  README.avmb1
  	- info on driver for AVM-B1 ISDN card.
  README.act2000
@@@ -26,25 -42,11 +37,29 @@@ README.conca
  	- info on "CONCAP" encapsulation protocol interface used for X.25.
  README.diversion
  	- info on module for isdn diversion services.
 +README.fax
 +	- info for using Fax over ISDN.
 +README.gigaset
 +	- info on the drivers for Siemens Gigaset ISDN adapters
 +README.hfc-pci
 +	- info on hfc-pci based cards.
 +README.hysdn
 +        - info on driver for Hypercope active HYSDN cards
 +README.icn
 +	- info on the ICN-ISDN-card and its driver.
 +README.mISDN
 +	- info on the Modular ISDN subsystem (mISDN)
 +README.pcbit
 +	- info on the PCBIT-D ISDN adapter and driver.
  README.sc
  	- info on driver for Spellcaster cards.
 +README.syncppp
 +	- info on running Sync PPP over ISDN.
  README.x25
- 	- info on running X.25 over ISDN.
+ 	- info for running X.25 over ISDN.
 +syncPPP.FAQ
 +	- frequently asked questions about running PPP over ISDN.
+ README.hysdn
+ 	- info on driver for Hypercope active HYSDN cards
+ README.mISDN
+ 	- info on the Modular ISDN subsystem (mISDN).
diff --cc net/mac80211/main.c
index 5320e08434ac,14134193cd17..5ca62ea15079
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@@ -776,9 -752,12 +776,10 @@@ struct ieee80211_hw *ieee80211_alloc_hw
  	/* set up some defaults */
  	local->hw.queues = 1;
  	local->hw.max_rates = 1;
 -	local->rts_threshold = IEEE80211_MAX_RTS_THRESHOLD;
 -	local->fragmentation_threshold = IEEE80211_MAX_FRAG_THRESHOLD;
 -	local->hw.conf.long_frame_max_tx_count = 4;
 -	local->hw.conf.short_frame_max_tx_count = 7;
 +	local->hw.conf.long_frame_max_tx_count = wiphy->retry_long;
 +	local->hw.conf.short_frame_max_tx_count = wiphy->retry_short;
  	local->hw.conf.radio_enabled = true;
+ 	local->user_power_level = -1;
  
  	INIT_LIST_HEAD(&local->interfaces);
  	mutex_init(&local->iflist_mtx);
@@@ -1037,38 -965,25 +1037,38 @@@ int ieee80211_register_hw(struct ieee80
  		}
  	}
  
 +	local->network_latency_notifier.notifier_call =
 +		ieee80211_max_network_latency;
 +	result = pm_qos_add_notifier(PM_QOS_NETWORK_LATENCY,
 +				     &local->network_latency_notifier);
 +
 +	if (result) {
 +		rtnl_lock();
 +		goto fail_pm_qos;
 +	}
 +
  	return 0;
  
 -fail_rate:
 + fail_pm_qos:
 +	ieee80211_led_exit(local);
 +	ieee80211_remove_interfaces(local);
-  fail_wep:
- 	rate_control_deinitialize(local);
 + fail_rate:
  	unregister_netdevice(local->mdev);
  	local->mdev = NULL;
 -fail_dev:
 + fail_dev:
  	rtnl_unlock();
+ 	ieee80211_wep_free(local);
 -fail_wep:
++ fail_wep:
  	sta_info_stop(local);
 -fail_sta_info:
 + fail_sta_info:
  	debugfs_hw_del(local);
  	destroy_workqueue(local->hw.workqueue);
 -fail_workqueue:
 + fail_workqueue:
  	if (local->mdev)
  		free_netdev(local->mdev);
 -fail_mdev_alloc:
 + fail_mdev_alloc:
  	wiphy_unregister(local->hw.wiphy);
 -fail_wiphy_register:
 + fail_wiphy_register:
  	kfree(local->int_scan_req.channels);
  	return result;
  }