Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
David S. Miller [Thu, 13 Aug 2009 00:44:53 +0000 (17:44 -0700)]
Conflicts:
arch/microblaze/include/asm/socket.h

61 files changed:
1  2 
Documentation/kernel-parameters.txt
MAINTAINERS
arch/mips/ar7/platform.c
arch/mips/kernel/scall64-n32.S
arch/mips/kernel/scall64-o32.S
drivers/misc/sgi-xp/xpnet.c
drivers/net/3c59x.c
drivers/net/a2065.c
drivers/net/bmac.c
drivers/net/bnx2x_main.c
drivers/net/epic100.c
drivers/net/fealnx.c
drivers/net/fec.c
drivers/net/gianfar.c
drivers/net/hamachi.c
drivers/net/hamradio/baycom_epp.c
drivers/net/irda/w83977af_ir.c
drivers/net/ixgbe/ixgbe.h
drivers/net/ixgbe/ixgbe_82598.c
drivers/net/ixgbe/ixgbe_main.c
drivers/net/ixgbe/ixgbe_type.h
drivers/net/mlx4/en_rx.c
drivers/net/mlx4/en_tx.c
drivers/net/natsemi.c
drivers/net/netxen/netxen_nic_main.c
drivers/net/pci-skeleton.c
drivers/net/pcmcia/nmclan_cs.c
drivers/net/pcnet32.c
drivers/net/ppp_generic.c
drivers/net/sky2.c
drivers/net/starfire.c
drivers/net/sundance.c
drivers/net/tulip/de2104x.c
drivers/net/tulip/tulip_core.c
drivers/net/tulip/winbond-840.c
drivers/net/tun.c
drivers/net/wan/sbni.c
drivers/net/wireless/ath/ar9170/main.c
drivers/net/wireless/ath/ar9170/usb.c
drivers/net/wireless/ipw2x00/ipw2200.c
drivers/net/wireless/iwlwifi/iwl-core.c
drivers/net/wireless/iwlwifi/iwl-debugfs.c
drivers/net/wireless/iwlwifi/iwl3945-base.c
drivers/net/wireless/iwmc3200wifi/commands.c
drivers/net/wireless/libertas/assoc.c
drivers/net/wireless/mwl8k.c
drivers/net/wireless/ray_cs.c
drivers/net/wireless/wavelan_cs.c
drivers/net/yellowfin.c
drivers/staging/stlc45xx/stlc45xx.c
include/net/cfg80211.h
net/core/dev.c
net/core/net_namespace.c
net/dccp/proto.c
net/econet/af_econet.c
net/ieee802154/af_ieee802154.c
net/ieee802154/dgram.c
net/ieee802154/raw.c
net/wireless/reg.c
net/wireless/reg.h
net/wireless/scan.c

Simple merge
diff --cc 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
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -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)) {
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -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;
diff --cc net/core/dev.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge