From: David S. Miller <davem@davemloft.net>
Date: Thu, 13 Aug 2009 00:44:53 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.32-rc1~703^2~447
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=aa11d958d1a6572eda08214d7c6a735804fe48a5;p=~shefty%2Frdma-dev.git

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

Conflicts:
	arch/microblaze/include/asm/socket.h
---

aa11d958d1a6572eda08214d7c6a735804fe48a5
diff --cc MAINTAINERS
index df55d24a2f6,aee67a88889..22af4965c16
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -4984,15 -4291,12 +4291,12 @@@ L:	linux-wireless@vger.kernel.or
  W:	http://linuxwireless.org/
  T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
  S:	Maintained
 -F:	drivers/net/wireless/rtl818*
 +F:	drivers/net/wireless/rtl818x/rtl8180*
  
  RTL8187 WIRELESS DRIVER
- P:	Herton Ronaldo Krzesinski
- M:	herton@mandriva.com.br
- P:	Hin-Tak Leung
- M:	htl10@users.sourceforge.net
- P:	Larry Finger
- M:	Larry.Finger@lwfinger.net
+ M:	Herton Ronaldo Krzesinski <herton@mandriva.com.br>
+ M:	Hin-Tak Leung <htl10@users.sourceforge.net>
+ M:	Larry Finger <Larry.Finger@lwfinger.net>
  L:	linux-wireless@vger.kernel.org
  W:	http://linuxwireless.org/
  T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
@@@ -6466,18 -5570,8 +5570,17 @@@ M:	Miloslav Trmac <mitr@volny.cz
  S:	Maintained
  F:	drivers/input/misc/wistron_btns.c
  
 +WL1251 WIRELESS DRIVER
 +P:	Kalle Valo
 +M:	kalle.valo@nokia.com
 +L:	linux-wireless@vger.kernel.org
 +W:	http://wireless.kernel.org
 +T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
 +S:	Maintained
 +F:	drivers/net/wireless/wl12xx/wl1251*
 +
  WL3501 WIRELESS PCMCIA CARD DRIVER
- P:	Arnaldo Carvalho de Melo
- M:	acme@ghostprotocols.net
+ M:	Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
  L:	linux-wireless@vger.kernel.org
  W:	http://oops.ghostprotocols.net:81/blog
  S:	Maintained
diff --cc drivers/net/netxen/netxen_nic_main.c
index c91e0224581,70c05c4c0ca..98271f962ae
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@@ -281,18 -288,19 +289,23 @@@ nx_update_dma_mask(struct netxen_adapte
  	}
  
  	return 0;
+ 
+ err_out:
+ 	pci_set_dma_mask(pdev, old_mask);
+ 	pci_set_consistent_dma_mask(pdev, old_cmask);
+ 	return err;
  }
  
 -static void netxen_check_options(struct netxen_adapter *adapter)
 +static void
 +netxen_check_options(struct netxen_adapter *adapter)
  {
 -	if (adapter->ahw.port_type == NETXEN_NIC_XGBE)
 -		adapter->num_rxd = MAX_RCV_DESCRIPTORS_10G;
 -	else if (adapter->ahw.port_type == NETXEN_NIC_GBE)
 -		adapter->num_rxd = MAX_RCV_DESCRIPTORS_1G;
 +	if (adapter->ahw.port_type == NETXEN_NIC_XGBE) {
 +		adapter->num_rxd = DEFAULT_RCV_DESCRIPTORS_10G;
 +		adapter->num_jumbo_rxd = MAX_JUMBO_RCV_DESCRIPTORS_10G;
 +	} else if (adapter->ahw.port_type == NETXEN_NIC_GBE) {
 +		adapter->num_rxd = DEFAULT_RCV_DESCRIPTORS_1G;
 +		adapter->num_jumbo_rxd = MAX_JUMBO_RCV_DESCRIPTORS_1G;
 +	}
  
  	adapter->msix_supported = 0;
  	if (NX_IS_REVISION_P3(adapter->ahw.revision_id)) {
diff --cc include/net/cfg80211.h
index fa729979de8,d1892d66701..64df51d9a89
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@@ -1104,9 -1008,8 +1108,10 @@@ struct wiphy 
  
  	bool custom_regulatory;
  	bool strict_regulatory;
+ 	bool disable_beacon_hints;
  
 +	bool netnsok;
 +
  	enum cfg80211_signal_type signal_type;
  
  	int bss_priv_size;