[GIT] Networking
in [Kernel]
|
Prev: [PATCH v6 3/3] KVM: MMU: prefetch ptes when intercepted guest #PF
Next: cgroups: read-write lock CLONE_THREAD forking per threadgroup
From: David Miller on 3 Aug 2010 23:40 Another release, another merge window, another set of networking changes to merge :-) Besides the usual assortment of cleanups and bug fixes, we have: 1) Some BKL-->mutex conversions from Arnd Bergmann 2) Support for higher granularity for inter-transmission gaps in pktgen from Daniel Turull. 3) Several optimizations from Eric Dumazet including: a) Use __this_cpu_inc() where possible b) Use less atomic bitops in packet scheduler c) Convert IP input route resolution paths to RCU d) some RCU'ification of the ARP code as well e) Less atomic ops in RAW socket transmit f) Similarly in IGMP and ICMP redirect processing g) Start supporting 64-bit network device statistics ubiquitously h) convert inetpeer cache to RCU i) allow TSO to be enabled on devices underneath VLANs Also, he added support for dumping routing table entries by MARK value. 4) Support SCM socket facilities across namespaces, from Eric W. Biederman 5) Support for ECN in TCP syncookies, along with other syncookie validation improvements, from Florian Westphal 6) Some BPF filter optimizations from Hagen Paul Pfeifer 7) Fix netpoll facilities so that bridging can be supported properly, from Herbert Xu 8) Add a network device notifier event in order to facilitate things like fast guest migration. From Ian Campbell. 9) Support VLAN "0" properly, from Pedro Garcia. 10) Allow AF_PACKET to provide hw packet timestamps even when in 'mmap' mode. From Scott McMillan 11) Scalability improvements in /proc/net/tcp reading, from Tom Herbert. Please pull, thanks a lot! The following changes since commit 3a09b1be53d23df780a0cd0e4087a05e2ca4a00c: Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw (2010-08-03 14:40:10 -0700) are available in the git repository at: master.kernel.org:/pub/scm/linux/kernel/git/davem/net-next-2.6.git master Ajit Khaparde (13): be2net: enable ipv6 tso support be2net: changes to properly provide phy details be2net: change to call pmac_del only if necessary be2net: add support to get vf config be2net: add vlan support for sriov virtual functions be2net: code to support tx rate configuration on virtual functions be2net: supress printing error when mac query fails for VF be2net: variable name changes be2net: bump the driver version number be2net: fix to correctly know if driver needs to run for a VF or a PF be2net: add code to dump registers for debug be2net: change to show correct physical link status be2net: fix to avoid sending get_stats request if one is already being processed. Alex Lorca (1): net-caif: Added missing lock validator constants Alexander Duyck (10): skbuff: add check for non-linear to warn_if_lro and needs_linearize ixgbe: update set_rx_mode to fix issues w/ macvlan x86: Align skb w/ start of cacheline on newer core 2/Xeon Arch x86: Drop CONFIG_MCORE2 check around setting of NET_IP_ALIGN igb: correct link test not being run when link is down igb: drop support for UDP hashing w/ RSS e1000: allow option to limit number of descriptors down to 48 per ring ixgbe: drop support for UDP in RSS hash generation ixgbevf: fix null pointer dereference due to filter being set for VLAN 0 igb: Program MDICNFG register prior to PHY init Amerigo Wang (1): mlx4: add dynamic LRO disable support Ameya Palande (1): wl12xx: Use MODULE_ALIAS macro at correct postion for SPI bus Amit Kumar Salecha (13): qlcnic: fix register access qlcnic: cleanup skb allocation qlcnic: handshake with card after fw load qlcnic: fix mac address mgmt qlcnic: release device resources during interface down qlcnic: dont free host resources during fw recovery qlcnic: offload tx timeout recovery qlcnic: mark context state freed after destroy qlcnic: update version to 5.0.6 qlcnic: disable tx timeout recovery qlcnic: fix netdev notifier in error path qlcnic: fix pci resource leak qlcnic: fix loopback test Amitkumar Karwar (3): libertas: Added callback functions to support SDIO suspend/resume. libertas: Added support for host sleep feature Bluetooth: Process interrupt in main thread of btmrvl driver as well Andrew Morton (2): net: fix "netpoll: Allow netpoll_setup/cleanup recursion" drivers/net/82596.c: fix warning Andrew O. Shadoura (1): 3c59x: Add ethtool WOL support Andy Gospodarek (3): bonding: add all_slaves_active parameter bonding: allow user-controlled output slave selection bonding: prevent sysfs from allowing arp monitoring with alb/tlb Andy Shevchenko (9): drivers: isdn: use kernel macros to convert hex digit drivers: isdn: remove custom strtoul() drivers: isdn: get rid of custom strtoul() drivers/net/cxgb3/t3_hw.c: use new hex_to_bin() method drivers: atm: don't use private copy of hex_to_bin() drivers: net: use newly introduced hex_to_bin() usb: usbnet: use newly introduced hex_to_bin() wireless: use newly introduced hex_to_bin() net: core: don't use own hex_to_bin() method Anirban Chakraborty (9): qlcnic: NIC Partitioning - Add basic infrastructure support qlcnic: NIC Partitioning - Add non privileged mode support qlcnic: Fix Compilation Issue when CONFIG_INET was not set qlcnic: Fix a bug in setting up NIC partitioning mode qlcnic: Bumped up version number qlcnic: Remove obsolete code qlcnic: Check FW capability for TSO qlcnic: Disable admin tools interface for VF driver mode qlcnic: restore NPAR config data after recovery Anton Vorontsov (3): gianfar: Implement workaround for eTSEC74 erratum gianfar: Implement workaround for eTSEC76 erratum gianfar: Implement workaround for eTSEC-A002 erratum Arnaud Ebalard (1): ipv6: Refactor update of IPv6 flowi destination address for srcrt (RH) option Arnd Bergmann (2): isdn: autoconvert trivial BKL users to private mutex net: autoconvert trivial BKL users to private mutex Arnd Hannemann (1): netfilter: fix simple typo in KConfig for netfiltert xt_TEE Baruch Siach (1): fec: use interrupt for MDIO completion indication Ben Hutchings (33): sfc: Rename struct efx_mcdi_phy_cfg to efx_mcdi_phy_data sfc: Only count bad packets in rx_errors sfc: Get port number from CS_PORT_NUM, not PCI function number net: Enable 64-bit net device statistics on 32-bit architectures sfc: Implement 64-bit net device statistics on all architectures usbnet: Print device statistics as unsigned irttp: Print device parameters and statistics as unsigned ethtool: Revert incorrect indentation changes net: Fix error in comment on net_device_ops::ndo_get_stats sfc: Implement ethtool register dump operation sfc: Log MTD errors using partition name, not just net device name sfc: Implement message level control sfc: Replace EFX_DRIVER_NAME with KBUILD_MODNAME sfc: Disable setting feature flags that are not implemented sfc: Record hardware RX hash on each skb where possible sfc: Fix reading of inserted hash sfc: Move siena_nic_data::ipv6_rss_key to efx_nic::rx_hash_key sfc: Use Toeplitz IPv4 hash for RSS and hash insertion sfc: Log clearer error messages for hardware monitor 3c59x: Specify window explicitly for access to windowed registers 3c59x: Use fine-grained locks for MII and windowed register access ipv6: Clamp reported valid_lft to a minimum of 0 ipv6: Use interface max_desync_factor instead of static default ethtool: Change ethtool_op_set_flags to validate flags netdev: Make ethtool_ops::set_flags() return -EINVAL for unsupported flags vmxnet3: Remove incorrect implementation of ethtool_ops::get_flags() ethtool: Add support for control of RX flow hash indirection sfc: Add support for RX flow hash control IB/{nes, ipoib}: Pass supported flags to ethtool_op_set_flags() sfc: Remove unused field left from mis-merge net: Get rid of rtnl_link_stats64 / net_device_stats union net: Document that dev_get_stats() returns the given pointer 3c59x: Fix call to mdio_sync() with the wrong argument Bhavesh Davda (1): net-next: Fix an overflow bug in vmxnet3 Tx descriptor Bob Copeland (2): ath5k: move reset to mac80211 workqueue ath5k: disable tasklets during reset Brian King (1): ehea: Allocate stats buffer with GFP_KERNEL Bruce Allan (17): e1000e: cleanup ethtool loopback setup code e1000e: cleanup e1000_sw_lcd_config_ich8lan() e1000e: separate out PHY statistics register updates e1000e: fix check for manageability on ICHx/PCH e1000e: initial support for 82579 LOMs e1000e: enable support for EEE on 82579 e1000e: update copyright information e1000e: update driver version number e1000e: avoid polling h/w registers during link negotiation e1000e: do not touch PHY page 800 registers when link speed is 1000Mbps e1000e: packet split should not be used with early receive e1000e: disable gig speed when in S0->Sx transition e1000e: suppress compile warnings on certain archs e1000e: remove EEE module parameter e1000e: disable EEE support by default e1000e: 82577/82578 PHY register access issues e1000e: correct MAC-PHY interconnect register offset for 82579 Bruno Randolf (33): ath5k: initialize calibration timers ath5k: move noise floor calibration into tasklet ath5k: Stop queues only for NF calibration ath5k: run NF calibration only every 60 seconds ath5k: remove ATH_TRACE macro ath5k: clarify logic when to enable spur mitigation filter ath5k: use ath5k_softc as driver data ath5k: add sysfs files for ANI parameters ath5k: always calculate ANI listen time ath5k: print error message if ANI levels are out of range ath5k: update AR5K_PHY_RESTART_DIV_GC values to match masks ath5k: new function for setting the antenna switch table ath5k: no need to save/restore the default antenna ath5k: add debugfs file for queue debugging ath5k: more debug prints for resets ath5k: rename ath5k_txbuf_free() to ath5k_txbuf_free_skb() ath5k: fix some comment typos ath5k: fix rx descriptor debugging ath5k: print more errors when decriptor setup fails ath5k: reset more pointers after we free skbs ath5k: unify rx descriptor error handling ath5k: split descriptor handling and frame receive ath5k: move checks and stats into new function ath5k: use direct function calls for descriptors when possible ath5k: cosmetic changes in ath5k_hw_proc_5212_rx_status() ath5k: remove pointless rx error overlay struct ath5k: review and add comments for descriptors ath5k: update 5210/5211 frame types ath5k: take descriptor differences between 5210 and 5211 into account ath5k: review RX descriptor functions ath5k: report PHY error frames only for chips which need it ath5k: fix antenna div gc for <= AR5K_SREV_PHY_2413 ath5k: clean up rxlink handling Carsten Otte (8): qeth: Rework qeth_dbf_longtext qeth: Add new s390 debug feature for each qeth card qeth: Fold qeth_trace debug area qeth: Fold qeth_sense debug area qeth: Fold qeth_misc debug area qeth: Fold qeth_qerr debug area qeth: fix use after free for qeths debug area qeth: Clear mac_bits field when switching between Layer 2 and Layer 3 Casey Leedom (17): cxgb4vf: small changes to message processing structures/macros cxgb4vf: update to latest T4 firmware API file cxgb4vf: Add new macros and definitions for hardware constants cxgb4vf: Add code to provision T4 PCI-E SR-IOV Virtual Functions with hardware resources cxgb4vf: Add core T4 PCI-E SR-IOV Virtual Function hardware definitions and device communication code cxgb4vf: Add T4 Virtual Function Scatter-Gather Engine DMA code cxgb4vf: Add main T4 PCI-E SR-IOV Virtual Function driver for cxgb4vf cxgb4vf: Add new Makefile for T4 PCI-E SR-IOV Virtual Function driver cxgb4vf cxgb4vf: Stitch new T4 PCI-E SR-IOV Virtual Function driver into the build cxgb4vf: Remove obsolete comment about the lack of a TX Timer Callback cxgb4vf: Use correct shift factor for extracting the SGE DMA Ingress Padding Boundary cxgb4vf: Implement "Unhandled Interrupts" statistic cxgb4vf: fix TX Queue restart cxgb4vf: fix SGE resource resource deallocation bug cxgb4vf: Fix off-by-one error checking for the end of the mailbox delay array cxgb4vf: Fix bug where we were only allocating one queue in MSI mode cxgb4vf: add maintainer entry for cxgb4vf Catalin Marinas (1): smsc911x: Add spinlocks around registers access Changli Gao (30): htb: remove two unnecessary assignments net-next: remove useless union keyword tcp: unify tcp flag macros act_mirred: don't clone skb when skb isn't shared act_mirred: combine duplicate code act_nat: use stack variable fragment: add fast path for in-order fragments netfilter: nf_conntrack_reasm: add fast path for in-order fragments netfilter: ipt_REJECT: postpone the checksum calculation. netfilter: xt_TPROXY: the length of lines should be within 80 net: cleanups inet, inet6: make tcp_sendmsg() and tcp_sendpage() through inet_sendmsg() and inet_sendpage() netfilter: nf_nat_core: merge the same lines netfilter: arptables: use arp_hdr_len() netfilter: xt_quota: use per-rule spin lock xt_quota: report initial quota value instead of current value to userspace netfilter: ip6tables: use skb->len for accounting netfilter: iptables: use skb->len for accounting genetlink: cleanup code according to CodingStyle drop_monitor: use genl_register_family_with_ops() genetlink: use genl_register_family_with_ops() act_nat: fix wild pointer act_nat: the checksum of ICMP doesn't have pseudo header netfilter: nf_conntrack_extend: introduce __nf_ct_ext_exist() netfilter: nf_nat: use local variable hdrlen netfilter: nf_nat: make unique_tuple return void netfilter: nf_nat: don't check if the tuple is unique when there isn't any other choice netfilter: nf_conntrack_acct: use skb->len for accounting ip_fragment: fix subtracting PPPOE_SES_HLEN from mtu twice net: cleanup inclusion Chihau Chau (1): Net: ethernet: pe2.c: fix EXPORT_SYMBOL macro code style issue Choi, David (1): micrel phy driver - updated(1) Christian Lamparter (3): p54: update MAINTAINERS mac80211: skip HT parsing if HW does not support HT cfg80211: fix dev <-> wiphy typo Christoph Egger (7): net: Removing dead {AR,WAVE}LAN cassini: Removing dead CASSINI_QGE_DEBUG cassini: Removing dead CASSINI_MULTICAST_REG_WRITE cassini: Removing dead CASSINI_NAPI cs89x0: Removing dead SH_HICOSH4 eth_v10: Removing dead ETRAX_NETWORK_RED_ON_NO_CONNECTION net: Removing dead ARCH_PNX010X Cyril Chemparathy (2): phy/marvell: add 88e1121 interface mode support phy/marvell: add 88ec048 support Cyril Lacoux (1): Bluetooth: Added support for controller shipped with iMac i5 Dan Carpenter (29): caif: remove unneeded null check in caif_connect() caif: cleanup: remove duplicate checks caif: remove unneeded variable from caif_net_open() caif: add newlines after declarations in caif_serial.c ath9k/debug: improve the snprintf() handling ath9k/debug: fixup the return codes ath9k: cleanup: remove unneeded null check enic: cleanup vic_provinfo_alloc() cpmac: use resource_size() prism54: call BUG_ON() earlier hostap: fixup strlen() math 9p: strlen() doesn't count the terminator isdn: fix strlen() usage net/sched: potential data corruption orinoco_usb: potential null dereference arcnet: fix signed bug in probe function caif: precedence bug stmmac: handle allocation errors in setup functions mv643xx_eth: potential null dereference ath9k: snprintf() returns largish values ath5k: snprintf() returns largish values mac80211: freeing the wrong variable wireless: remove unneeded variable from regulatory_hint_11d() libertas: precedence bug caif: handle snprintf() return Bluetooth: Fix kfree() => kfree_skb() in hci_ath.c ixgbe: potential null dereference dnet: fixup error handling in initialization hp100: unmap memory on error path Dan Williams (16): libertas: clean up MONITOR_MODE command libertas: clean up RSSI command libertas: convert 11D_DOMAIN_INFO to a direct command libertas: remove unused indirect TPC_CFG command leftovers libertas: remove unused Automatic Frequency Control command libertas: remove Beacon Control libertas: convert LED_GPIO_CTRL to a direct command libertas: convert register access to direct commands libertas: convert Mesh Blinding Table access to a direct command libertas: convert CMD_FWT_ACCESS to a direct command libertas: remove unused indirect command response handler libertas: convert PS_MODE to a direct command libertas: convert DEEP_SLEEP timer to a direct command libertas: kill unused lbs_prepare_and_send_command() libertas: rename lbs_get_cmd_ctrl_node() to lbs_get_free_cmd_node() libertas: remove unused cmd_pending waitq Daniel Halperin (3): iwlwifi: parse block ack responses correctly iwlwifi: fix wrapping when handling aggregated batches iwlwifi: update LQ for bcast station on channel change Daniel Mack (1): drivers/net/arcnet/capmode.c: clean up code Daniel Turull (1): pktgen: increasing transmission granularity David Daney (2): netdev: octeon_mgmt: Fix section mismatch errors. netdev: mdio-octeon: Fix section mismatch errors. David Gnedt (1): mac80211: set carrier on for monitor interfaces on ieee80211_open David J. Choi (1): drivers/net: Add Micrel KS8841/42 support to ks8842 driver David S. Miller (34): Merge branch 'master' of master.kernel.org:/.../davem/net-2.6 net: Fix NETDEV_NOTIFY_PEERS to not conflict with NETDEV_BONDING_DESLAVE. Merge branch 'vhost-net-next' of git://git.kernel.org/.../mst/vhost Merge branch 'master' of master.kernel.org:/.../davem/net-2.6 Merge branch 'master' of git://git.kernel.org/.../linville/wireless-next-2.6 Merge branch 'master' of master.kernel.org:/.../davem/net-2.6 Merge branch 'master' of master.kernel.org:/.../davem/net-2.6 Merge branch 'master' of git://git.kernel.org/.../kaber/nf-next-2.6 gadget/rndis: dev_get_stats() now returns rtnl_link_stats64. net: Export cred_to_ucred to modules. Merge branch 'master' of git://git.kernel.org/.../linville/wireless-next-2.6 Merge branch 'master' of master.kernel.org:/.../davem/net-2.6 Merge branch 'master' of git://git.kernel.org/.../linville/wireless-next-2.6 Merge branch 'master' of git://git.kernel.org/.../kaber/nf-next-2.6 Merge branch 'master' of master.kernel.org:/.../davem/net-2.6 niu: BUG on inability to find page in rx page hashes. ethoc: Fix warning in ethoc_init_ring(). macvtap: Use dev_t for macvtap_major. Revert "tc35815: fix iomap leak" Merge branch 'for-davem' of git://git.kernel.org/.../linville/wireless-next-2.6 sch_atm: Convert to use standard list_head facilities. ks8842: Fix ks8842_tx_frame() for 16bit case. ipv6: Make IP6CB(skb)->nhoff 16-bit. Merge branch 'master' of master.kernel.org:/.../davem/net-2.6 vhost net: Fix warning. r6040: Fix args to phy_mii_ioctl(). Merge branch 'master' of git://git.kernel.org/.../linville/wireless-next-2.6 wireless: Make COMPAT_NETLINK_MESSAGES depend upon WEXT_CORE Merge branch 'master' of master.kernel.org:/.../davem/net-2.6 ks8842: Fix warnings on 64-bit. Merge branch 'master' of git://git.kernel.org/.../kaber/nf-next-2.6 Merge branch 'vhost-net-next' of git://git.kernel.org/.../mst/vhost Merge branch 'master' of master.kernel.org:/.../davem/net-2.6 Revert "net: remove zap_completion_queue" David Stevens (1): vhost-net: mergeable buffers support Dean Nelson (1): e1000e: don't inadvertently re-set INTX_DISABLE Denis Kirjanov (7): fec: convert TX hook to netdev_tx_t fec: Cleanup PHY probing fec: convert legacy PM hooks to dem_pm_ops ll_temac: add error checking to DMA init path cxgb4: Use kfree_skb for skb pointers ll_temac: fix DMA resources leak ll_temac: Fix missing validate_addr hook Dimitris Michailidis (24): cxgb4: dynamically determine flash size and FW image location cxgb4: rearrange initialization code in preparation for EEH cxgb4: implement EEH cxgb4: set dev_id to the port number cxgb4: switch to 64 bit inteface statistics cxgb4: propagate link initialization errors to .ndo_open's callers cxgb4: add a missing error interrupt cxgb4: update FW definitions cxgb4: minor cleanup cxgb4: fix for new ndo_get_stats64 signature cxgb4: move the choice of interrupt type before net_device registration cxgb4: avoid duplicating some resource freeing code cxgb4: add user manipulation of the RSS table cxgb4: implement the ETHTOOL_GRXFH command cxgb4: exclude registers with read side effects from register dumps cxgb4: disable an interrupt that is neither used nor serviced cxgb4: don't offload Rx checksums for IPv6 fragments cxgb4: fix TSO descriptors cxgb4: get on-chip queue info from FW and create a memory window for them cxgb4: advertise NETIF_F_TSO_ECN cxgb4: support running the driver on PCI functions besides 0 cxgb4: fix wrong shift direction cxgb4: add new PCI IDs cxgb4: update driver version Divy Le Ray (2): cxgb3: update FW to 7.10 cxgb3: request 7.10 firmware Dmitry Eremin-Solenikov (2): broadcom: move all PHY_ID's to header broadcom: Add 5241 support Dmitry Kravkov (8): bnx2x: Create separate folder for bnx2x driver bnx2x: store module parameters in driver main structure bnx2x: move global variable load_count to bnx2x.h bnx2x: Create bnx2x_cmn.* files bnx2x: Create separate file for ethtool routines bnx2x: Move statistics handling code to bnx2x_stats.* bnx2x: update driver version to 1.52.53-3 bnx2x: Update MAINTAINERS according to new location Dmitry Popov (1): tcp: cookie transactions setsockopt memory leak Don Skidmore (2): ixgbe: add 1g PHY support for 82599 ixgbe: fix version string for ixgbe Dor Shaish (1): iwlwifi: Fix null pointer referencing in iwl_dbgfs_rx_queue_read. Eli Cohen (1): mlx4_en: use net_device dev_id to indicate port number Emil Tantilov (5): ixgbe: Use netdev_<level>, dev_<level>, pr_<level> igb: Fix Tx hangs seen when loading igb with max_vfs > 7. ixgbe: use netif_<level> instead of netdev_<level> e1000: use netif_<level> instead of netdev_<level> igb: Use irq_synchronize per vector when using MSI-X Emmanuel Grumbach (3): iwlwifi: rename rxq->dma_addr iwlwifi: rename iwl4965_rx_mpdu_res_start iwlagn: fix the bit mask of a FH register in stop Tx DMA flow Eran Liberty (1): gianfar: code cleanup Eric Benard (1): net/fec: clean suspend/resume Eric Dumazet (82): net: Use __this_cpu_inc() in fast path net: remove zap_completion_queue tcp: tcp_md5_hash_skb_data() frag_list handling ipv6: get rid of ipip6_prl_lock netfilter: br_netfilter: use skb_set_noref() netfilter: xt_statistic: remove nth_lock spinlock net: Define accessors to manipulate QDISC_STATE_RUNNING net: QDISC_STATE_RUNNING dont need atomic bit ops net: add additional lock to qdisc to increase throughput net: CONFIG_NET_NS reduction ipv4: add LINUX_MIB_IPRPFILTER snmp counter ipv4: RCU conversion of ip_route_input_slow/ip_route_input_mc drivers/net: use __packed annotation net: use __packed annotation ipv4: RCU changes in __mkroute_input() arp: RCU changes From abbffa2aa9bd6f8df16d0d0a102af677510d8b9a Mon Sep 17 00:00:00 2001 From: Eric Dumazet <eric.dumazet(a)gmail.com> Date: Thu, 3 Jun 2010 04:29:41 +0000 Subject: [PATCH 2/3] net: net/socket.c and net/compat.c cleanups netfilter: vmalloc_node cleanup raw: avoid two atomics in xmit ip: Router Alert RCU conversion igmp: avoid two atomic ops in igmp_rcv() ipv4: avoid two atomic ops in ip_rt_redirect() net: avoid two atomic ops in ip_rcv_options() anycast: Some RCU conversions netfilter: xt_rateest: Better struct xt_rateest layout netfilter: nf_conntrack: IPS_UNTRACKED bit netfilter: nf_conntrack: per_cpu untracking netfilter: ip_queue: rwlock to spinlock conversion netfilter: ip6_queue: rwlock to spinlock conversion netfilter: nfnetlink_queue: some optimizations netfilter: nfnetlink_log: RCU conversion icmp: RCU conversion in icmp_address_reply() ipv6: mcast: RCU conversions ip: ip_ra_control() rcu fix pkt_sched: gen_kill_estimator() rcu fixes econet: fix locking netfilter: nfnetlink_log: RCU conversion, part 2 ipv6: avoid two atomics in ipv6_rthdr_rcv() ipv6: RCU changes in ipv6_get_mtu() and ip6_dst_hoplimit() loopback: Implement 64bit stats on 32bit arches inetpeer: various changes netfilter: CLUSTERIP: RCU conversion inetpeer: RCU conversion ip_frag: Remove some atomic ops ipfrag : frag_kfree_skb() cleanup net: NET_SKB_PAD should depend on L1_CACHE_BYTES inetpeer: do not use zero refcnt for freed entries inetpeer: restore small inet_peer structures net: Introduce u64_stats_sync infrastructure bridge: 64bit rx/tx counters arp: RCU change in arp_solicit() loopback: use u64_stats_sync infrastructure snmp: add align parameter to snmp_mib_init() ipv6: remove ipv6_statistics net: u64_stats_sync improvements net: use this_cpu_ptr() net: u64_stats_fetch_begin_bh() and u64_stats_fetch_retry_bh() macvlan: 64 bit rx counters vlan: 64 bit rx counters tcp: tso_fragment() might avoid GFP_ATOMIC snmp: 64bit ipstats_mib for all arches netfilter: ipt_REJECT: avoid touching dst ref ipv4: use skb_dst_copy() in ip_copy_metadata() net: fix 64 bit counters on 32 bit arches vlan: allow TSO setting on vlan interfaces bnx2: 64 bit stats on all arches tg3: 64 bit stats on all arches tg3: allow TSO on vlan devices net/ipv4: EXPORT_SYMBOL cleanups net/core: EXPORT_SYMBOL cleanups net: sock_free() optimizations tcp: sizeof struct tcp_skb_cb is 44 bonding: fix bond_inet6addr_event() net: 64bit stats for netdev_queue bonding: avoid a warning net: this_cpu_xxx conversions net: RTA_MARK addition netfilter: add xt_cpu match ixgbe: fix ethtool stats net: pskb_expand_head() optimization netlink: netlink_recvmsg() fix netfilter: {ip,ip6,arp}_tables: dont block bottom half more than necessary Eric W. Biederman (8): scm: Reorder scm_cookie. user_ns: Introduce user_nsmap_uid and user_ns_map_gid. sock: Introduce cred_to_ucred af_unix: Allow SO_PEERCRED to work across namespaces. af_netlink: Add needed scm_destroy after scm_send. scm: Capture the full credentials of the scm sender. af_unix: Allow credentials to work across user and pid namespaces. af_unix: Allow connecting to sockets in other network namespaces. FUJITA Tomonori (10): mwl8k: use the dma state API instead of the pci equivalents iwlwifi: use the DMA state API instead of the pci equivalents ssb: add dma_dev to ssb_device structure b43legacy: replace the ssb_dma API with the generic DMA API b43: replace the ssb_dma API with the generic DMA API b44: replace the ssb_dma API with the generic DMA API ssb: remove the ssb DMA API b44: remove unused dma_desc_align_mask cxgb4vf: remove obsolete DECLARE_PCI_UNMAP_ADDR usage cxgb3: simplify need_skb_unmap Felix Fietkau (53): mac80211: add the minstrel_ht rate control algorithm ath9k_hw: add multicast key search support ath9k_common: use allocated key cache entries for multi BSS crypto support ath9k: use the key handling code from ath9k_common instead of duplicating it ath9k: fix queue stop/start based on the number of pending frames mac80211: reduce debugfs code size ath9k: fix mac80211 queue lookup for waking up queues ath9k_htc: use common WMM AC definitions instead of ath9k ones ath9k: remove duplicate WMM AC definitions ath9k: remove declarations of some nonexistant functions ath9k: make ath_get_hal_qnum static ath9k: fix extending the rx timestamp with the hardware TSF ath9k: fix queue stopping threshold ath9k: add a debugfs entry for ignoring CCA on the extension channel in HT40 ath9k_hw: remove a useless function for setting the mac address ath9k_hw: add register definitions related to PA predistortion ath9k_hw: add support for parsing PA predistortion related EEPROM fields ath9k_hw: add functions for controlling PA predistortion calibration ath9k: implement PA predistortion support ath9k_hw: remove ATH9K_CAP_CIPHER ath9k_hw: remove ATH9K_CAP_TXPOW ath9k_hw: remove ATH9K_CAP_TKIP_MIC ath9k_hw: remove ATH9K_CAP_TKIP_SPLIT ath9k_hw: remove ATH9K_CAP_MCAST_KEYSRCH ath9k/ath9k_htc: remove redundand checks for dual-stream tx support ath9k_hw: remove ATH9K_CAP_DS ath9k: fix retry count for A-MPDU rate control status reports mac80211: fix the for_each_sta_info macro ath9k: fix TSF after reset on AR913x ath9k_hw: fix a few inconsistencies in initval array names ath9k_hw: reformat the ar5008, ar9001 and ar9002 initvals to match ar9003 ath9k_hw: sync initvals for ar9001 and ar9002 with Atheros ath9k_hw: sanitize noise floor values properly on all chips ath9k_hw: clean up the noise floor calibration code to reduce code duplication ath9k: fix false positives in the baseband hang check ath9k: fix crash with WEP in ad-hoc mode ath9k: fix a potential buffer leak in the STA teardown path ath9k: fix a buffer leak in A-MPDU completion ath9k_hw: fix antenna diversity on AR9285 ath9k_hw: fix a sign error in the IQ calibration code ath9k_hw: fix an off-by-one error in the PDADC boundaries calculation ath9k_hw: prevent a fast channel change after a rx DMA stuck issue ath9k_hw: report the TID in the tx status on AR5008-AR9002 ath9k: validate the TID in the tx status information ath9k: merge noisefloor load implementations ath9k: another fix for the A-MPDU buffer leak ath9k_hw: remove initvals for hardware which was never sold mac80211: fix aggregation action frame handling with AP VLANs ath9k: fix yet another buffer leak in the tx aggregation code ath9k_hw: fix invalid extension channel noisefloor readings in HT20 ath9k_hw: fix a small typo in the noisefloor calibration debug code ath9k_hw: simplify noisefloor calibration chainmask calculation mac80211: inform drivers about the off-channel status on channel changes Filip Aben (2): hso: remove driver version hso: Add new product ID Finn Thain (2): mac8390: propagate error code from request_irq mac8390: raise error logging priority Florian Fainelli (2): r6040: implement phylib r6040: bump version to 0.26 and date to 30 May 2010 Florian Mickler (1): e1000e: register pm_qos request on hardware activation Florian Westphal (7): syncookies: make v4/v6 synflood warning behaviour the same syncookies: avoid unneeded tcp header flag double check syncookies: update mss tables ipv6: syncookies: do not skip ->iif initialization syncookies: check decoded options against sysctl settings syncookies: do not store rcv_wscale in tcp timestamp syncookies: add support for ECN Frank Blaschka (1): qeth: fix page breaks in hw headers Geert Uytterhoeven (1): net: mac8390 - Sort out memory/MMIO accesses and casts George Kadianakis (1): net/ipv4/ip_output.c: Removal of unused variable in ip_fragment() Gerrit Renker (2): dccp: remove unused function argument dccp: make implementation of Syn-RTT symmetric Gertjan van Wingerde (24): rt2x00: Move rt2x00debug_dump_frame declaration to rt2x00.h. rt2x00: Push beacon TX descriptor writing to drivers. rt2x00: Reverse calling order of bus write_tx_desc and driver write_tx_desc. rt2x00: Properly reserve room for descriptors in skbs. rt2x00: Fix rt2800usb TX descriptor writing. rt2x00: Clean up USB vendor request buffer functions. rt2x00: Centralize rt2800 beacon writing. rt2x00: Remove RT2870 chipset identification. rt2x00: Move all register definitions for rt2800 to rt2800.h. rt2x00: Introduce separate interface type for PCI-express. rt2x00: Simplify check for external LNA in rt2800_init_rfcsr. rt2x00: Move PCI/USB specific register initializations to rt2800{pci,usb}. rt2x00: Sync rt2800 MCU boot signal with Ralink driver. rt2x00: Fix HT40 operation in rt2800. mac80211: Fix compile warning in scan.c. rt2x00: Fix frame dumping for USB devices. rt2x00: Move filling of TX URB to rt2x00usb_kick_tx_entry function. rt2x00: Merge PCI and USB versions of write_tx_data into single function. rt2x00: Move common txdone handling to rt2x00lib_txdone. rt2x00: Rename driver write_tx_datadesc callback function. rt2x00: Split of TXWI writing to write_tx_data callback in rt2800usb. eeprom_93cx6: Add support for 93c86 EEPROMs. rt2x00: Correctly detect 93C86 EEPROMs in rt2800pci. rt2x00: Align rt2800 EEPROM validation to Ralink vendor driver. Giuseppe CAVALLARO (2): stmmac: fix timer setup when use dual mac Kconfig stmmac: fix automatic PAD/FCS stripping Giuseppe Cavallaro (1): phy: add suspend/resume in the ic+ Grazvydas Ignotas (1): wl1251: fix ELP_CTRL register reads Greg Rose (2): igb: Use only a single Tx queue in SR-IOV mode igb: Add comment Gustavo F. Padovan (46): Bluetooth: Remove max_tx and tx_window module paramenters from L2CAP Bluetooth: Remove L2CAP Extended Features from Kconfig Bluetooth: Fix drop of packets with invalid req_seq/tx_seq Bluetooth: Fix bug with ERTM vars increment Bluetooth: Only check SAR bits if frame is an I-frame Bluetooth: Fix bug in l2cap_ertm_send() behavior Bluetooth: Proper shutdown ERTM when closing the channel Bluetooth: Fix L2CAP control bit field corruption Bluetooth: Stop ack_timer if ERTM enters in Local Busy or SREJ_SENT Bluetooth: Update buffer_seq before retransmit frames Bluetooth: Fix handle of received P-bit Bluetooth: Check the tx_window size on setsockopt Bluetooth: Check packet FCS earlier Bluetooth: Fix missing retransmission action with RR(P=1) Bluetooth: Fix ERTM error reporting to the userspace Bluetooth: Add debug output to ERTM code Bluetooth: Tweaks to l2cap_send_i_or_rr_or_rnr() flow Bluetooth: Change the way we set ERTM mode as mandatory Bluetooth: Disconnect the channel if we don't want the proposed mode Bluetooth: Prefer Basic Mode on receipt of ConfigReq Bluetooth: Actively send request for Basic Mode Bluetooth: Refuse ConfigRsp with different mode Bluetooth: Remove check for supported mode Bluetooth: Disconnect early if mode is not supported Bluetooth: Don't accept ConfigReq if we aren't in the BT_CONFIG state Bluetooth: Remove the send_lock spinlock from ERTM Bluetooth: Add backlog queue to ERTM code Bluetooth: Improve ERTM local busy handling Bluetooth: Send ConfigReq after send a ConnectionRsp Bluetooth: Fix bug in kzalloc allocation size Bluetooth: Keep code under column 80 Bluetooth: Add Copyright notice to L2CAP Bluetooth: Update L2CAP version information Bluetooth: Add Google's copyright to L2CAP Bluetooth: Move bit-field variable in USB driver to data->flags Bluetooth: Fix typo in hci_event.c Bluetooth: Enable L2CAP Extended features by default Bluetooth: Use __packed annotation Bluetooth: Use __packed annotation for drivers irda: Use __packed annotation instead IRDA_PACKED macro net: remove last uses of __attribute__((packed)) Bluetooth: Fix permission of hci_ath.c Bluetooth: Test 'count' value before enter the loop Bluetooth: Use hci_recv_stream_fragment() in UART driver Bluetooth: Add __init and __exit marks to UART drivers Bluetooth: Add __init and __exit marks to RFCOMM Hagen Paul Pfeifer (1): net: optimize Berkeley Packet Filter (BPF) processing Hannes Eder (3): netfilter: xt_ipvs (netfilter matcher for IPVS) IPVS: make friends with nf_conntrack IPVS: make FTP work with full NAT support Helmut Schaa (29): cfg80211: don't refuse HT20 channels on devices that don't support HT40 rt2x00: rt2800: disable TX STBC for 1 stream devices rt2x00: Update TX_SW_CFG initvals for 305x SoC rt2x00: fix use of mcs rates rt2x00: Remove suspicious register write rt2x00: clarify meaning of txdone flags rt2x00: don't use TXDONE_FALLBACK as success indicator rt2x00: only set TXDONE_FALLBACK in rt2800pci if the frame was retried rt2x00: Fix IEEE80211_TX_CTL_MORE_FRAMES handling rt2x00: Add comment about BBP1_TX_POWER rt2x00: Fix TX_STA_FIFO handling rt2x00: Fix typo in rt2800_config_txpower rt2x00: provide mac80211 a suitable max_rates value rt2x00: Fix tx status reporting when falling back to the lowest rate rt2x00: Implement tx mpdu aggregation rt2x00: Fix beacon updates in rt2800pci rt2x00: Fix beacon updates in rt61pci rt2x00: Disable link tuning in AP mode rt2x00: fix beacon reset on rt2800 mac82011: Allow selection of minstrel_ht as default rc algorithm rt2x00: Limit txpower by eeprom values rt2x00: Convert rt2x00 to use threaded interrupts rt2x00: Allow beacon update without scheduling a work rt2x00: Implement broad- and multicast buffering rt2x00: Use pretbtt irq for fetching beacons on rt2800pci rt2x00: Use separate mac80211_ops for rt2800pci and rt2800usb rt2x00: Remove set_tim callback from PCI drivers rt2x00: Don't initialize beacon interval to 0 on rt2800 devices rt2x00: Add missing TSF sync mode for AP operation Henrique Camargo (1): net: Fix a typo from "dev" to "ndev" Herbert Xu (13): netpoll: Set npinfo to NULL even with ndo_netpoll_cleanup bridge: Remove redundant npinfo NULL setting netpoll: Fix RCU usage netpoll: Add locking for netpoll_setup/cleanup netpoll: Add ndo_netpoll_setup netpoll: Allow netpoll_setup/cleanup recursion netpoll: Add netpoll_tx_running bridge: Fix netpoll support bridge: Add const to dummy br_netpoll_send_skb netpoll: Use correct primitives for RCU dereferencing udp: Add UFO to NETIF_F_SOFTWARE_GSO bridge: Fix skb leak when multicast parsing fails on TX bridge: Allow multicast snooping to be disabled before ifup Ian Campbell (3): arp_notify: document that a gratuitous ARP request is sent when this option is enabled arp_notify: allow drivers to explicitly request a notification event. xen: netfront: explicitly generate arp_notify event after migration. Ivo van Doorn (22): rt2x00: Use IEEE80211_TX_CTL_STBC flag rt2x00: Enable fallback rates for rt61pci and rt73usb rt2x00: Update author rt2800lib rt2x00: Limit TX done looping to number of TX ring entries rt2x00: Enable HW crypto by default rt2x00: Synchronize WCID initialization with legacy driver rt2x00: Write the BSSID to register when interface is added rt2x00: Remove unneeded variable rt2x00: Enable multiBSS in rt2800 rt2x00: Fix IEEE80211_HT_CAP_RX_STBC assignment rt2x00: Fix antenna initialization rt2x00: Always set BBP_CSR_CFG_BBP_RW_MODE to 1 rt2x00: Fix compile warning when debug disabled rt2x00: Convert AGC value from descriptor to RSSI (dBm) rt2x00: Rename CONFIG_DISABLE_LINK_TUNING rt2x00: Disable link tuning while scanning rt2x00: Fix vgc_level_reg handling rt2x00: Implement watchdog monitoring rt2x00: Make rt2800_write_beacon only export to GPL rt2x00: Move common firmware loading into rt2800lib rt2x00: Move driver callback functions into the ops structure rt2x00: Fix regression for rt2500pci James Chapman (1): l2tp: fix export of header file for userspace Jay Sternberg (2): iwlwifi: display ucode SW Error in hex iwlwifi: correct descriptions of advanced ucode errors Jay Vosburgh (2): bonding: change test for presence of VLANs bonding: don't lock when copying/clearing VLAN list on slave Jean Delvare (1): e1000e: Drop a useless statement Jeff Dike (1): vhost-net: minor cleanup Jeff Kirsher (1): e1000e: Fix irq_synchronize in MSI-X case Jie Yang (1): atl1c: Add AR8151 v2 support and change L0s/L1 routine Jiri Olsa (1): net - IP_NODEFRAG option for IPv4 socket Jiri Pirko (13): bonding: remove unused variable "found" bonding: move slave MTU handling from sysfs V2 bonding: remove redundant checks from bonding_store_slaves V2 bonding: make bonding_store_slaves simpler bonding: move dev_addr cpy to bond_enslave bonding: remove unused original_flags struct slave member bonding: optimize tlb_get_least_loaded_slave net: replace hooks in __netif_receive_skb V5 macvlan: use call_rcu for port free phonet: use call_rcu for phonet device free net: add rx_handler data pointer macvlan: use rx_handler_data pointer to store macvlan_port pointer V2 bridge: use rx_handler_data pointer to store net_bridge_port pointer Jiri Slaby (1): NET: nl80211, fix lock imbalance and netdev referencing Joe Perches (26): drivers/net/gianfar.c: Remove unnecessary kmalloc casts drivers/net/tulip/eeprom.c: Remove unnecessary kmalloc casts net/ipv4/igmp.c: Remove unnecessary kmalloc casts net/ipv6/mcast.c: Remove unnecessary kmalloc casts drivers/net/wireless/ipw2x00/ipw2100.c: Remove unnecessary kmalloc casts net/core/pktgen.c: Use pr_<level> vsprintf: Recursive vsnprintf: Add "%pV", struct va_format device.h drivers/base/core.c Convert dev_<level> logging macros to functions netdevice.h net/core/dev.c: Convert netdev_<level> logging macros to functions netdevice.h: Change netif_<level> macros to call netdev_<level> functions drivers/isdn: Remove unnecessary casts of private_data drivers/net/caif: Remove unnecessary casts of private_data net/core: Remove unnecessary casts of private_data net/irda: Remove unnecessary casts of private_data drivers/net/wireless: Remove unnecessary casts of private_data drivers/net/mlx4: Use %pV, pr_<level>, printk_once Bluetooth: Remove unnecessary casts of private_data in drivers drivers/net/qlge: Use pr_<level>, shrink text a bit drivers/net/qla3xxx.c: Update logging message style drivers/net/qla3xxx.c: Checkpatch cleanups include/net/cfg80211.h: Add wiphy_<level> printk equivalents drivers/net/wireless: Use wiphy_<level> drivers/net/wireless/at76c50x-usb.c: Neaten macros wireless: Convert wiphy_debug macro to function drivers/net/vxge/vxge-main.c: Use pr_<level> and netdev_<level> drivers/net/wan/farsync.c: Use standard pr_<level> Johan Hedberg (4): Bluetooth: Add blacklist support for incoming connections Bluetooth: Add debugfs support for showing the blacklist Bluetooth: Add missing HCIUARTGETDEVICE ioctl to compat_ioctl.c Bluetooth: Add HCIUARTSETFLAGS and HCIUARTGETFLAGS ioctls Johannes Berg (79): iwlwifi: introduce iwl_sta_id_or_broadcast iwlwifi: don't crash on firmware file missing info iwl3945: remove sequence number assignment iwlwifi: move iwl_free_tfds_in_queue to iwlagn iwlwifi: improve station debugfs iwlwifi: remove IWL_MULTICAST_ID iwlagn: use firmware event/error log information iwlwifi: split debug and debugfs options iwlwifi: use proper short slot/preamble settings cfg80211: make action channel type optional mac80211: remove bogus mod_timer() call mac80211: remove tx status ampdu_ack_map mac80211: clean up ieee80211_stop_tx_ba_session mac80211: move WEP weak IV check mac80211: remove useless work starting mac80211: drop control frames after processing mac80211: move plink state mac80211: simplify key locking iwlwifi: remove useless node_addr assignments iwlwifi: remove unused wlap_bssid_addr assignment iwlwifi: remove mac_addr assignment iwlwifi: set MAC address in RXON from interface iwlwifi: use virtual interface address for scan iwlwifi: remove debug frame dumping iwlwifi: remove priv->mac_addr iwl3945: fix bugs in txq freeing iwlagn: fix bug in txq freeing iwlwifi: kzalloc txb array iwlwifi: reduce memory allocation iwlwifi: generic scan TX antenna forcing iwlwifi: queue user-initiated scan when doing internal scan wireless: fix kernel-doc iwlwifi: trace full RX iwlwifi: print warning about disconnected antennas cfg80211/mac80211: allow action frame TX/RX in IBSS mac80211: simplify station/aggregation code mac80211: use common skb queue mac80211: use common work struct mac80211: use common work function mac80211: common work skb freeing mac80211: pull mgmt frame rx into rx handler mac80211: always process blockack action from workqueue mac80211: move blockack stop due to fragmentation mac80211: move aggregation callback processing mac80211: use RCU for RX aggregation mac80211: use RCU for TX aggregation mac80211: remove non-irqsafe aggregation callbacks mac80211: refcount aggregation queue stop mac80211: make TX aggregation start/stop request async mac80211: move BA session work mac80211: defer RX agg session teardown to work mac80211: fix RX aggregation timer mac80211: change RX aggregation locking mac80211: defer TX agg session teardown to work mac80211: change TX aggregation locking mac80211: allow drivers to sleep in ampdu_action mac80211: update aggregation documentation mac80211: fix mgmt frame accounting mac80211: bracket driver tracing mac80211_hwsim: fix fake_hw_scan mac80211: fix sw scan bracketing iwlagn: use mutex for aggregation iwlwifi: use sync commands for keys iwlwifi: return ucode errors from station management iwlwifi: read rfkill during resume cfg80211: ignore spurious deauth cfg80211: don't get expired BSSes mac80211: move QoS-enable to BSS info mac80211: refuse shared key auth when WEP is unavailable mac80211: fix IBSS lockdep complaint mac80211: proper IBSS locking iwlagn: fix firmware loading TLV error path iwlwifi: make iwl_mac_beacon_update static iwlwifi: reduce beacon fill conditions iwlwifi: remove spurious semicolons mac80211: remove bogus rcu_read_lock() cfg80211: fix IBSS default management key mac80211: fix sta assignment mac80211: allow drivers to request DTIM period John Fastabend (3): net: consolidate netif_needs_gso() checks ixgbe: dcb, set DPF bit when PFC is enabled ixgbe: priority tagging FCoE frames without FCoE offload John W. Linville (68): Merge branch 'wireless-next-2.6' of git://git.kernel.org/.../iwlwifi/iwlwifi-2.6 ath9k_htc: fix build error when ATH9K_HTC_DEBUGFS not enabled Revert "iwlwifi: move _agn statistics related structure" mac80211: make ARP filtering depend on CONFIG_INET iwlwifi: fix-up botched revert mac80211: fix lock leak w/ ARP filtering and w/o CONFIG_INET Merge branch 'master' of git://git.kernel.org/.../linville/wireless-2.6 zd1211rw: change ZD_REGDOMAIN_JAPAN_* naming Merge branch 'master' of git://git.kernel.org/.../linville/wireless-2.6 libertas: mark lbs_ret_802_11d_domain_info static ath9k: declare MODULE_FIRMWARE for ath9k_htc rtl8180: mark rtl8180_beacon_work static mac80211: don't shadow mgmt variable in ieee80211_rx_h_action minstrel_ht: make *idx unsigned in minstrel_downgrade_rate wireless: mark reg_mutex as static minstrel_ht: move minstrel_mcs_groups declaration to header file mac80211: avoid scheduling while atomic in mesh_rx_plink_frame mac80211: use netif_receive_skb in ieee80211_rx callpath mac80211: use netif_receive_skb in ieee80211_tx_status callpath mac80211: remove unnecessary check in ieee80211_dump_survey mac80211: add basic tracing to drv_get_survey ath9k: remove unused function ath9k_hw_keyisvalid ath9k: make ath9k_hw_keysetmac static Merge branch 'wireless-next-2.6' of git://git.kernel.org/.../iwlwifi/iwlwifi-2.6 mac80211: remove wep dependency MAINTAINERS: mark adm8211 as an orphan Merge branch 'master' of git://git.kernel.org/.../linville/wireless-2.6 Merge branch 'master' of git://git.kernel.org/.../linville/wireless-next-2.6 into for-davem libertas: convert new uses of __attribute__ ((packed)) to __packed iwlwifi: convert new uses of __attribute__ ((packed)) to __packed mac80211: improve error checking if WEP fails to init wireless: only use alpha2 regulatory information from country IE wireless: correct sparse warning in lib80211_crypt_tkip.c wireless: correct sparse warning in wext-compat.c wireless: correct sparse warning in generated regdb.c wireless: mark cfg80211_is_all_idle as static ath9k: correct sparse identified endian bug in ath_paprd_calibrate ipw2100: mark ipw2100_pm_qos_req static libipw: correct sparse warnings and mark some variables static rt2x00: correct sparse warning in rt2x00debug.c wireless: remove unnecessary reg_same_country_ie_hint mwl8k: correct/silence sparse warnings rtl8180: improve signal reporting for rtl8185 hardware b43: silence most sparse warnings iwlagn: use __packed on new structure definitions wl1251: fix sparse-generated warnings rtl8180: improve signal reporting for actual rtl8180 hardware rtl8180: silence "dubious: x | !y" sparse warning MAINTAINERS: mark prism54 obsolete MAINTAINERS: orphan the raylink wireless driver MAINTAINERS: orphan the zd1201 wireless driver MAINTAINERS: remove entry for wavelan iwlwifi: assume vif is NULL for internal scans and non-NULL otherwise minstrel_ht: remove unnecessary NULL check in minstrel_ht_update_caps minstrel: don't complain about feedback for unrequested rates lib80211: remove unused host_build_iv option Merge branch 'master' of git://git.kernel.org/.../holtmann/bluetooth-next-2.6 p54: Added get_survey callback in order to get channel noise Merge branch 'master' of git://git.kernel.org/.../holtmann/bluetooth-next-2.6 ath9k: enable serialize_regmode for non-PCIE AR9160 mwl8k: add get_survey callback in order to get channel noise ar9170: add get_survey callback in order to get channel noise wl1251: add get_survey callback in order to get channel noise libertas_tf: add get_survey callback in order to get channel noise wl1271: add get_survey callback in order to get channel noise wl1251: update hw/fw version info in wiphy struct wl1271: update hw/fw version info in wiphy struct Merge branch 'master' of git://git.kernel.org/.../linville/wireless-next-2.6 into for-davem Jon Mason (7): s2io: add dynamic LRO disable support vxge: Remove queue_state references vxge: Fix multicast issues vxge: NETIF_F_LLTX removal vxge: Update copyright information vxge: Update maintainers information vxge: Version update Jonas Bonn (8): ethoc: calculate number of buffers in ethoc_probe ethoc: Write bus addresses to registers ethoc: write number of TX buffers in init_ring ethoc: Clean up PHY probing Remove unused variable ethoc: Clear command buffer after write ethoc: use devres resource management ethoc: add devinit/devexit section initializers Josh Hunt (1): net: Add getsockopt support for TCP thin-streams Jouni Malinen (3): mac80211: Protect Deauthentication frame when using MFP mac80211: Use a separate CCMP PN receive counter for management frames mac80211: Fix key freeing to handle unlinked keys João Paulo Rechi Vita (8): Bluetooth: Fix SREJ_QUEUE corruption in L2CAP Bluetooth: Fix l2cap_sock_connect error return. Bluetooth: Make l2cap_streaming_send() void. Bluetooth: Fix error return value on sendmsg. Bluetooth: Fix error return value on sendmsg. Bluetooth: Fix error return for l2cap_connect_rsp(). Bluetooth: Fix error value for wrong FCS. Bluetooth: Fix error return on L2CAP-HCI interface. Julia Lawall (25): net/can: Use memdup_user drivers/net: Use memdup_user drivers/net/cxgb3: Use memdup_user drivers/net/wan: Use memdup_user net/dccp: Use memdup_user drivers/net/wan: Use memdup_user drivers/isdn: Use memdup_user drivers/net/wireless/orinoco: Use kzalloc drivers/net/wireless/libertas: Use kmemdup drivers/net/wireless/wl12xx: Use kmemdup drivers/net/wireless/libertas_tf: Use kmemdup drivers/net/wireless/iwmc3200wifi: Use kmemdup drivers/net/wireless/ath/ath9k: Use kmemdup drivers/net/wireless/b43: Use kmemdup drivers/net/wireless/ipw2x00: Use kmemdup drivers/net/wireless/p54: Use kmemdup drivers/net/wireless/orinoco: Use kmemdup drivers/net/wireless/prism54: Use memdup_user forcedeth: correct valid flag Bluetooth: Use kmemdup for drivers Bluetooth: Use kzalloc for drivers arch/um/drivers: remove duplicate structure field initialization qeth: Use memdup_user when user data is immediately copied into the allocated region. drivers/net/wireless/wl12xx: Use kmemdup net/rose: Use GFP_ATOMIC Junchang Wang (2): 8139too: remove unnecessary cast of ioread32()'s return value r8169: remove unnecessary cast of readl()'s return value Jussi Kivilinna (1): rndis_wlan: increase assocbuf size and validate association info offsets from driver Justin P. Mattock (4): wireless:hostap_main.c warning: variable 'iface' set but not used wireless:hostap_ap.c Fix warning: variable 'fc' set but not used net: Fix a typo in netlink.h Bluetooth: Fix warning: variable 'tty' set but not used Juuso Oikarinen (23): wl1271: Update handling of the NVS file / INI parameters wl1271: Add support for NVS files with 5GHz band parameters wl1271: Prevent dropping of TX frames in joins wl1271: Idle handling into own function wl1271: Flush TX buffers to air before going to idle wl1271: Use proper rates for PSM entry/exit null-funcs for 5GHz wl1271: Fix scan parameter handling for 5GHz mac80211: Add support for hardware ARP query filtering mac80211: Add netif state checking to ieee80211_ifa_changed mac80211: Fix circular locking dependency in ARP filter handling mac80211: Fix ps-qos network latency handling mac80211: Add interface for driver to temporarily disable dynamic ps cfg80211/mac80211: Update set_tx_power to use mBm instead of dBm units nl80211: Add option to adjust transmit power wl1271: Remove calibration from join command wl1271: Add TSF handling wl1271: Use the ARP configuration function from mac80211 wl1271: Use all basic rates for ps-poll, instead of just the slowest wl1271: Work around AP's with broken ps-poll functionality wl1271: Update hardware ARP filtering configuration handling wl1271: Disable dynamic PS based on BT co-ext sense events wl1271: Fix warning when disconnecting and ad-hoc network wl1271: Update interface to temporarily disable dynamic PS Karl Hiramoto (9): atm: propagate signal changes via notifier atm/br2684: register notifier event for carrier signal changes. atm/adummy: add syfs DEVICE_ATTR to change signal atm/idt77105.c: call atm_dev_signal_change() when signal changes. atm/solos-pci: call atm_dev_signal_change() when signal changes. atm/suni.c: call atm_dev_signal_change() when signal changes. usb/atm/cxacru.c: call atm_dev_signal_change() when signal changes. usb/atm/speedtch.c: call atm_dev_signal_change() when signal changes. usb/atm/ueagle-atm.c: call atm_dev_signal_change() when signal changes. Kiran Divekar (3): Libertas: cfg80211 support Libertas: fix WARN_ON issues in cfg80211 support Libertas: Added 11d support using cfg80211 Klaus-Dieter Wacker (1): qeth: IP address takeover flag setting Konstantin Khorenko (1): tcp: do not send reset to already closed sockets Kouhei Sutou (1): zd1211rw: add 0x49 -> JP regulatory domain map Krzysztof HaÅasa (1): Tulip: don't initialize SBE xT3E3 WAN ports. Kulikov Vasiliy (44): net/neighbour.h: fix typo sun3_82586: Use the instance of net_device_stats from net_device. davinci_emac: Use the instance of net_device_stats from net_device. fealnx: Use the instance of net_device_stats from net_device. ethoc: Use the instance of net_device_stats from net_device. epic100: Use the instance of net_device_stats from net_device. cs89x0: Use the instance of net_device_stats from net_device. hamachi: Use the instance of net_device_stats from net_device. starfire: Use the instance of net_device_stats from net_device. hp100: Use the instance of net_device_stats from net_device. lance: Use the instance of net_device_stats from net_device. ksz884x: Use the instance of net_device_stats from net_device. natsemi: Use the instance of net_device_stats from net_device. mac89x0: Use the instance of net_device_stats from net_device. ns83820: Use the instance of net_device_stats from net_device. ni52: Use the instance of net_device_stats from net_device. ax88796: free irq on error ll_temac: fix memory leak fec_mpc52xx: fix error path 82596: do not panic on out of memory 82596: free resources on error at1700: fix double free_irq ac3200: fix error path adm8211: fix memory leak depca: fix leaks in depca_module_init() tc35815: fix iomap leak jazzsonic: free irq if sonic_open() fails macsonic: free irqs if sonic_open() fails xtsonic: free irq if sonic_open() fails wireless: airo: delete netdev from list after it is freed tulip: formatting of pointers in printk() wd: fix memory leak eth16i: fix memory leak drivers: irda: fix sign bug drivers: irda: fix sign bug drivers: ixgbevf: fix unsigned underflow net: bridge: fix sign bug net: dccp: fix sign bug Bluetooth: Silence warning in btmrvl SDIO driver drivers/net/irda: use for_each_pci_dev() 3c59x: handle pci_iomap() errors net: 3c59x: fix leak of iomaps net: s2io: fix buffer overflow usbnet: use jiffies in schedule_timeout(), not msecs Larry Finger (3): ssb: Handle alternate SSPROM location b43: Clarify logged message after fatal DMA error and switch to PIO mode b43: silence phy_n sparse warnings Leann Ogasawara (1): p54usb: Comment out duplicate Medion MD40900 device id Lennert Buytenhek (1): mwl8k: change maintenance status Luciano Coelho (7): wl1271: the core wl1271 module shouldn't depend on SPI_MASTER netfilter: xtables: idletimer target implementation wl1271: read fem manufacturer value from nvs wl1271: moved scan operations to a separate file wl1271: rewritten scanning code wl1271: use per-channel max tx power passed by mac80211 when scanning wl1271: use __packed annotation Luis R. Rodriguez (26): ath9k_hw: add support for the AR9003 2.2 ath9k_hw: rename the ar9003_initvals.h to ar9003_2p0_initvals.h ath9k_hw: add support for the AR9003 baseband watchdog ath9k: enable the baseband watchdog events for AR9003 ath9k_hw: Enable TX IQ calibration on AR9003 ath9k_hw: move clock definitions from hw.c to hw.h ath9k_hw: fix clock rate calculations for ANI ath9k_hw: clear MIB interrupt causes when skipping ANI adjustments ath9k_hw: allow for spliting up ANI operations by family ath9k_hw: add register definitions for the new ANI ath9k_hw: inform ANI calibration when scanning ath9k: add new ANI implementation for AR9003 ath9k_hw: enable ANI for AR9003 ath9k_hw: reduce delay on programming INI on AR9003 ath9k_hw: update 5 GHz tx gain tables for femless and high power PA ath9k: enable AR9003 PCI IDs ath9k_hw: avoid setting cwmin/cwmax to 0 for IBSS for AR9003 ath9k_hw: fix ASPM setting for AR9003 ath9k_hw: move LowPower array writes to ar9003_hw_configpcipowersave() ath9k_hw: add pcieSerDesWrite to disable SERDES ASPM tweaks ath9k_hw: dynamically choose the SERDES array for low power ath9k_hw: add an extra delay when reseting AR_RTC_RESET ath9k_htc: make ath9k_htc_tx_aggr_oper() static ath9k_hw: Fix AR9003 MPDU delimeter CRC check for middle subframes ath9k: remove the two wiphys scanning at the same time message Revert "mac80211: fix sw scan bracketing" Luke-Jr (1): p54spi: replace internal "cx3110x" name with "p54 |