Netdev Archive on lore.kernel.org
 help / color / Atom feed
* [GIT] Networking
@ 2010-08-04  3:38 David Miller
  2010-08-04 19:06 ` Linus Torvalds
  0 siblings, 1 reply; 1437+ messages in thread
From: David Miller @ 2010-08-04  3:38 UTC (permalink / raw)
  To: torvalds; +Cc: akpm, netdev, linux-kernel


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@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 "p54spi"

Magnus Damm (1):
      b43: Add SDIO_DEVICE() for EW-CG1102GC

Marc Kleine-Budde (1):
      CAN: Add Flexcan CAN controller driver

Marcel Holtmann (1):
      Bluetooth: Defer SCO setup if mode change is pending

Matt Carlson (32):
      tg3: Relocate APE mutex regs for 5717+
      tg3: Avoid tx lockups on 5755+ devices
      tg3: Fix a memory leak on 5717+ devices
      tg3: Off-by-one error in RSS setup
      tg3: Allow single MSI-X vector allocations
      tg3: 5717: Allow serdes link via parallel detect
      tg3: Use devfn to determine function number
      tg3: Add 5719 ASIC rev
      tg3: Add 5719 PCI device and phy IDs
      tg3: Update version to 3.111
      tg3: Revert RSS indir tbl setup change
      tg3: Fix single MSI-X vector coalescing
      tg3: Fix IPv6 TSO code in tg3_start_xmit_dma_bug()
      tg3: Relax 5717 serdes restriction
      tg3: Report driver version to firmware
      tg3: Revert PCIe tx glitch fix
      tg3: Fix some checkpatch errors
      tg3: Update version to 3.112
      tg3: Add 5784 ASIC rev to earlier PCIe MPS fix
      tg3: Disable TSS also during tg3_close()
      tg3: Create TG3_FLG3_5717_PLUS flag
      tg3: Don't access phy test ctrl reg for 5717+
      tg3: Manage gphy power for CPMU-less devs only
      tg3: Restrict ASPM workaround devlist
      tg3: Detect APE firmware types
      tg3: Remove 5720, 5750, and 5750M
      tg3: Improve small packet performance
      tg3: Add error reporting to tg3_phydsp_write()
      tg3: Add phy-related preprocessor constants
      tg3: Create phy_flags and migrate phy_is_low_power
      tg3: Migrate tg3_flags to phy_flags
      tg3: Update version to 3.113

Matthias Fuchs (1):
      can: Add driver for esd CAN-USB/2 device

Maxime Bizon (1):
      cfg80211: fix race between sysfs and cfg80211

Michael Chan (19):
      bnx2: Fix compiler warning in bnx2_disable_forced_2g5().
      cnic: Return error code in cnic_cm_close() if unsuccessful.
      cnic: Refactor code in cnic_cm_process_kcqe().
      cnic: Refactor and fix cnic_ready_to_close().
      cnic: Fix cnic_cm_abort() error handling.
      cnic: Fine-tune CID memory space calculation.
      cnic: Unify IRQ code for all hardware types.
      cnic: Unify kcq allocation for all devices.
      cnic: Restructure kcq processing.
      cnic: Further unify kcq handling code.
      cnic: Update version to 2.1.3.
      bnx2: Always enable MSI-X on 5709.
      bnx2: Add support for skb->rxhash.
      bnx2: Dump some config space registers during TX timeout.
      bnx2: Update version to 2.0.16.
      bnx2: Use proper counter for net_device_stats->multicast.
      bnx2: Call pci_enable_msix() with actual number of vectors.
      bnx2: Remove some unnecessary smp_mb() in tx fast path.
      bnx2: Update version to 2.0.17.

Michael S. Tsirkin (4):
      vhost: whitespace fix
      netfilter: add CHECKSUM target
      netfilter: correct CHECKSUM header and export it
      vhost: apply cgroup to vhost workers

Michal Marek (1):
      ipvs: Kconfig cleanup

Mike Ditto (1):
      forcedeth: Fix different hardware statistics versions.

Mike McCormack (1):
      sky2: Code style fixes

Ming Lei (4):
      ath9k: fix dma direction for map/unmap in ath_rx_tasklet
      ath9k: fix dma sync in rx path
      minstrel_ht: fix updating rate with best probability
      minstrel_ht: fix check for downgrading of top2 rate

Nathan Holstein (1):
      Bluetooth: Fix bug with ERTM minimum packet length

Neil Horman (2):
      drop_monitor: Add error code to detect duplicate state changes
      drop_monitor: convert some kfree_skb call sites to consume_skb

Nick Chalk (1):
      IPVS: one-packet scheduling

Nick Nunley (3):
      igb: fix PHY config access on 82580
      igb: add support for SGMII-based MDIO PHYs
      igb: restore EEPROM values of MDICNFG on reset with 82580

Nicolas Dichtel (1):
      __dst_free(): put EXPORT_SYMBOLS after the fct

Nicolas Kaiser (3):
      net/Makefile: conditionally descend to wireless and ieee802154
      drivers/net/Makefile: conditionally descend to wireless
      usb: pegasus: fixed coding style issues

Nicolas de Pesloüan (1):
      bonding: fix a buffer overflow in bonding_show_queue_id.

Nolan Leake (1):
      tun: keep link (carrier) state up to date

Ohad Ben-Cohen (1):
      wl1271: remove sdio ARM dependency

Oliver Hartkopp (1):
      can-raw: Fix skb_orphan_try handling

Oliver Neukum (1):
      usbnet: remove direct access to urb->status

Ondrej Zary (1):
      rt2500usb: fallback to SW encryption for TKIP+AES

Pablo Neira Ayuso (2):
      nfnetlink_log: do not expose NFULNL_COPY_DISABLED to user-space
      netfilter: nf_ct_tcp: fix flow recovery with TCP window	tracking enabled

Patrick McHardy (5):
      Merge branch 'master' of /repos/git/net-next-2.6
      netfilter: nf_nat: support user-specified SNAT rules in LOCAL_IN
      netfilter: ipt_LOG/ip6t_LOG: remove comparison within loop
      netfilter: ipt_LOG/ip6t_LOG: add option to print decoded MAC header
      bridge: add per bridge device controls for invoking iptables

Pavel Roskin (1):
      ath9k: remove unneeded calculation of minimal calibration power

Pedro Garcia (1):
      vlan_dev: VLAN 0 should be treated as "no vlan tag" (802.1p packet)

Peter Huewe (12):
      atm: Convert pci_table entries to PCI_VDEVICE (if PCI_ANY_ID is used)
      atm: Convert pci_table entries to PCI_VDEVICE (if PCI_ANY_ID is used)
      atm: Convert pci_table entries to PCI_VDEVICE (if PCI_ANY_ID is used)
      atm: Convert pci_table entries to PCI_VDEVICE (if PCI_ANY_ID is used)
      atm: Convert pci_table entries to PCI_VDEVICE (if PCI_ANY_ID is used)
      atm: Convert pci_table entries to PCI_VDEVICE (if PCI_ANY_ID is used)
      atm: Convert pci_table entries to PCI_VDEVICE (if PCI_ANY_ID is used)
      isdn/hardware/mISDN: Convert pci_table entries to PCI_VDEVICE (if PCI_ANY_ID is used)
      mISDN: Convert pci_table entries to PCI_VDEVICE (if PCI_ANY_ID is used)
      isdn/hardware/eicon: Convert pci_table entries to PCI_VDEVICE (if PCI_ANY_ID is used)
      mISDN: Convert pci_table entries to PCI_VDEVICE (if PCI_ANY_ID is used)
      isdn/hisax: Convert pci_table entries to PCI_VDEVICE (if PCI_ANY_ID is used)

Prarit Bhargava (2):
      vxge: Fix checkstack warning in vxge_probe()
      ath: Fix uninitialized variable warnings

Rafał Miłecki (2):
      ssb: update PMU init to match specs
      ssb: fast powerup delay calculation for PMU capable devices

Rajesh Borundia (3):
      qlcnic: fix pause params setting
      netxen: fix for kdump
      qlcnic: fix bandwidth check

Rajesh K Borundia (2):
      qlcnic: fix race in tx stop queue
      qlcnic: Add support for configuring eswitch and npars

Rajkumar Manoharan (1):
      ath9k: fix panic while cleaning up virtaul wifis

Ralf Baechle (1):
      ioc3-eth: Use the instance of net_device_stats from net_device.

Rami Rosen (3):
      cleanup: remove MIN_FRAG_SIZE definition.
      fix return value of __pppoe_xmit() method.
      cleanup: remove pppoe_xmit() declaration.

Randy Dunlap (2):
      netfilter: xt_IDLETIMER needs kdev_t.h
      net: ks8842 depends on DMA_ENGINE

Reinette Chatre (3):
      iwlwifi: fix and add missing sta_lock usage
      Merge branch 'wireless-2.6' into wireless-next-2.6
      iwlagn: reduce severity of disconnected antennas warning

Richard Cochran (5):
      ixp4xx: Support the all multicast flag on the NPE devices.
      net: add driver hook for tx time stamping.
      net: preserve ifreq parameter when calling generic phy_mii_ioctl().
      net: added a BPF to help drivers detect PTP packets.
      net: support time stamping in phy devices.

Richard Röjfors (5):
      ks8842: Replace usage of dev_dbg with netdev_dbg
      ks8842: Do the TX timeout work in workqueue context.
      ks8842: Remove unnecessary bank select.
      ks8842: Support 100Mbps when accessed via timberdale
      ks8842: Support DMA when accessed via timberdale

Roland Dreier (1):
      chelsio: Remove remnants of CONFIG_CHELSIO_T1_COUGAR

Ron Mercer (6):
      qlge: Restore promiscuous setting after reset.
      qlge: Don't use firmware when forcing firmware dump.
      qlge: Reduce print level in data path statements.
      qlge: Fix possible endian issue for rx UDP csum.
      qlge: Make adapter drop frame errors and pass up csum errors.
      qlge: Change version to v1.00.00.25.00.00-01.

Ron Shaffer (2):
      Bluetooth: Remove extraneous white space
      Bluetooth: Reassigned copyright to Code Aurora Forum

Ronghua Zang (1):
      net-next: vmxnet3 fixes [2/5] Interrupt control bitmap

Sarveshwar Bandi (1):
      be2net: Patch to determine if function is VF while running in guest OS.

Sascha Silbe (1):
      libertas: Fix ethtool reporting no WOL options supported if WOL is not already active

Sathya Perla (3):
      be2net: cleanup in case of error in be_open()
      be2net: replace udelay() with schedule_timeout() in mbox polling
      be2net: memory barrier fixes on IBM p7 platform

Scott McMillan (1):
      packet_mmap: expose hw packet timestamps to network packet capture utilities

Sebastian Andrzej Siewior (1):
      net/core: use ntohs for skb->protocol

Sebastian Smolorz (2):
      at76c50x-usb: Move function at76_join() several lines up
      at76c50x-usb: Extract bssid from authentication frame

Senthil Balasubramanian (4):
      ath9k: Introduce bit masks for valid and valid_single_stream.
      ath9k: Add three stream rate control support for AR938X.
      ath9k: Fix incorrect user ratekbs of MCS15 ShortGI
      ath9k: remove unused base_index from rate table.

Sergey Matyukevich (2):
      ucc_geth driver: add ioctl
      ucc_geth: fix UCC device number in debug message

Shan Wei (4):
      netfilter: xt_sctp: use WORD_ROUND macro to calculate length of multiple of 4 bytes
      netfilter: kill redundant check code in which setting ip_summed value
      netfilter: defrag: remove one redundant atomic ops
      netfilter: defrag: kill unused work parameter of frag_kfree_skb()

Shanyu Zhao (4):
      iwlwifi: enable remaining 6000 Gen2 devices
      iwlwifi: add new PCI IDs for 6000g2 devices
      iwlwifi: do not clear data after chain noise calib
      iwlwifi: enable 6050 series Gen2 devices

Shirley Ma (1):
      ixgbevf: Enable GRO by default

Shreyas Bhatewara (4):
      net-next: fix LRO feature update in vmxnet3
      net-next: vmxnet3 fixes [3/5] Initialize link state at probe time
      net-next: vmxnet3 fixes [4/5] Do not reset when the device is not opened
      net-next: vmxnet3 fixes [5/5] Respect the interrupt type in VM configuration

Simon Horman (2):
      ipvs: remove EXPERIMENTAL tag
      ipvs: provide default ip_vs_conn_{in,out}_get_proto

Sjur Braendeland (6):
      caif: Bugfix not all services uses flow-ctrl.
      caif: Bugfix - RFM must support segmentation.
      caif: Use link layer MTU instead of fixed MTU
      caif: Add debug connection type for CAIF.
      caif: Kconfig and Makefile fixes
      caif-driver: Add CAIF-SPI Protocol driver.

Sonic Zhang (1):
      netdev:bfin_mac: reclaim and free tx skb as soon as possible after transfer

Sony Chacko (1):
      qlcnic: fix diag resource allocation

Sridhar Samudrala (2):
      macvlan: Fix rx counters update in macvlan_handle_frame()
      cgroups: Add an API to attach a task to current task's cgroup

Sriram (3):
      TI DaVinci EMAC : Implement interrupt pacing functionality.
      TI DaVinci EMAC: Fix asymmetric handling of packets in NAPI Poll function.
      TI DaVinci EMAC: Fix incorrect reference to EMAC_CTRL registers.

Sritej Velaga (1):
      qlcnic: change driver description

Stanislaw Gruszka (12):
      e1000e: fail when try to setup unsupported features
      vmxnet3: fail when try to setup unsupported features
      bnx2x: fail when try to setup unsupported features
      netxen: fail when try to setup unsupported features
      qlcnic: fail when try to setup unsupported features
      ixgbe: use NETIF_F_LRO
      bnx2: allocate with GFP_KERNEL flag on RX path init
      bnx2: use device model DMA API
      rt2500usb: write keys to proper registers
      rt2500usb: truly disable encryption when initialize
      rt2500usb: disallow to set WEP key with non zero index
      iwlwifi: fix scan abort

Stefan Assmann (2):
      sysfs: add attribute to indicate hw address assignment type
      igbvf, ixgbevf: use dev_hw_addr_random

Stephen Hemminger (2):
      gre: propagate ipv6 transport class
      net: ingress filter message limit

Stephen Rothwell (1):
      net: bnx2x_cmn.c needs net/ip6_checksum.h for csum_ipv6_magic

Steve Hodgson (9):
      sfc: Reschedule any resets scheduled inside efx_pm_freeze()
      sfc: Workaround flush failures on Falcon B0
      sfc: Synchronise link_advertising and wanted_fc on Siena
      sfc: Wait for the link to stay up before running loopback selftest
      sfc: Allow DRV_GEN events to be used outside of selftests
      sfc: Remove efx_rx_queue::add_lock
      sfc: Support only two rx buffers per page
      sfc: Recycle discarded rx buffers back onto the queue
      sfc: Allow shared pages to be recycled

Steven Walter (2):
      tulip: explicity set to D0 power state during init
      tulip: implement wake-on-lan support

Sucheta Chakraborty (2):
      qlcnic: fix device soft reset
      qlcnic: aer support

Sujith (38):
      ath9k_htc: Add queue statistics to xmit debugfs file
      ath9k_htc: Initialize beacon/CAB queues
      ath9k_htc: Remove HW queue translation
      ath9k_htc: Increase credit size
      ath9k_htc: Initvals update for AR9271
      ath9k_htc: Cleanup rate initialization
      ath9k_htc: Update HT configuration properly
      ath9k_htc: Enable SGI in HT20 for AR9271
      ath9k_htc: Enable RX STBC for AR9271
      ath9k: Move ath9k specific RX code to driver
      ath9k: Move driver specific structures
      ath9k_hw: Cleanup eeprom_9287.c
      ath9k_hw: Optimize ath9k_hw_ar9287_set_board_values
      ath9k_hw: Cleanup TX power calculation for AR9287
      ath9k_hw: Update the PCI WAR register
      ath9k_hw: Fix async fifo for AR9287
      ath9k_htc: Revamp CONF_IDLE handling
      ath9k_htc: Add PS wrappers
      ath9k_htc: Fix bug in handling CONF_IDLE
      ath9k_htc: Remove useless cancel_work_sync
      ath9k_htc: Fix locking for ps_idle
      ath9k_htc: Handle monitor interface removal
      ath9k_htc: Handle host RX disable
      ath9k_htc: Fix fair beacon distribution
      ath9k_htc: Use proper station add/remove callbacks
      mac80211: Remove deprecated sta_notify commands
      ath9k: Determine Firmware on probe
      ath9k_hw: Configure byte swap for non AR9271 chips
      ath9k_htc: Add support for AR7010
      ath9k_common: Move count_streams to common module
      ath9k_htc: Setup HT capabilites for 2-stream devices
      ath9k_htc: Configure dual stream rates
      ath9k_htc: Setup 5GHz channels
      ath9k_htc: Configure credit size for AR7010
      ath9k_htc: Fix ampdu_action callback
      ath9k_htc: Update supported product list
      ath9k_htc: Add LED support for AR7010
      mac80211: Don't set per-BSS QoS for monitor interfaces

Suraj Sumangala (5):
      Bluetooth: Add one more buffer for HCI stream reassembly
      Bluetooth: Implement hci_reassembly helper to reassemble RX packets
      Bluetooth: Modified hci_recv_fragment() to use hci_reassembly helper
      Bluetooth: Implemented HCI frame reassembly for RX from stream
      Bluetooth: Support for Atheros AR300x serial chip

Teemu Paasikivi (3):
      mac80211: Set basic rates while joining ibss network
      mac80211: Set changed basic rates flag
      mac80211: remove BSS from cfg80211 list when leaving IBSS

Tejun Heo (1):
      vhost: replace vhost_workqueue with per-vhost kthread

Tetsuo Handa (1):
      net: Remove MAX_SOCK_ADDR constant

Tilman Schmidt (13):
      Documentation/isdn: CAPI controller interface amendment
      isdn: avoid calling tty_ldisc_flush() in atomic context
      isdn/gigaset: adjust usb_gigaset tty write buffer limit
      isdn/gigaset: avoid copying AT commands twice
      isdn/gigaset: ignore irrelevant device responses
      isdn/gigaset: drop debug check on isochronous write
      isdn/gigaset: improve CAPI message debugging
      isdn/gigaset: handle Supplementary Service Listen
      isdn/gigaset: remove obsolete compile time options
      isdn/gigaset: reduce syslog spam
      isdn/gigaset: fix leaks in error path
      isdn/gigaset: document dial-out number format
      isdn/gigaset: remove EXPERIMENTAL tag from GIGASET_CAPI

Tim Gardner (2):
      netfilter: xt_connbytes: Force CT accounting to be enabled
      netfilter: complete the deprecation of CONFIG_NF_CT_ACCT

Tobias Klauser (4):
      vhost: Storage class should be before const qualifier
      drivers/net/wireless: Storage class should be before const qualifier
      greth: Remove unnecessary memset of napi member in netdev private data
      s2io: Remove unnecessary memset of netdev private data

Tom Herbert (1):
      tcp: Fix slowness in read /proc/net/tcp

Ursula Braun (8):
      smsgiucv: guarantee single iucv connect in thaw
      qeth: specify correct function level for OSN devices
      qeth: handle missing z/VM authorization of OSX
      qeth: serialize sysfs-triggered device configurations
      qeth: avoid loop if ipa command response is missing
      claw: A claw device is a group of just 2 ccw devices
      qeth: return zero from reply callback functions
      qeth: avoid useless removal of multicast addresses

Uwe Kleine-König (2):
      cfg80211: move cfg80211_exit to .exit.text
      wireless: move regulatory_init to .init.text

Vasanthakumar Thiagarajan (12):
      ath9k: Enable Short GI in 20 Mhz for ar9287 and later chips
      ath9k: Make sure null func frame is acked before going into PS for ar9003
      ath9k: Fix power save with auto sleeping
      ath9k_hw: Enable auto sleep for ar9003
      ath9k: Clean up few function parameters in recv.c
      ath9k: Fix bug in accessing skb->data of rx frame for edma
      ath9k: Fix bug in validating received data length for edma
      ath9k: Fix bug in rate table
      ath9k: Fix bug in paprd
      ath9k: Remove unused paprd_txok
      ath9k: Wakeup the chip in an appropriate place in ath_paprd_calibrate()
      ath9k: Fix inconsistency between txq->stopped and the actual queue state

Vasanthy Kolluri (10):
      enic: Feature Add: Replace LRO with GRO
      enic: Bug Fix: Change hardware ingress vlan rewrite mode
      enic: Use a lighter reset operation for enic devices
      enic: Clean up: Add wrapper routines for firmware devcmd calls
      enic: Use (netdev|dev|pr)_<level> macro helpers for logging
      enic: Add new firmware devcmds
      enic: Use receive queue buffer blocks of 32/64 entries
      enic: Feature Add: Add loopback capability to enic devices
      enic: Bug Fix: Handle surprise hardware removals
      enic: Clean ups

Vivek Natarajan (2):
      ath9k: Add a module parameter to disable led blinking.
      ath9k: Fix the LED behaviour in idle unassociated state.

Vladislav Zolotarov (1):
      bnx2x: Set RXHASH for LRO packets

Walter Goldens (1):
      wireless: fix several minor description typos

Wan ZongShun (1):
      net/nuc900: enable Mac driver clock

Wey-Yi Guy (41):
      iwlwifi: move _agn statistics related structure
      iwlwifi: separate statistics flag function for agn & 3945
      iwlwifi: code cleanup for _agn devices
      iwlwifi: modify out-dated comments
      iwlwifi: move ucode related function to iwl-agn-ucode.c
      iwlwifi: remove unused parameter in iwl_priv
      iwlwifi: beacon format related helper function
      iwlwifi: support channel switch offload in driver
      iwlwifi: beacon internal time unit
      iwlwifi: remove inaccurate comment
      iwlwifi: do not use huge command buffer for channel switch
      iwlwifi: remove unused parameter
      iwlwifi: cancel run time calibration work when going down
      iwlwifi: move agn specific rx related code to iwl-agn-rx.c
      iwlwifi: move _agn statistics related structure
      iwlwifi: move calibration from iwlcore to iwlagn
      iwlwifi: code cleanup to remove un-necessary "goto"
      iwlwifi: remove non-exist reference
      iwlwifi: name change from signal protection flag
      iwlwifi: enable DC calibration based on config parameter
      iwlwifi: add a mechanism to disable plcp error checking
      iwlwifi: turn on RTS/CTS after aggregation become operational
      iwlwifi: add disable rf calibration support for 6000g2a and 6000g2b
      iwlwifi: fix fw_restart module parameter
      iwlwifi: add debug print for parsing firmware TLV
      iwlwifi: tx fifo queue flush command
      iwlwifi: add mac80211 flush callback support
      iwlwifi: add support for device tx flush request
      iwlwifi: debugfs file for txfifo command testing
      iwlwifi: generic parameter define for _agn device
      iwlwifi: adding enhance sensitivity table entries
      iwlagn: more generic description for iwlagn devices
      iwlwifi: additional statistic debug counter
      iwlwifi: more statistics counter for agn in debugfs
      iwlwifi: "recover_from_tx_stall" function for 4965
      iwlagn: add statistic notification structure for WiFi/BT devices
      iwlagn: add .cfg flag to idenfity the need for bt statistics
      iwlagn: Add support for bluetooth statistics notification
      iwlagn: add bluetooth stats to debugfs
      iwlwifi: add TLV to specify the size of phy calibration table
      iwlwifi: read multiple MAC addresses

Wolfram Sang (2):
      net/mpc52xx_phy: Various code cleanups
      net/fec: restore interrupt mask after software-reset in fec_stop()

Wu Fengguang (2):
      ipconfig: send host-name in DHCP requests
      ipconfig: document DHCP hostname and DNS record

Xiaoyu Du (1):
      ipvs: lvs sctp protocol handler is incorrectly invoked ip_vs_app_pkt_out

Yaniv Rosner (1):
      bnx2x: Fix link problem with some DACs

Yi Zou (2):
      ixgbe: properly toggling netdev feature flags when disabling FCoE
      ixgbe: use GFP_ATOMIC when allocating FCoE DDP context from the dma pool

Yoshihiro Shimoda (1):
      net: sh_eth: add support for SH7757's ETHER

Yuri Ershov (3):
      mac80211: Put some code under MESH macro
      nl80211: Fix memory leaks
      cfg80211: Update of regulatory request initiator handling

chas williams - CONTRACTOR (5):
      atm: [nicstar] reformatted with Lindent
      atm: [nicstar] remove virt_to_bus() and support 64-bit platforms
      atm: [he] remove small buffer allocation/handling code
      atm: [he] rewrite buffer handling in receive path
      atm: remove IRQF_DISABLED in combination with IRQF_SHARED

jamal (2):
      net sched: make pedit check for clones instead
      net: Remove unnecessary net action assertion

schacko (1):
      qlcnic: seperate interrupt for TX

stephen hemminger (3):
      ppp: eliminate shadowed variable name
      bridge: add rcu_read_lock on transmit
      u32: negative offset fix

ubuntu@tjworld.net (1):
      ipw2200: Enable LED by default

 Documentation/feature-removal-schedule.txt         |    9 -
 Documentation/filesystems/nfs/nfsroot.txt          |    2 +
 Documentation/isdn/INTERFACE.CAPI                  |    8 +-
 Documentation/isdn/README.gigaset                  |  117 +-
 Documentation/kernel-parameters.txt                |    3 +-
 Documentation/networking/README.ipw2200            |    2 +-
 Documentation/networking/bonding.txt               |   84 +-
 Documentation/networking/caif/spi_porting.txt      |  208 +
 Documentation/networking/ip-sysctl.txt             |    2 +-
 Documentation/networking/packet_mmap.txt           |   26 +
 Documentation/networking/pktgen.txt                |    5 +
 MAINTAINERS                                        |   50 +-
 arch/microblaze/include/asm/system.h               |    3 -
 arch/powerpc/include/asm/system.h                  |    3 -
 arch/s390/appldata/appldata_net_sum.c              |    3 +-
 arch/um/drivers/net_kern.c                         |   10 +-
 arch/x86/include/asm/system.h                      |    7 +
 drivers/atm/Kconfig                                |    2 +-
 drivers/atm/adummy.c                               |   39 +
 drivers/atm/ambassador.c                           |    6 +-
 drivers/atm/eni.c                                  |    6 +-
 drivers/atm/firestream.c                           |    6 +-
 drivers/atm/he.c                                   |  310 +-
 drivers/atm/he.h                                   |   65 +-
 drivers/atm/idt77105.c                             |   11 +-
 drivers/atm/idt77252.c                             |    5 +-
 drivers/atm/nicstar.c                              | 5196 ++++----
 drivers/atm/nicstar.h                              |  602 +-
 drivers/atm/nicstarmac.c                           |  364 +-
 drivers/atm/solos-pci.c                            |    6 +-
 drivers/atm/suni.c                                 |    5 +-
 drivers/atm/zatm.c                                 |    6 +-
 drivers/base/core.c                                |   64 +
 drivers/bluetooth/Kconfig                          |   12 +
 drivers/bluetooth/Makefile                         |    1 +
 drivers/bluetooth/bcm203x.c                        |    3 +-
 drivers/bluetooth/bpa10x.c                         |    2 +-
 drivers/bluetooth/btmrvl_debugfs.c                 |    2 +-
 drivers/bluetooth/btmrvl_drv.h                     |    5 +-
 drivers/bluetooth/btmrvl_main.c                    |    5 +-
 drivers/bluetooth/btmrvl_sdio.c                    |  111 +-
 drivers/bluetooth/btusb.c                          |   13 +-
 drivers/bluetooth/dtl1_cs.c                        |    2 +-
 drivers/bluetooth/hci_ath.c                        |  235 +
 drivers/bluetooth/hci_bcsp.c                       |    4 +-
 drivers/bluetooth/hci_h4.c                         |  107 +-
 drivers/bluetooth/hci_ldisc.c                      |   20 +-
 drivers/bluetooth/hci_ll.c                         |    6 +-
 drivers/bluetooth/hci_uart.h                       |   15 +-
 drivers/infiniband/core/addr.c                     |    2 +-
 drivers/infiniband/hw/cxgb3/iwch_cm.c              |    4 +-
 drivers/infiniband/hw/cxgb4/cm.c                   |    4 +-
 drivers/infiniband/hw/nes/nes_cm.c                 |    2 +-
 drivers/infiniband/hw/nes/nes_nic.c                |    8 +-
 drivers/infiniband/ulp/ipoib/ipoib_ethtool.c       |    7 +-
 drivers/isdn/capi/capi.c                           |   12 +-
 drivers/isdn/capi/capidrv.c                        |    7 +-
 drivers/isdn/divert/divert_procfs.c                |    7 +-
 drivers/isdn/gigaset/Kconfig                       |    4 +-
 drivers/isdn/gigaset/bas-gigaset.c                 |   69 +-
 drivers/isdn/gigaset/capi.c                        |   66 +-
 drivers/isdn/gigaset/common.c                      |    2 -
 drivers/isdn/gigaset/ev-layer.c                    |  226 +-
 drivers/isdn/gigaset/gigaset.h                     |   16 +-
 drivers/isdn/gigaset/i4l.c                         |    4 +-
 drivers/isdn/gigaset/interface.c                   |   37 +-
 drivers/isdn/gigaset/ser-gigaset.c                 |   27 +-
 drivers/isdn/gigaset/usb-gigaset.c                 |   29 +-
 drivers/isdn/hardware/eicon/divamnt.c              |    7 +-
 drivers/isdn/hardware/eicon/divasi.c               |    2 -
 drivers/isdn/hardware/eicon/divasmain.c            |   71 +-
 drivers/isdn/hardware/mISDN/hfcmulti.c             |    9 +-
 drivers/isdn/hardware/mISDN/hfcpci.c               |   92 +-
 drivers/isdn/hardware/mISDN/mISDNinfineon.c        |   39 +-
 drivers/isdn/hisax/config.c                        |   84 +-
 drivers/isdn/hisax/q931.c                          |   13 +-
 drivers/isdn/hysdn/hysdn_procconf.c                |   21 +-
 drivers/isdn/hysdn/hysdn_proclog.c                 |   51 +-
 drivers/isdn/i4l/isdn_common.c                     |   27 +-
 drivers/isdn/i4l/isdn_net.c                        |    7 +-
 drivers/isdn/i4l/isdn_ppp.c                        |   13 +-
 drivers/isdn/i4l/isdn_tty.c                        |    6 -
 drivers/isdn/mISDN/timerdev.c                      |    7 +-
 drivers/isdn/pcbit/drv.c                           |   10 +-
 drivers/isdn/sc/ioctl.c                            |   23 +-
 drivers/net/3c527.h                                |    6 +-
 drivers/net/3c59x.c                                |  392 +-
 drivers/net/8139cp.c                               |    2 +-
 drivers/net/8139too.c                              |    8 +-
 drivers/net/82596.c                                |   64 +-
 drivers/net/Kconfig                                |   43 +-
 drivers/net/Makefile                               |    6 +-
 drivers/net/Space.c                                |    6 -
 drivers/net/ac3200.c                               |    2 +-
 drivers/net/arcnet/capmode.c                       |  177 +-
 drivers/net/arcnet/com20020-isa.c                  |    4 +-
 drivers/net/arcnet/com90io.c                       |    2 +-
 drivers/net/arm/ixp4xx_eth.c                       |   14 +-
 drivers/net/arm/w90p910_ether.c                    |    3 +
 drivers/net/at1700.c                               |    4 +-
 drivers/net/atl1c/atl1c.h                          |    9 +-
 drivers/net/atl1c/atl1c_hw.c                       |  107 +-
 drivers/net/atl1c/atl1c_hw.h                       |   49 +-
 drivers/net/atl1c/atl1c_main.c                     |  348 +-
 drivers/net/atlx/atl1.h                            |    4 +-
 drivers/net/au1000_eth.c                           |    2 +-
 drivers/net/ax88796.c                              |    4 +-
 drivers/net/b44.c                                  |  146 +-
 drivers/net/bcm63xx_enet.c                         |    2 +-
 drivers/net/benet/be.h                             |   31 +-
 drivers/net/benet/be_cmds.c                        |   91 +-
 drivers/net/benet/be_cmds.h                        |   48 +-
 drivers/net/benet/be_ethtool.c                     |   58 +-
 drivers/net/benet/be_hw.h                          |   12 +-
 drivers/net/benet/be_main.c                        |  376 +-
 drivers/net/bfin_mac.c                             |  123 +-
 drivers/net/bfin_mac.h                             |    5 +
 drivers/net/bnx2.c                                 |  264 +-
 drivers/net/bnx2.h                                 |   12 +-
 drivers/net/bnx2x/Makefile                         |    7 +
 drivers/net/{ => bnx2x}/bnx2x.h                    |  235 +-
 drivers/net/bnx2x/bnx2x_cmn.c                      | 2252 ++++
 drivers/net/bnx2x/bnx2x_cmn.h                      |  652 +
 drivers/net/{ => bnx2x}/bnx2x_dump.h               |    0
 drivers/net/bnx2x/bnx2x_ethtool.c                  | 1971 +++
 drivers/net/{ => bnx2x}/bnx2x_fw_defs.h            |    0
 drivers/net/{ => bnx2x}/bnx2x_fw_file_hdr.h        |    0
 drivers/net/{ => bnx2x}/bnx2x_hsi.h                |    0
 drivers/net/{ => bnx2x}/bnx2x_init.h               |    0
 drivers/net/{ => bnx2x}/bnx2x_init_ops.h           |    0
 drivers/net/{ => bnx2x}/bnx2x_link.c               |    8 +-
 drivers/net/{ => bnx2x}/bnx2x_link.h               |    0
 drivers/net/bnx2x/bnx2x_main.c                     | 8040 +++++++++++
 drivers/net/{ => bnx2x}/bnx2x_reg.h                |    0
 drivers/net/bnx2x/bnx2x_stats.c                    | 1411 ++
 drivers/net/bnx2x/bnx2x_stats.h                    |  239 +
 drivers/net/bnx2x_main.c                           |13928 --------------------
 drivers/net/bonding/bond_alb.c                     |   37 +-
 drivers/net/bonding/bond_ipv6.c                    |    2 +
 drivers/net/bonding/bond_main.c                    |  222 +-
 drivers/net/bonding/bond_sysfs.c                   |  316 +-
 drivers/net/bonding/bonding.h                      |   14 +-
 drivers/net/caif/Kconfig                           |   22 +-
 drivers/net/caif/Makefile                          |   14 +-
 drivers/net/caif/caif_serial.c                     |   12 +-
 drivers/net/caif/caif_spi.c                        |  850 ++
 drivers/net/caif/caif_spi_slave.c                  |  252 +
 drivers/net/can/Kconfig                            |    9 +
 drivers/net/can/Makefile                           |    1 +
 drivers/net/can/flexcan.c                          | 1030 ++
 drivers/net/can/mscan/mscan.h                      |    2 +-
 drivers/net/can/usb/Kconfig                        |    6 +
 drivers/net/can/usb/Makefile                       |    1 +
 drivers/net/can/usb/ems_usb.c                      |    2 +-
 drivers/net/can/usb/esd_usb2.c                     | 1132 ++
 drivers/net/cassini.c                              |   25 +-
 drivers/net/cassini.h                              |    4 -
 drivers/net/chelsio/common.h                       |    1 -
 drivers/net/chelsio/subr.c                         |   49 +-
 drivers/net/cnic.c                                 |  373 +-
 drivers/net/cnic.h                                 |   23 +-
 drivers/net/cnic_if.h                              |    4 +-
 drivers/net/cpmac.c                                |   13 +-
 drivers/net/cris/eth_v10.c                         |    4 -
 drivers/net/cs89x0.c                               |  162 +-
 drivers/net/cs89x0.h                               |    4 -
 drivers/net/cxgb3/cxgb3_main.c                     |   12 +-
 drivers/net/cxgb3/sge.c                            |   14 +-
 drivers/net/cxgb3/t3_hw.c                          |   16 +-
 drivers/net/cxgb3/version.h                        |    4 +-
 drivers/net/cxgb4/cxgb4.h                          |   11 +-
 drivers/net/cxgb4/cxgb4_main.c                     |  755 +-
 drivers/net/cxgb4/cxgb4_uld.h                      |    6 +
 drivers/net/cxgb4/l2t.c                            |    7 +
 drivers/net/cxgb4/sge.c                            |   67 +-
 drivers/net/cxgb4/t4_hw.c                          |  109 +-
 drivers/net/cxgb4/t4_hw.h                          |   45 +-
 drivers/net/cxgb4/t4_msg.h                         |   16 +-
 drivers/net/cxgb4/t4_regs.h                        |    7 +
 drivers/net/cxgb4/t4fw_api.h                       |   63 +-
 drivers/net/cxgb4vf/Makefile                       |    7 +
 drivers/net/cxgb4vf/adapter.h                      |  540 +
 drivers/net/cxgb4vf/cxgb4vf_main.c                 | 2888 ++++
 drivers/net/cxgb4vf/sge.c                          | 2454 ++++
 drivers/net/cxgb4vf/t4vf_common.h                  |  273 +
 drivers/net/cxgb4vf/t4vf_defs.h                    |  121 +
 drivers/net/cxgb4vf/t4vf_hw.c                      | 1333 ++
 drivers/net/davinci_emac.c                         |  200 +-
 drivers/net/depca.c                                |   29 +-
 drivers/net/dm9000.c                               |    2 +-
 drivers/net/dnet.c                                 |    9 +-
 drivers/net/e1000/e1000.h                          |   22 +-
 drivers/net/e1000/e1000_ethtool.c                  |   27 +-
 drivers/net/e1000/e1000_main.c                     |   86 +-
 drivers/net/e1000e/82571.c                         |    2 +-
 drivers/net/e1000e/defines.h                       |    4 +-
 drivers/net/e1000e/e1000.h                         |   10 +-
 drivers/net/e1000e/es2lan.c                        |    2 +-
 drivers/net/e1000e/ethtool.c                       |  144 +-
 drivers/net/e1000e/hw.h                            |   17 +-
 drivers/net/e1000e/ich8lan.c                       |  456 +-
 drivers/net/e1000e/lib.c                           |    2 +-
 drivers/net/e1000e/netdev.c                        |  357 +-
 drivers/net/e1000e/param.c                         |    2 +-
 drivers/net/e1000e/phy.c                           |    5 +-
 drivers/net/ehea/ehea_main.c                       |    2 +-
 drivers/net/ehea/ehea_qmr.h                        |    2 +-
 drivers/net/enic/cq_desc.h                         |    2 +-
 drivers/net/enic/cq_enet_desc.h                    |   20 +-
 drivers/net/enic/enic.h                            |   21 +-
 drivers/net/enic/enic_main.c                       |  517 +-
 drivers/net/enic/enic_res.c                        |   53 +-
 drivers/net/enic/enic_res.h                        |   33 +-
 drivers/net/enic/rq_enet_desc.h                    |    2 +-
 drivers/net/enic/vnic_cq.c                         |    4 +-
 drivers/net/enic/vnic_cq.h                         |    2 +-
 drivers/net/enic/vnic_dev.c                        |  272 +-
 drivers/net/enic/vnic_dev.h                        |   21 +-
 drivers/net/enic/vnic_devcmd.h                     |   35 +-
 drivers/net/enic/vnic_enet.h                       |    4 +-
 drivers/net/enic/vnic_intr.c                       |    5 +-
 drivers/net/enic/vnic_intr.h                       |    8 +-
 drivers/net/enic/vnic_nic.h                        |    2 +-
 drivers/net/enic/vnic_resource.h                   |    2 +-
 drivers/net/enic/vnic_rq.c                         |   40 +-
 drivers/net/enic/vnic_rq.h                         |   16 +-
 drivers/net/enic/vnic_rss.h                        |    2 +-
 drivers/net/enic/vnic_stats.h                      |    2 +-
 drivers/net/enic/vnic_vic.c                        |    8 +-
 drivers/net/enic/vnic_vic.h                        |    2 +-
 drivers/net/enic/vnic_wq.c                         |   25 +-
 drivers/net/enic/vnic_wq.h                         |   16 +-
 drivers/net/enic/wq_enet_desc.h                    |    2 +-
 drivers/net/epic100.c                              |   47 +-
 drivers/net/eth16i.c                               |    4 +-
 drivers/net/ethoc.c                                |  160 +-
 drivers/net/fealnx.c                               |   68 +-
 drivers/net/fec.c                                  |  110 +-
 drivers/net/fec_mpc52xx.c                          |   40 +-
 drivers/net/fec_mpc52xx_phy.c                      |   24 +-
 drivers/net/forcedeth.c                            |   62 +-
 drivers/net/fs_enet/fs_enet-main.c                 |    3 +-
 drivers/net/fsl_pq_mdio.h                          |    2 +-
 drivers/net/gianfar.c                              |  152 +-
 drivers/net/gianfar.h                              |   13 +
 drivers/net/greth.c                                |    1 -
 drivers/net/hamachi.c                              |   63 +-
 drivers/net/hp100.c                                |   53 +-
 drivers/net/igb/e1000_82575.c                      |  143 +-
 drivers/net/igb/e1000_defines.h                    |   16 +
 drivers/net/igb/igb_ethtool.c                      |    8 +-
 drivers/net/igb/igb_main.c                         |   43 +-
 drivers/net/igbvf/netdev.c                         |    2 +-
 drivers/net/ioc3-eth.c                             |   49 +-
 drivers/net/irda/donauboe.h                        |    2 +-
 drivers/net/irda/irda-usb.h                        |    2 +-
 drivers/net/irda/ks959-sir.c                       |    2 +-
 drivers/net/irda/ksdazzle-sir.c                    |    2 +-
 drivers/net/irda/sh_irda.c                         |    2 +-
 drivers/net/irda/sh_sir.c                          |    2 +-
 drivers/net/irda/smsc-ircc2.c                      |    5 +-
 drivers/net/irda/vlsi_ir.h                         |    6 +-
 drivers/net/ixgbe/ixgbe.h                          |    9 +-
 drivers/net/ixgbe/ixgbe_82599.c                    |   18 +-
 drivers/net/ixgbe/ixgbe_common.h                   |   25 +-
 drivers/net/ixgbe/ixgbe_dcb_82599.c                |    2 +-
 drivers/net/ixgbe/ixgbe_dcb_nl.c                   |    2 +-
 drivers/net/ixgbe/ixgbe_ethtool.c                  |  107 +-
 drivers/net/ixgbe/ixgbe_fcoe.c                     |   56 +-
 drivers/net/ixgbe/ixgbe_main.c                     |  425 +-
 drivers/net/ixgbe/ixgbe_phy.c                      |   33 +-
 drivers/net/ixgbe/ixgbe_phy.h                      |    1 +
 drivers/net/ixgbe/ixgbe_sriov.c                    |   30 +-
 drivers/net/ixgbe/ixgbe_type.h                     |    2 +
 drivers/net/ixgbevf/ixgbevf_main.c                 |   18 +-
 drivers/net/jazzsonic.c                            |   17 +-
 drivers/net/ks8842.c                               |  706 +-
 drivers/net/ksz884x.c                              |   59 +-
 drivers/net/lance.c                                |   56 +-
 drivers/net/ll_temac_main.c                        |   63 +-
 drivers/net/loopback.c                             |   33 +-
 drivers/net/mac8390.c                              |   57 +-
 drivers/net/mac89x0.c                              |   52 +-
 drivers/net/macb.c                                 |    2 +-
 drivers/net/macsonic.c                             |   37 +-
 drivers/net/macvlan.c                              |   95 +-
 drivers/net/macvtap.c                              |    2 +-
 drivers/net/mlx4/catas.c                           |    4 +-
 drivers/net/mlx4/en_ethtool.c                      |   38 +-
 drivers/net/mlx4/en_main.c                         |   29 +-
 drivers/net/mlx4/en_netdev.c                       |    1 +
 drivers/net/mlx4/eq.c                              |   20 +-
 drivers/net/mlx4/main.c                            |   16 +-
 drivers/net/mlx4/mlx4.h                            |   15 +-
 drivers/net/mlx4/mlx4_en.h                         |   62 +-
 drivers/net/mlx4/mr.c                              |    2 +-
 drivers/net/mv643xx_eth.c                          |   12 +-
 drivers/net/myri10ge/myri10ge.c                    |   10 +-
 drivers/net/natsemi.c                              |   56 +-
 drivers/net/netxen/netxen_nic_ctx.c                |   16 +-
 drivers/net/netxen/netxen_nic_ethtool.c            |   13 +-
 drivers/net/ni52.c                                 |   37 +-
 drivers/net/niu.c                                  |   13 +-
 drivers/net/ns83820.c                              |   44 +-
 drivers/net/octeon/octeon_mgmt.c                   |    8 +-
 drivers/net/phy/broadcom.c                         |   46 +-
 drivers/net/phy/icplus.c                           |    2 +
 drivers/net/phy/marvell.c                          |   77 +-
 drivers/net/phy/mdio-octeon.c                      |    6 +-
 drivers/net/phy/micrel.c                           |  167 +-
 drivers/net/phy/phy.c                              |    8 +-
 drivers/net/phy/phy_device.c                       |    2 +
 drivers/net/ppp_generic.c                          |   37 +-
 drivers/net/pppoe.c                                |    3 +-
 drivers/net/ps3_gelic_wireless.h                   |   10 +-
 drivers/net/qla3xxx.c                              | 1435 +--
 drivers/net/qlcnic/qlcnic.h                        |  225 +-
 drivers/net/qlcnic/qlcnic_ctx.c                    |  526 +-
 drivers/net/qlcnic/qlcnic_ethtool.c                |   42 +-
 drivers/net/qlcnic/qlcnic_hdr.h                    |   78 +-
 drivers/net/qlcnic/qlcnic_hw.c                     |   62 +-
 drivers/net/qlcnic/qlcnic_init.c                   |  136 +-
 drivers/net/qlcnic/qlcnic_main.c                   | 1139 ++-
 drivers/net/qlge/qlge.h                            |   30 +-
 drivers/net/qlge/qlge_dbg.c                        |  814 +-
 drivers/net/qlge/qlge_main.c                       |   47 +-
 drivers/net/qlge/qlge_mpi.c                        |   17 -
 drivers/net/r6040.c                                |  302 +-
 drivers/net/r8169.c                                |    2 +-
 drivers/net/s2io-regs.h                            |    2 +-
 drivers/net/s2io.c                                 |   83 +-
 drivers/net/s2io.h                                 |    2 +-
 drivers/net/sb1250-mac.c                           |    2 +-
 drivers/net/sfc/efx.c                              |  304 +-
 drivers/net/sfc/efx.h                              |    9 +-
 drivers/net/sfc/ethtool.c                          |  167 +-
 drivers/net/sfc/falcon.c                           |  200 +-
 drivers/net/sfc/falcon_boards.c                    |   35 +-
 drivers/net/sfc/falcon_xmac.c                      |    5 +-
 drivers/net/sfc/io.h                               |   37 +-
 drivers/net/sfc/mcdi.c                             |   98 +-
 drivers/net/sfc/mcdi_mac.c                         |    8 +-
 drivers/net/sfc/mcdi_phy.c                         |   41 +-
 drivers/net/sfc/mdio_10g.c                         |   39 +-
 drivers/net/sfc/mdio_10g.h                         |    3 +-
 drivers/net/sfc/mtd.c                              |   23 +-
 drivers/net/sfc/net_driver.h                       |   88 +-
 drivers/net/sfc/nic.c                              |  553 +-
 drivers/net/sfc/nic.h                              |    9 +-
 drivers/net/sfc/qt202x_phy.c                       |   42 +-
 drivers/net/sfc/rx.c                               |  469 +-
 drivers/net/sfc/selftest.c                         |  154 +-
 drivers/net/sfc/siena.c                            |   68 +-
 drivers/net/sfc/tenxpress.c                        |   12 +-
 drivers/net/sfc/tx.c                               |   41 +-
 drivers/net/sfc/workarounds.h                      |    2 +-
 drivers/net/sh_eth.c                               |   55 +-
 drivers/net/sky2.c                                 |   40 +-
 drivers/net/sky2.h                                 |    6 +-
 drivers/net/smsc911x.c                             |   94 +-
 drivers/net/smsc9420.c                             |    2 +-
 drivers/net/starfire.c                             |   47 +-
 drivers/net/stmmac/common.h                        |    1 +
 drivers/net/stmmac/dwmac1000.h                     |    2 +-
 drivers/net/stmmac/dwmac1000_core.c                |    2 +
 drivers/net/stmmac/dwmac100_core.c                 |    2 +
 drivers/net/stmmac/enh_desc.c                      |    2 +-
 drivers/net/stmmac/stmmac_main.c                   |   37 +-
 drivers/net/sun3_82586.c                           |   35 +-
 drivers/net/tc35815.c                              |    2 +-
 drivers/net/tehuti.h                               |    2 +-
 drivers/net/tg3.c                                  |  799 +-
 drivers/net/tg3.h                                  |   98 +-
 drivers/net/tulip/de2104x.c                        |    4 +-
 drivers/net/tulip/eeprom.c                         |   10 +-
 drivers/net/tulip/tulip.h                          |   64 +-
 drivers/net/tulip/tulip_core.c                     |  132 +-
 drivers/net/tulip/winbond-840.c                    |    4 +-
 drivers/net/tun.c                                  |   10 +-
 drivers/net/typhoon.c                              |    2 +-
 drivers/net/typhoon.h                              |   26 +-
 drivers/net/ucc_geth.c                             |   16 +-
 drivers/net/ucc_geth.h                             |   46 +-
 drivers/net/usb/asix.c                             |    2 +-
 drivers/net/usb/cdc-phonet.c                       |    8 +-
 drivers/net/usb/hso.c                              |    8 +-
 drivers/net/usb/ipheth.c                           |   13 +-
 drivers/net/usb/kaweth.c                           |    2 +-
 drivers/net/usb/net1080.c                          |    4 +-
 drivers/net/usb/pegasus.c                          |  125 +-
 drivers/net/usb/pegasus.h                          |  296 +-
 drivers/net/usb/sierra_net.c                       |    2 +-
 drivers/net/usb/usbnet.c                           |   17 +-
 drivers/net/via-velocity.h                         |   12 +-
 drivers/net/vmxnet3/vmxnet3_defs.h                 |    6 +-
 drivers/net/vmxnet3/vmxnet3_drv.c                  |   46 +-
 drivers/net/vmxnet3/vmxnet3_ethtool.c              |   18 +-
 drivers/net/vmxnet3/vmxnet3_int.h                  |    4 +-
 drivers/net/vxge/Makefile                          |    2 +-
 drivers/net/vxge/vxge-config.c                     |    4 +-
 drivers/net/vxge/vxge-config.h                     |    4 +-
 drivers/net/vxge/vxge-ethtool.c                    |    4 +-
 drivers/net/vxge/vxge-ethtool.h                    |    4 +-
 drivers/net/vxge/vxge-main.c                       |  599 +-
 drivers/net/vxge/vxge-main.h                       |   27 +-
 drivers/net/vxge/vxge-reg.h                        |    4 +-
 drivers/net/vxge/vxge-traffic.c                    |    8 +-
 drivers/net/vxge/vxge-traffic.h                    |    4 +-
 drivers/net/vxge/vxge-version.h                    |    9 +-
 drivers/net/wan/cosa.c                             |   10 +-
 drivers/net/wan/farsync.c                          |  125 +-
 drivers/net/wan/hd64570.h                          |    2 +-
 drivers/net/wan/hdlc_cisco.c                       |    4 +-
 drivers/net/wan/hdlc_fr.c                          |    2 +-
 drivers/net/wan/sdla.c                             |   13 +-
 drivers/net/wd.c                                   |    4 +-
 drivers/net/wimax/i2400m/control.c                 |    2 +-
 drivers/net/wimax/i2400m/fw.c                      |    8 +-
 drivers/net/wimax/i2400m/op-rfkill.c               |    2 +-
 drivers/net/wireless/adm8211.c                     |   58 +-
 drivers/net/wireless/adm8211.h                     |    6 +-
 drivers/net/wireless/airo.c                        |   56 +-
 drivers/net/wireless/at76c50x-usb.c                |  270 +-
 drivers/net/wireless/at76c50x-usb.h                |   41 +-
 drivers/net/wireless/ath/ar9170/cmd.c              |    7 +-
 drivers/net/wireless/ath/ar9170/led.c              |    4 +-
 drivers/net/wireless/ath/ar9170/main.c             |  191 +-
 drivers/net/wireless/ath/ar9170/phy.c              |    8 +-
 drivers/net/wireless/ath/ath5k/Makefile            |    1 +
 drivers/net/wireless/ath/ath5k/ani.c               |   20 +-
 drivers/net/wireless/ath/ath5k/ath5k.h             |   19 +-
 drivers/net/wireless/ath/ath5k/attach.c            |    2 -
 drivers/net/wireless/ath/ath5k/base.c              |  438 +-
 drivers/net/wireless/ath/ath5k/base.h              |    4 +-
 drivers/net/wireless/ath/ath5k/caps.c              |    7 -
 drivers/net/wireless/ath/ath5k/debug.c             |   99 +-
 drivers/net/wireless/ath/ath5k/debug.h             |    9 +-
 drivers/net/wireless/ath/ath5k/desc.c              |  152 +-
 drivers/net/wireless/ath/ath5k/desc.h              |  310 +-
 drivers/net/wireless/ath/ath5k/dma.c               |   13 -
 drivers/net/wireless/ath/ath5k/eeprom.c            |    3 +-
 drivers/net/wireless/ath/ath5k/gpio.c              |    7 -
 drivers/net/wireless/ath/ath5k/pcu.c               |   24 -
 drivers/net/wireless/ath/ath5k/phy.c               |   82 +-
 drivers/net/wireless/ath/ath5k/qcu.c               |    9 -
 drivers/net/wireless/ath/ath5k/reset.c             |   64 +-
 drivers/net/wireless/ath/ath5k/sysfs.c             |  116 +
 drivers/net/wireless/ath/ath9k/Makefile            |    3 +-
 drivers/net/wireless/ath/ath9k/ahb.c               |    7 +-
 drivers/net/wireless/ath/ath9k/ani.c               |  743 +-
 drivers/net/wireless/ath/ath9k/ani.h               |   78 +-
 drivers/net/wireless/ath/ath9k/ar5008_initvals.h   | 1319 +-
 drivers/net/wireless/ath/ath9k/ar5008_phy.c        |  492 +-
 drivers/net/wireless/ath/ath9k/ar9001_initvals.h   | 2479 ++--
 drivers/net/wireless/ath/ath9k/ar9002_calib.c      |    2 +-
 drivers/net/wireless/ath/ath9k/ar9002_hw.c         |  196 +-
 drivers/net/wireless/ath/ath9k/ar9002_initvals.h   | 8251 +++++-------
 drivers/net/wireless/ath/ath9k/ar9002_mac.c        |    1 +
 drivers/net/wireless/ath/ath9k/ar9002_phy.c        |   71 +-
 drivers/net/wireless/ath/ath9k/ar9002_phy.h        |   33 +
 .../{ar9003_initvals.h => ar9003_2p0_initvals.h}   |  254 +-
 .../{ar9003_initvals.h => ar9003_2p2_initvals.h}   |  433 +-
 drivers/net/wireless/ath/ath9k/ar9003_calib.c      |   10 +-
 drivers/net/wireless/ath/ath9k/ar9003_eeprom.c     |   15 +-
 drivers/net/wireless/ath/ath9k/ar9003_eeprom.h     |    4 +-
 drivers/net/wireless/ath/ath9k/ar9003_hw.c         |  185 +-
 drivers/net/wireless/ath/ath9k/ar9003_mac.c        |   44 +-
 drivers/net/wireless/ath/ath9k/ar9003_mac.h        |    8 +-
 drivers/net/wireless/ath/ath9k/ar9003_paprd.c      |  714 +
 drivers/net/wireless/ath/ath9k/ar9003_phy.c        |  699 +-
 drivers/net/wireless/ath/ath9k/ar9003_phy.h        |  298 +-
 drivers/net/wireless/ath/ath9k/ath9k.h             |   92 +-
 drivers/net/wireless/ath/ath9k/beacon.c            |    3 +-
 drivers/net/wireless/ath/ath9k/calib.c             |  138 +-
 drivers/net/wireless/ath/ath9k/calib.h             |    7 +-
 drivers/net/wireless/ath/ath9k/common.c            |  318 +-
 drivers/net/wireless/ath/ath9k/common.h            |   77 +-
 drivers/net/wireless/ath/ath9k/debug.c             |   68 +-
 drivers/net/wireless/ath/ath9k/debug.h             |    2 +
 drivers/net/wireless/ath/ath9k/eeprom.c            |   29 +
 drivers/net/wireless/ath/ath9k/eeprom.h            |    7 +-
 drivers/net/wireless/ath/ath9k/eeprom_4k.c         |   12 +-
 drivers/net/wireless/ath/ath9k/eeprom_9287.c       |  616 +-
 drivers/net/wireless/ath/ath9k/eeprom_def.c        |   14 +-
 drivers/net/wireless/ath/ath9k/gpio.c              |    9 +-
 drivers/net/wireless/ath/ath9k/hif_usb.c           |   71 +-
 drivers/net/wireless/ath/ath9k/hif_usb.h           |    2 +
 drivers/net/wireless/ath/ath9k/htc.h               |   38 +-
 drivers/net/wireless/ath/ath9k/htc_drv_beacon.c    |   23 +
 drivers/net/wireless/ath/ath9k/htc_drv_init.c      |  163 +-
 drivers/net/wireless/ath/ath9k/htc_drv_main.c      |  512 +-
 drivers/net/wireless/ath/ath9k/htc_drv_txrx.c      |   86 +-
 drivers/net/wireless/ath/ath9k/htc_hst.c           |    3 +-
 drivers/net/wireless/ath/ath9k/hw-ops.h            |   22 +-
 drivers/net/wireless/ath/ath9k/hw.c                |  314 +-
 drivers/net/wireless/ath/ath9k/hw.h                |  123 +-
 drivers/net/wireless/ath/ath9k/init.c              |   61 +-
 drivers/net/wireless/ath/ath9k/mac.c               |   14 +-
 drivers/net/wireless/ath/ath9k/mac.h               |   16 +-
 drivers/net/wireless/ath/ath9k/main.c              |  475 +-
 drivers/net/wireless/ath/ath9k/pci.c               |    8 +-
 drivers/net/wireless/ath/ath9k/rc.c                |  633 +-
 drivers/net/wireless/ath/ath9k/rc.h                |   89 +-
 drivers/net/wireless/ath/ath9k/recv.c              |  292 +-
 drivers/net/wireless/ath/ath9k/reg.h               |   90 +-
 drivers/net/wireless/ath/ath9k/virtual.c           |    8 +-
 drivers/net/wireless/ath/ath9k/wmi.c               |    3 -
 drivers/net/wireless/ath/ath9k/xmit.c              |  251 +-
 drivers/net/wireless/b43/b43.h                     |    6 +-
 drivers/net/wireless/b43/dma.c                     |   69 +-
 drivers/net/wireless/b43/dma.h                     |    8 +-
 drivers/net/wireless/b43/main.c                    |    4 +-
 drivers/net/wireless/b43/phy_g.c                   |    2 +-
 drivers/net/wireless/b43/phy_lp.c                  |    8 +-
 drivers/net/wireless/b43/phy_n.c                   |   16 +-
 drivers/net/wireless/b43/sdio.c                    |    1 +
 drivers/net/wireless/b43/wa.c                      |    8 +-
 drivers/net/wireless/b43/xmit.h                    |   20 +-
 drivers/net/wireless/b43legacy/b43legacy.h         |    6 +-
 drivers/net/wireless/b43legacy/dma.c               |   49 +-
 drivers/net/wireless/b43legacy/dma.h               |    8 +-
 drivers/net/wireless/b43legacy/xmit.h              |   10 +-
 drivers/net/wireless/hostap/hostap_80211.h         |   18 +-
 drivers/net/wireless/hostap/hostap_ap.c            |    3 +-
 drivers/net/wireless/hostap/hostap_common.h        |   10 +-
 drivers/net/wireless/hostap/hostap_main.c          |    4 +-
 drivers/net/wireless/hostap/hostap_wlan.h          |   32 +-
 drivers/net/wireless/ipw2x00/ipw2100.c             |   24 +-
 drivers/net/wireless/ipw2x00/ipw2100.h             |   16 +-
 drivers/net/wireless/ipw2x00/ipw2200.c             |    7 +-
 drivers/net/wireless/ipw2x00/ipw2200.h             |  122 +-
 drivers/net/wireless/ipw2x00/libipw.h              |   63 +-
 drivers/net/wireless/ipw2x00/libipw_module.c       |    4 +-
 drivers/net/wireless/ipw2x00/libipw_tx.c           |   16 +-
 drivers/net/wireless/ipw2x00/libipw_wx.c           |    6 +-
 drivers/net/wireless/iwlwifi/Kconfig               |   15 +-
 drivers/net/wireless/iwlwifi/Makefile              |    4 +-
 drivers/net/wireless/iwlwifi/iwl-1000.c            |   12 +-
 drivers/net/wireless/iwlwifi/iwl-3945-debugfs.c    |   28 +-
 drivers/net/wireless/iwlwifi/iwl-3945-fh.h         |    4 +-
 drivers/net/wireless/iwlwifi/iwl-3945-hw.h         |   10 +-
 drivers/net/wireless/iwlwifi/iwl-3945.c            |  208 +-
 drivers/net/wireless/iwlwifi/iwl-4965-hw.h         |    2 +-
 drivers/net/wireless/iwlwifi/iwl-4965.c            |   98 +-
 drivers/net/wireless/iwlwifi/iwl-5000.c            |   80 +-
 drivers/net/wireless/iwlwifi/iwl-6000.c            |  538 +-
 .../iwlwifi/{iwl-calib.c => iwl-agn-calib.c}       |  223 +-
 drivers/net/wireless/iwlwifi/iwl-agn-debugfs.c     |  239 +-
 drivers/net/wireless/iwlwifi/iwl-agn-debugfs.h     |    7 +
 drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c        |   32 +-
 drivers/net/wireless/iwlwifi/iwl-agn-hw.h          |    2 +-
 drivers/net/wireless/iwlwifi/iwl-agn-lib.c         |  320 +-
 drivers/net/wireless/iwlwifi/iwl-agn-rs.c          |   20 +-
 drivers/net/wireless/iwlwifi/iwl-agn-rx.c          |  351 +
 drivers/net/wireless/iwlwifi/iwl-agn-tx.c          |   89 +-
 drivers/net/wireless/iwlwifi/iwl-agn-ucode.c       |  123 +
 drivers/net/wireless/iwlwifi/iwl-agn.c             |  594 +-
 drivers/net/wireless/iwlwifi/iwl-agn.h             |   48 +
 drivers/net/wireless/iwlwifi/iwl-calib.h           |    6 +-
 drivers/net/wireless/iwlwifi/iwl-commands.h        |  422 +-
 drivers/net/wireless/iwlwifi/iwl-core.c            |  395 +-
 drivers/net/wireless/iwlwifi/iwl-core.h            |   44 +-
 drivers/net/wireless/iwlwifi/iwl-csr.h             |    1 +
 drivers/net/wireless/iwlwifi/iwl-debugfs.c         |  144 +-
 drivers/net/wireless/iwlwifi/iwl-dev.h             |  123 +-
 drivers/net/wireless/iwlwifi/iwl-eeprom.c          |    3 +
 drivers/net/wireless/iwlwifi/iwl-eeprom.h          |   17 +-
 drivers/net/wireless/iwlwifi/iwl-fh.h              |   13 +-
 drivers/net/wireless/iwlwifi/iwl-hcmd.c            |    1 +
 drivers/net/wireless/iwlwifi/iwl-helpers.h         |   27 +
 drivers/net/wireless/iwlwifi/iwl-rx.c              |  246 +-
 drivers/net/wireless/iwlwifi/iwl-scan.c            |   67 +-
 drivers/net/wireless/iwlwifi/iwl-spectrum.h        |   10 +-
 drivers/net/wireless/iwlwifi/iwl-sta.c             |  164 +-
 drivers/net/wireless/iwlwifi/iwl-sta.h             |   32 +-
 drivers/net/wireless/iwlwifi/iwl-tx.c              |   33 +-
 drivers/net/wireless/iwlwifi/iwl3945-base.c        |  160 +-
 drivers/net/wireless/iwmc3200wifi/cfg80211.c       |   12 +-
 drivers/net/wireless/iwmc3200wifi/commands.h       |   50 +-
 drivers/net/wireless/iwmc3200wifi/hal.c            |    2 +-
 drivers/net/wireless/iwmc3200wifi/iwm.h            |    2 +-
 drivers/net/wireless/iwmc3200wifi/lmac.h           |   32 +-
 drivers/net/wireless/iwmc3200wifi/rx.c             |    4 +-
 drivers/net/wireless/iwmc3200wifi/umac.h           |   60 +-
 drivers/net/wireless/libertas/Makefile             |    3 -
 drivers/net/wireless/libertas/README               |   12 +
 drivers/net/wireless/libertas/assoc.c              | 2264 ----
 drivers/net/wireless/libertas/assoc.h              |  155 -
 drivers/net/wireless/libertas/cfg.c                | 1865 +++-
 drivers/net/wireless/libertas/cfg.h                |   15 +-
 drivers/net/wireless/libertas/cmd.c                |  767 +-
 drivers/net/wireless/libertas/cmd.h                |   27 +-
 drivers/net/wireless/libertas/cmdresp.c            |  190 +-
 drivers/net/wireless/libertas/debugfs.c            |  191 +-
 drivers/net/wireless/libertas/decl.h               |    7 +-
 drivers/net/wireless/libertas/defs.h               |   18 -
 drivers/net/wireless/libertas/dev.h                |   68 +-
 drivers/net/wireless/libertas/ethtool.c            |   29 +-
 drivers/net/wireless/libertas/host.h               |  250 +-
 drivers/net/wireless/libertas/if_sdio.c            |   58 +
 drivers/net/wireless/libertas/if_usb.c             |   16 +-
 drivers/net/wireless/libertas/main.c               |  326 +-
 drivers/net/wireless/libertas/mesh.c               |  222 +-
 drivers/net/wireless/libertas/mesh.h               |   19 +-
 drivers/net/wireless/libertas/radiotap.h           |    4 +-
 drivers/net/wireless/libertas/rx.c                 |  129 +-
 drivers/net/wireless/libertas/scan.c               | 1354 --
 drivers/net/wireless/libertas/scan.h               |   63 -
 drivers/net/wireless/libertas/tx.c                 |   12 +-
 drivers/net/wireless/libertas/types.h              |   66 +-
 drivers/net/wireless/libertas/wext.c               | 2353 ----
 drivers/net/wireless/libertas/wext.h               |   17 -
 drivers/net/wireless/libertas_tf/if_usb.c          |    5 +-
 drivers/net/wireless/libertas_tf/libertas_tf.h     |    7 +-
 drivers/net/wireless/libertas_tf/main.c            |   18 +
 drivers/net/wireless/mac80211_hwsim.c              |  106 +-
 drivers/net/wireless/mwl8k.c                       |  254 +-
 drivers/net/wireless/orinoco/cfg.c                 |    5 +-
 drivers/net/wireless/orinoco/fw.c                  |    2 +-
 drivers/net/wireless/orinoco/hermes.h              |   18 +-
 drivers/net/wireless/orinoco/hermes_dld.c          |   10 +-
 drivers/net/wireless/orinoco/hw.c                  |    6 +-
 drivers/net/wireless/orinoco/main.c                |   10 +-
 drivers/net/wireless/orinoco/orinoco.h             |    2 +-
 drivers/net/wireless/orinoco/orinoco_usb.c         |   18 +-
 drivers/net/wireless/orinoco/wext.c                |    6 +-
 drivers/net/wireless/p54/eeprom.c                  |   80 +-
 drivers/net/wireless/p54/fwio.c                    |   53 +-
 drivers/net/wireless/p54/led.c                     |    8 +-
 drivers/net/wireless/p54/main.c                    |   17 +
 drivers/net/wireless/p54/net2280.h                 |   16 +-
 drivers/net/wireless/p54/p54pci.c                  |    3 +-
 drivers/net/wireless/p54/p54pci.h                  |    6 +-
 drivers/net/wireless/p54/p54spi.c                  |    5 +-
 drivers/net/wireless/p54/p54spi.h                  |    2 +-
 drivers/net/wireless/p54/p54usb.c                  |    6 +-
 drivers/net/wireless/p54/p54usb.h                  |    6 +-
 drivers/net/wireless/p54/txrx.c                    |   36 +-
 drivers/net/wireless/prism54/isl_ioctl.c           |   15 +-
 drivers/net/wireless/prism54/isl_oid.h             |   18 +-
 drivers/net/wireless/prism54/islpci_eth.h          |    4 +-
 drivers/net/wireless/prism54/islpci_mgt.h          |    2 +-
 drivers/net/wireless/ray_cs.c                      |   23 +-
 drivers/net/wireless/rndis_wlan.c                  |   90 +-
 drivers/net/wireless/rt2x00/rt2400pci.c            |   85 +-
 drivers/net/wireless/rt2x00/rt2500pci.c            |   87 +-
 drivers/net/wireless/rt2x00/rt2500usb.c            |   63 +-
 drivers/net/wireless/rt2x00/rt2800.h               |   93 +-
 drivers/net/wireless/rt2x00/rt2800lib.c            |  734 +-
 drivers/net/wireless/rt2x00/rt2800lib.h            |   54 +-
 drivers/net/wireless/rt2x00/rt2800pci.c            |  366 +-
 drivers/net/wireless/rt2x00/rt2800pci.h            |   19 -
 drivers/net/wireless/rt2x00/rt2800usb.c            |  293 +-
 drivers/net/wireless/rt2x00/rt2800usb.h            |   37 -
 drivers/net/wireless/rt2x00/rt2x00.h               |   69 +-
 drivers/net/wireless/rt2x00/rt2x00config.c         |   16 +-
 drivers/net/wireless/rt2x00/rt2x00debug.c          |    1 +
 drivers/net/wireless/rt2x00/rt2x00dev.c            |  139 +-
 drivers/net/wireless/rt2x00/rt2x00dump.h           |    9 +-
 drivers/net/wireless/rt2x00/rt2x00ht.c             |   47 +-
 drivers/net/wireless/rt2x00/rt2x00lib.h            |   52 +-
 drivers/net/wireless/rt2x00/rt2x00link.c           |   73 +-
 drivers/net/wireless/rt2x00/rt2x00mac.c            |   75 +-
 drivers/net/wireless/rt2x00/rt2x00pci.c            |   39 +-
 drivers/net/wireless/rt2x00/rt2x00pci.h            |   10 -
 drivers/net/wireless/rt2x00/rt2x00queue.c          |   90 +-
 drivers/net/wireless/rt2x00/rt2x00queue.h          |   20 +-
 drivers/net/wireless/rt2x00/rt2x00reg.h            |    5 +-
 drivers/net/wireless/rt2x00/rt2x00usb.c            |  118 +-
 drivers/net/wireless/rt2x00/rt2x00usb.h            |   39 +-
 drivers/net/wireless/rt2x00/rt61pci.c              |  130 +-
 drivers/net/wireless/rt2x00/rt61pci.h              |    4 +-
 drivers/net/wireless/rt2x00/rt73usb.c              |   59 +-
 drivers/net/wireless/rt2x00/rt73usb.h              |    4 +-
 drivers/net/wireless/rtl818x/rtl8180.h             |    4 +-
 drivers/net/wireless/rtl818x/rtl8180_dev.c         |   34 +-
 drivers/net/wireless/rtl818x/rtl8180_grf5101.c     |   12 +-
 drivers/net/wireless/rtl818x/rtl8180_max2820.c     |   19 +-
 drivers/net/wireless/rtl818x/rtl8180_rtl8225.c     |    5 +-
 drivers/net/wireless/rtl818x/rtl8180_sa2400.c      |   28 +-
 drivers/net/wireless/rtl818x/rtl8187.h             |    8 +-
 drivers/net/wireless/rtl818x/rtl8187_dev.c         |   11 +-
 drivers/net/wireless/rtl818x/rtl8187_rtl8225.c     |    8 +-
 drivers/net/wireless/rtl818x/rtl818x.h             |    3 +-
 drivers/net/wireless/wl12xx/Kconfig                |    4 +-
 drivers/net/wireless/wl12xx/Makefile               |    2 +-
 drivers/net/wireless/wl12xx/wl1251.h               |    3 +
 drivers/net/wireless/wl12xx/wl1251_acx.h           |  102 +-
 drivers/net/wireless/wl12xx/wl1251_boot.c          |    8 +-
 drivers/net/wireless/wl12xx/wl1251_cmd.h           |   34 +-
 drivers/net/wireless/wl12xx/wl1251_event.h         |    4 +-
 drivers/net/wireless/wl12xx/wl1251_main.c          |   27 +-
 drivers/net/wireless/wl12xx/wl1251_rx.c            |    6 +
 drivers/net/wireless/wl12xx/wl1251_rx.h            |    2 +-
 drivers/net/wireless/wl12xx/wl1251_sdio.c          |   40 +-
 drivers/net/wireless/wl12xx/wl1251_spi.c           |    1 +
 drivers/net/wireless/wl12xx/wl1251_tx.c            |   10 +-
 drivers/net/wireless/wl12xx/wl1251_tx.h            |   14 +-
 drivers/net/wireless/wl12xx/wl1271.h               |   58 +-
 drivers/net/wireless/wl12xx/wl1271_acx.c           |   41 +-
 drivers/net/wireless/wl12xx/wl1271_acx.h           |  117 +-
 drivers/net/wireless/wl12xx/wl1271_boot.c          |    4 +-
 drivers/net/wireless/wl12xx/wl1271_cmd.c           |  275 +-
 drivers/net/wireless/wl12xx/wl1271_cmd.h           |  124 +-
 drivers/net/wireless/wl12xx/wl1271_conf.h          |   16 +-
 drivers/net/wireless/wl12xx/wl1271_event.c         |   99 +-
 drivers/net/wireless/wl12xx/wl1271_event.h         |    5 +-
 drivers/net/wireless/wl12xx/wl1271_ini.h           |  123 +
 drivers/net/wireless/wl12xx/wl1271_main.c          |  289 +-
 drivers/net/wireless/wl12xx/wl1271_rx.c            |   11 +-
 drivers/net/wireless/wl12xx/wl1271_rx.h            |    2 +-
 drivers/net/wireless/wl12xx/wl1271_scan.c          |  257 +
 drivers/net/wireless/wl12xx/wl1271_scan.h          |  109 +
 drivers/net/wireless/wl12xx/wl1271_sdio.c          |    2 +-
 drivers/net/wireless/wl12xx/wl1271_spi.c           |    1 +
 drivers/net/wireless/wl12xx/wl1271_testmode.c      |   11 +-
 drivers/net/wireless/wl12xx/wl1271_tx.c            |   36 +-
 drivers/net/wireless/wl12xx/wl1271_tx.h            |    7 +-
 drivers/net/wireless/wl12xx/wl12xx_80211.h         |   26 +-
 drivers/net/wireless/wl3501.h                      |   16 +-
 drivers/net/wireless/zd1211rw/zd_mac.c             |    5 +-
 drivers/net/wireless/zd1211rw/zd_mac.h             |   15 +-
 drivers/net/wireless/zd1211rw/zd_usb.c             |    2 +-
 drivers/net/wireless/zd1211rw/zd_usb.h             |   14 +-
 drivers/net/xen-netfront.c                         |    1 +
 drivers/net/xtsonic.c                              |   12 +-
 drivers/parisc/led.c                               |    3 +-
 drivers/s390/net/claw.c                            |    2 +-
 drivers/s390/net/qeth_core.h                       |   27 +-
 drivers/s390/net/qeth_core_main.c                  |  423 +-
 drivers/s390/net/qeth_core_mpc.h                   |    5 +-
 drivers/s390/net/qeth_core_sys.c                   |    5 +-
 drivers/s390/net/qeth_l2_main.c                    |  108 +-
 drivers/s390/net/qeth_l3.h                         |    1 +
 drivers/s390/net/qeth_l3_main.c                    |  262 +-
 drivers/s390/net/qeth_l3_sys.c                     |   14 +
 drivers/s390/net/smsgiucv.c                        |   11 +-
 drivers/scsi/cxgb3i/cxgb3i_offload.c               |    4 +-
 drivers/scsi/fcoe/fcoe.c                           |    3 +-
 drivers/ssb/driver_chipcommon.c                    |   25 +
 drivers/ssb/driver_chipcommon_pmu.c                |   17 +-
 drivers/ssb/main.c                                 |   76 +-
 drivers/ssb/pci.c                                  |   15 +-
 drivers/staging/batman-adv/hard-interface.c        |    5 +-
 drivers/staging/octeon/ethernet-mdio.c             |    2 +-
 drivers/usb/atm/cxacru.c                           |   18 +-
 drivers/usb/atm/speedtch.c                         |   10 +-
 drivers/usb/atm/ueagle-atm.c                       |   13 +-
 drivers/usb/gadget/rndis.c                         |    5 +-
 drivers/vhost/net.c                                |  306 +-
 drivers/vhost/vhost.c                              |  232 +-
 drivers/vhost/vhost.h                              |   55 +-
 firmware/Makefile                                  |    2 +-
 firmware/cxgb3/t3fw-7.10.0.bin.ihex                | 1935 +++
 firmware/cxgb3/t3fw-7.4.0.bin.ihex                 | 1917 ---
 fs/compat_ioctl.c                                  |    9 +-
 include/linux/Kbuild                               |    1 +
 include/linux/atmdev.h                             |   17 +
 include/linux/brcmphy.h                            |    7 +
 include/linux/caif/caif_socket.h                   |   34 +
 include/linux/can/platform/flexcan.h               |   20 +
 include/linux/cgroup.h                             |    7 +
 include/linux/device.h                             |  112 +-
 include/linux/eeprom_93cx6.h                       |    1 +
 include/linux/etherdevice.h                        |   14 +
 include/linux/ethtool.h                            |   57 +-
 include/linux/filter.h                             |   48 +
 include/linux/if.h                                 |    2 +
 include/linux/if_bonding.h                         |    1 +
 include/linux/if_bridge.h                          |    2 -
 include/linux/if_ether.h                           |    2 +-
 include/linux/if_fddi.h                            |    8 +-
 include/linux/if_frad.h                            |    2 +-
 include/linux/if_hippi.h                           |    8 +-
 include/linux/if_link.h                            |    3 +-
 include/linux/if_macvlan.h                         |   23 +-
 include/linux/if_packet.h                          |    1 +
 include/linux/if_pppox.h                           |    8 +-
 include/linux/in.h                                 |    1 +
 include/linux/ip_vs.h                              |    2 +
 include/linux/ipv6.h                               |    6 +-
 include/linux/isdnif.h                             |    2 +-
 include/linux/kernel.h                             |    5 +
 include/linux/ks8842.h                             |    4 +
 include/linux/mISDNif.h                            |    2 +-
 include/linux/nbd.h                                |    2 +-
 include/linux/ncp.h                                |   10 +-
 include/linux/ncp_fs_sb.h                          |   14 +-
 include/linux/netdevice.h                          |  165 +-
 include/linux/netfilter/Kbuild                     |    6 +-
 include/linux/netfilter/nf_conntrack_common.h      |    4 +
 include/linux/netfilter/nfnetlink_log.h            |    1 +
 include/linux/netfilter/xt_CHECKSUM.h              |   20 +
 include/linux/netfilter/xt_IDLETIMER.h             |   45 +
 include/linux/netfilter/xt_cpu.h                   |   11 +
 include/linux/netfilter/xt_ipvs.h                  |   27 +
 include/linux/netfilter/xt_quota.h                 |    2 +-
 include/linux/netfilter_ipv4/ipt_LOG.h             |    3 +-
 include/linux/netfilter_ipv6/ip6t_LOG.h            |    3 +-
 include/linux/netpoll.h                            |   24 +-
 include/linux/nl80211.h                            |   24 +-
 include/linux/notifier.h                           |    1 +
 include/linux/pci_ids.h                            |    6 +-
 include/linux/phonet.h                             |    4 +-
 include/linux/phy.h                                |   24 +-
 include/linux/ptp_classify.h                       |  126 +
 include/linux/rds.h                                |   12 +-
 include/linux/rtnetlink.h                          |    1 +
 include/linux/sctp.h                               |   80 +-
 include/linux/skbuff.h                             |   70 +-
 include/linux/snmp.h                               |    1 +
 include/linux/socket.h                             |    5 +
 include/linux/ssb/ssb.h                            |  159 +-
 include/linux/u64_stats_sync.h                     |  140 +
 include/linux/user_namespace.h                     |   14 +
 include/linux/wlp.h                                |   22 +-
 include/net/act_api.h                              |    2 +
 include/net/af_unix.h                              |    4 +-
 include/net/bluetooth/bluetooth.h                  |    3 +-
 include/net/bluetooth/hci.h                        |  187 +-
 include/net/bluetooth/hci_core.h                   |   30 +-
 include/net/bluetooth/l2cap.h                      |   34 +-
 include/net/bluetooth/rfcomm.h                     |   14 +-
 include/net/caif/caif_dev.h                        |    8 +-
 include/net/caif/caif_layer.h                      |    6 -
 include/net/caif/caif_spi.h                        |  153 +
 include/net/caif/cfcnfg.h                          |   16 +-
 include/net/caif/cfsrvl.h                          |   15 +-
 include/net/cfg80211.h                             |  221 +-
 include/net/dn_dev.h                               |    8 +-
 include/net/dn_nsp.h                               |   16 +-
 include/net/dn_route.h                             |    4 +-
 include/net/genetlink.h                            |   15 +-
 include/net/inet_common.h                          |   59 +-
 include/net/inet_frag.h                            |    1 +
 include/net/inet_sock.h                            |    3 +-
 include/net/inetpeer.h                             |   30 +-
 include/net/ip.h                                   |   29 +-
 include/net/ip6_fib.h                              |   10 +-
 include/net/ip6_tunnel.h                           |    2 +-
 include/net/ip_vs.h                                |   14 +-
 include/net/ipip.h                                 |    2 +-
 include/net/ipv6.h                                 |   16 +-
 include/net/ipx.h                                  |    8 +-
 include/net/irda/irda.h                            |    4 -
 include/net/irda/irlap_frame.h                     |   18 +-
 include/net/lib80211.h                             |    3 -
 include/net/mac80211.h                             |  145 +-
 include/net/mip6.h                                 |    2 +-
 include/net/ndisc.h                                |    2 +-
 include/net/neighbour.h                            |    2 +-
 include/net/netfilter/nf_conntrack.h               |   17 +-
 include/net/netfilter/nf_conntrack_acct.h          |   12 +
 include/net/netfilter/nf_conntrack_core.h          |    2 +-
 include/net/netfilter/nf_conntrack_extend.h        |    9 +-
 include/net/netfilter/nf_nat_protocol.h            |    8 +-
 include/net/netfilter/nf_nat_rule.h                |    2 -
 include/net/netfilter/nfnetlink_log.h              |    2 +
 include/net/netfilter/xt_rateest.h                 |   11 +-
 include/net/netlink.h                              |    2 +-
 include/net/phonet/pn_dev.h                        |    1 +
 include/net/pkt_sched.h                            |    2 +-
 include/net/regulatory.h                           |    1 -
 include/net/route.h                                |    6 +-
 include/net/sch_generic.h                          |   38 +-
 include/net/scm.h                                  |   30 +-
 include/net/sctp/structs.h                         |    4 +-
 include/net/snmp.h                                 |   75 +-
 include/net/sock.h                                 |   14 +-
 include/net/tcp.h                                  |  260 +-
 include/net/udp.h                                  |   38 +-
 include/rxrpc/packet.h                             |    8 +-
 kernel/audit.c                                     |    2 +-
 kernel/cgroup.c                                    |   23 +
 kernel/user_namespace.c                            |   44 +
 lib/vsprintf.c                                     |    9 +
 net/8021q/vlan.c                                   |   13 +-
 net/8021q/vlan.h                                   |   13 +-
 net/8021q/vlan_core.c                              |   26 +-
 net/8021q/vlan_dev.c                               |  161 +-
 net/8021q/vlanproc.c                               |   16 +-
 net/9p/trans_fd.c                                  |    2 +-
 net/Kconfig                                        |   12 +-
 net/Makefile                                       |    4 +-
 net/atm/br2684.c                                   |   66 +-
 net/atm/clip.c                                     |    2 +-
 net/atm/common.c                                   |   30 +
 net/bluetooth/Kconfig                              |   13 -
 net/bluetooth/bnep/bnep.h                          |    8 +-
 net/bluetooth/hci_conn.c                           |   34 +-
 net/bluetooth/hci_core.c                           |  204 +-
 net/bluetooth/hci_event.c                          |   39 +-
 net/bluetooth/hci_sock.c                           |   90 +
 net/bluetooth/hci_sysfs.c                          |   38 +
 net/bluetooth/l2cap.c                              |  669 +-
 net/bluetooth/rfcomm/sock.c                        |    2 +-
 net/bluetooth/rfcomm/tty.c                         |    4 +-
 net/bridge/br.c                                    |    2 -
 net/bridge/br_device.c                             |  142 +-
 net/bridge/br_fdb.c                                |    6 +-
 net/bridge/br_forward.c                            |   11 +
 net/bridge/br_if.c                                 |   33 +-
 net/bridge/br_input.c                              |   24 +-
 net/bridge/br_multicast.c                          |   11 +-
 net/bridge/br_netfilter.c                          |   60 +-
 net/bridge/br_netlink.c                            |    9 +-
 net/bridge/br_notify.c                             |    5 +-
 net/bridge/br_private.h                            |   67 +-
 net/bridge/br_stp_bpdu.c                           |    7 +-
 net/bridge/br_sysfs_br.c                           |   72 +
 net/bridge/netfilter/ebt_redirect.c                |    3 +-
 net/bridge/netfilter/ebt_ulog.c                    |    8 +-
 net/bridge/netfilter/ebtables.c                    |   11 +-
 net/caif/Kconfig                                   |    7 +-
 net/caif/Makefile                                  |   14 +-
 net/caif/caif_config_util.c                        |    5 +
 net/caif/caif_dev.c                                |   12 +-
 net/caif/caif_socket.c                             |   61 +-
 net/caif/cfcnfg.c                                  |   54 +-
 net/caif/cfctrl.c                                  |    8 +-
 net/caif/cfdbgl.c                                  |    2 +-
 net/caif/cfdgml.c                                  |    7 +-
 net/caif/cfpkt_skbuff.c                            |    5 +-
 net/caif/cfrfml.c                                  |  318 +-
 net/caif/cfserl.c                                  |    7 +-
 net/caif/cfsrvl.c                                  |   26 +-
 net/caif/cfutill.c                                 |    8 +-
 net/caif/cfveil.c                                  |    7 +-
 net/caif/cfvidl.c                                  |    2 +-
 net/caif/chnl_net.c                                |   67 +-
 net/can/raw.c                                      |   15 +-
 net/compat.c                                       |   53 +-
 net/core/Makefile                                  |    2 +-
 net/core/datagram.c                                |    8 +-
 net/core/dev.c                                     |  387 +-
 net/core/drop_monitor.c                            |   33 +-
 net/core/dst.c                                     |    2 +-
 net/core/ethtool.c                                 |  108 +-
 net/core/filter.c                                  |  212 +-
 net/core/flow.c                                    |    9 +-
 net/core/gen_estimator.c                           |    1 +
 net/core/gen_stats.c                               |   14 +-
 net/core/iovec.c                                   |    9 +-
 net/core/link_watch.c                              |    1 -
 net/core/net-sysfs.c                               |   19 +-
 net/core/netevent.c                                |    5 +-
 net/core/netpoll.c                                 |  182 +-
 net/core/pktgen.c                                  |  212 +-
 net/core/rtnetlink.c                               |   11 +-
 net/core/scm.c                                     |   33 +-
 net/core/skbuff.c                                  |    3 +-
 net/core/sock.c                                    |   49 +-
 net/core/stream.c                                  |    6 -
 net/core/timestamping.c                            |  126 +
 net/core/utils.c                                   |    3 -
 net/dccp/ackvec.c                                  |    4 +-
 net/dccp/ccids/ccid3.c                             |    4 +-
 net/dccp/dccp.h                                    |   12 +-
 net/dccp/input.c                                   |   13 +-
 net/dccp/ipv4.c                                    |    4 +-
 net/dccp/ipv6.c                                    |   30 +-
 net/dccp/options.c                                 |   20 +-
 net/dccp/proto.c                                   |   14 +-
 net/decnet/dn_route.c                              |  158 +-
 net/dsa/slave.c                                    |    3 +-
 net/econet/af_econet.c                             |   27 +-
 net/ethernet/eth.c                                 |    5 +-
 net/ethernet/pe2.c                                 |    3 +-
 net/ipv4/af_inet.c                                 |   84 +-
 net/ipv4/arp.c                                     |   51 +-
 net/ipv4/datagram.c                                |    4 +-
 net/ipv4/devinet.c                                 |    1 +
 net/ipv4/fib_frontend.c                            |   13 +-
 net/ipv4/icmp.c                                    |   37 +-
 net/ipv4/igmp.c                                    |   32 +-
 net/ipv4/inet_connection_sock.c                    |   21 +-
 net/ipv4/inet_fragment.c                           |    1 -
 net/ipv4/inet_hashtables.c                         |    4 -
 net/ipv4/inetpeer.c                                |  244 +-
 net/ipv4/ip_forward.c                              |   10 +-
 net/ipv4/ip_fragment.c                             |   27 +-
 net/ipv4/ip_gre.c                                  |   16 +-
 net/ipv4/ip_input.c                                |   26 +-
 net/ipv4/ip_output.c                               |   78 +-
 net/ipv4/ip_sockglue.c                             |   45 +-
 net/ipv4/ipconfig.c                                |    7 +
 net/ipv4/ipip.c                                    |    8 +-
 net/ipv4/ipmr.c                                    |    8 +-
 net/ipv4/netfilter.c                               |   12 +-
 net/ipv4/netfilter/arp_tables.c                    |   22 +-
 net/ipv4/netfilter/ip_queue.c                      |   57 +-
 net/ipv4/netfilter/ip_tables.c                     |   16 +-
 net/ipv4/netfilter/ipt_CLUSTERIP.c                 |   50 +-
 net/ipv4/netfilter/ipt_LOG.c                       |   54 +-
 net/ipv4/netfilter/ipt_NETMAP.c                    |    6 +-
 net/ipv4/netfilter/ipt_REJECT.c                    |   12 +-
 net/ipv4/netfilter/nf_defrag_ipv4.c                |    5 +
 net/ipv4/netfilter/nf_nat_core.c                   |   29 +-
 net/ipv4/netfilter/nf_nat_proto_common.c           |   12 +-
 net/ipv4/netfilter/nf_nat_proto_dccp.c             |    6 +-
 net/ipv4/netfilter/nf_nat_proto_gre.c              |   12 +-
 net/ipv4/netfilter/nf_nat_proto_icmp.c             |   10 +-
 net/ipv4/netfilter/nf_nat_proto_sctp.c             |    6 +-
 net/ipv4/netfilter/nf_nat_proto_tcp.c              |    5 +-
 net/ipv4/netfilter/nf_nat_proto_udp.c              |    5 +-
 net/ipv4/netfilter/nf_nat_proto_udplite.c          |    6 +-
 net/ipv4/netfilter/nf_nat_proto_unknown.c          |    4 +-
 net/ipv4/netfilter/nf_nat_rule.c                   |   10 +-
 net/ipv4/netfilter/nf_nat_standalone.c             |   10 +-
 net/ipv4/proc.c                                    |   16 +-
 net/ipv4/protocol.c                                |    3 +-
 net/ipv4/raw.c                                     |   22 +-
 net/ipv4/route.c                                   |  518 +-
 net/ipv4/syncookies.c                              |  105 +-
 net/ipv4/tcp.c                                     |   78 +-
 net/ipv4/tcp_input.c                               |   20 +-
 net/ipv4/tcp_ipv4.c                                |  175 +-
 net/ipv4/tcp_minisocks.c                           |    9 +-
 net/ipv4/tcp_output.c                              |   77 +-
 net/ipv4/tcp_timer.c                               |    1 -
 net/ipv4/tunnel4.c                                 |    2 -
 net/ipv4/udp.c                                     |    4 +-
 net/ipv4/udplite.c                                 |    3 +-
 net/ipv4/xfrm4_input.c                             |    1 -
 net/ipv4/xfrm4_policy.c                            |    2 +-
 net/ipv6/addrconf.c                                |   53 +-
 net/ipv6/addrlabel.c                               |    6 +-
 net/ipv6/af_inet6.c                                |   32 +-
 net/ipv6/anycast.c                                 |   96 +-
 net/ipv6/datagram.c                                |   18 +-
 net/ipv6/exthdrs.c                                 |   34 +-
 net/ipv6/fib6_rules.c                              |   10 +-
 net/ipv6/inet6_connection_sock.c                   |    9 +-
 net/ipv6/ip6_fib.c                                 |   30 +-
 net/ipv6/ip6_output.c                              |   38 +-
 net/ipv6/ip6_tunnel.c                              |    8 +-
 net/ipv6/ipv6_sockglue.c                           |    2 -
 net/ipv6/mcast.c                                   |  190 +-
 net/ipv6/ndisc.c                                   |    8 +-
 net/ipv6/netfilter.c                               |    4 +-
 net/ipv6/netfilter/ip6_queue.c                     |   57 +-
 net/ipv6/netfilter/ip6_tables.c                    |   21 +-
 net/ipv6/netfilter/ip6t_LOG.c                      |   81 +-
 net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c     |    2 +-
 net/ipv6/netfilter/nf_conntrack_reasm.c            |   18 +-
 net/ipv6/proc.c                                    |   17 +-
 net/ipv6/raw.c                                     |   32 +-
 net/ipv6/reassembly.c                              |   21 +-
 net/ipv6/route.c                                   |  319 +-
 net/ipv6/sit.c                                     |   16 +-
 net/ipv6/syncookies.c                              |   58 +-
 net/ipv6/tcp_ipv6.c                                |   47 +-
 net/ipv6/udp.c                                     |   11 +-
 net/irda/irnet/irnet_ppp.c                         |   10 +-
 net/irda/irttp.c                                   |   14 +-
 net/iucv/iucv.c                                    |   14 +-
 net/l2tp/l2tp_ip.c                                 |    6 +-
 net/mac80211/Kconfig                               |    8 +
 net/mac80211/Makefile                              |    4 +
 net/mac80211/agg-rx.c                              |  123 +-
 net/mac80211/agg-tx.c                              |  554 +-
 net/mac80211/cfg.c                                 |  124 +-
 net/mac80211/debugfs.c                             |  154 +-
 net/mac80211/debugfs_key.c                         |    2 +-
 net/mac80211/debugfs_sta.c                         |   65 +-
 net/mac80211/driver-ops.h                          |  102 +-
 net/mac80211/driver-trace.h                        |  210 +-
 net/mac80211/ht.c                                  |   52 +-
 net/mac80211/ibss.c                                |  171 +-
 net/mac80211/ieee80211_i.h                         |   81 +-
 net/mac80211/iface.c                               |  190 +-
 net/mac80211/key.c                                 |  295 +-
 net/mac80211/key.h                                 |   33 +-
 net/mac80211/main.c                                |  124 +-
 net/mac80211/mesh.c                                |   73 +-
 net/mac80211/mesh.h                                |    2 -
 net/mac80211/mesh_hwmp.c                           |    4 +-
 net/mac80211/mesh_pathtbl.c                        |    4 +-
 net/mac80211/mesh_plink.c                          |   42 +-
 net/mac80211/mlme.c                                |  284 +-
 net/mac80211/pm.c                                  |   18 +-
 net/mac80211/rate.h                                |   13 +
 net/mac80211/rc80211_minstrel.c                    |    1 -
 net/mac80211/rc80211_minstrel_ht.c                 |  827 ++
 net/mac80211/rc80211_minstrel_ht.h                 |  130 +
 net/mac80211/rc80211_minstrel_ht_debugfs.c         |  118 +
 net/mac80211/rx.c                                  |  195 +-
 net/mac80211/scan.c                                |    6 +-
 net/mac80211/sta_info.c                            |   24 +-
 net/mac80211/sta_info.h                            |  113 +-
 net/mac80211/status.c                              |    6 +-
 net/mac80211/tkip.c                                |    8 +-
 net/mac80211/tkip.h                                |    2 +-
 net/mac80211/tx.c                                  |  112 +-
 net/mac80211/util.c                                |   42 +-
 net/mac80211/wep.c                                 |   29 +-
 net/mac80211/wep.h                                 |    2 +-
 net/mac80211/work.c                                |   45 +-
 net/mac80211/wpa.c                                 |   13 +-
 net/netfilter/Kconfig                              |   71 +-
 net/netfilter/Makefile                             |    4 +
 net/netfilter/ipvs/Kconfig                         |   11 +-
 net/netfilter/ipvs/ip_vs_app.c                     |   43 -
 net/netfilter/ipvs/ip_vs_conn.c                    |   55 +-
 net/netfilter/ipvs/ip_vs_core.c                    |   57 +-
 net/netfilter/ipvs/ip_vs_ctl.c                     |   10 +-
 net/netfilter/ipvs/ip_vs_ftp.c                     |  176 +-
 net/netfilter/ipvs/ip_vs_proto.c                   |    1 +
 net/netfilter/ipvs/ip_vs_proto_sctp.c              |   55 +-
 net/netfilter/ipvs/ip_vs_proto_tcp.c               |   50 +-
 net/netfilter/ipvs/ip_vs_proto_udp.c               |   56 +-
 net/netfilter/ipvs/ip_vs_xmit.c                    |  115 +-
 net/netfilter/nf_conntrack_acct.c                  |   14 +-
 net/netfilter/nf_conntrack_core.c                  |   49 +-
 net/netfilter/nf_conntrack_extend.c                |   22 +-
 net/netfilter/nf_conntrack_h323_main.c             |   12 +-
 net/netfilter/nf_conntrack_netbios_ns.c            |    2 +-
 net/netfilter/nf_conntrack_netlink.c               |    2 +-
 net/netfilter/nf_conntrack_proto_tcp.c             |   42 +-
 net/netfilter/nfnetlink_log.c                      |   73 +-
 net/netfilter/nfnetlink_queue.c                    |   39 +-
 net/netfilter/xt_CHECKSUM.c                        |   70 +
 net/netfilter/xt_CT.c                              |    4 +-
 net/netfilter/xt_IDLETIMER.c                       |  315 +
 net/netfilter/xt_NOTRACK.c                         |    2 +-
 net/netfilter/xt_RATEEST.c                         |   12 +-
 net/netfilter/xt_TCPMSS.c                          |    8 +-
 net/netfilter/xt_TEE.c                             |    8 +-
 net/netfilter/xt_TPROXY.c                          |    6 +-
 net/netfilter/xt_cluster.c                         |    2 +-
 net/netfilter/xt_connbytes.c                       |   10 +
 net/netfilter/xt_conntrack.c                       |   11 +-
 net/netfilter/xt_cpu.c                             |   63 +
 net/netfilter/xt_ipvs.c                            |  189 +
 net/netfilter/xt_quota.c                           |   12 +-
 net/netfilter/xt_sctp.c                            |    3 +-
 net/netfilter/xt_socket.c                          |    2 +-
 net/netfilter/xt_state.c                           |   14 +-
 net/netfilter/xt_statistic.c                       |   19 +-
 net/netlink/af_netlink.c                           |   42 +-
 net/netlink/genetlink.c                            |   15 +-
 net/packet/af_packet.c                             |   37 +-
 net/phonet/pn_dev.c                                |   15 +-
 net/rose/rose_route.c                              |    4 +-
 net/rxrpc/ar-peer.c                                |    4 +-
 net/sched/act_api.c                                |   11 +-
 net/sched/act_mirred.c                             |   12 +-
 net/sched/act_nat.c                                |   34 +-
 net/sched/act_pedit.c                              |    3 +-
 net/sched/act_police.c                             |   12 +-
 net/sched/act_simple.c                             |    4 +-
 net/sched/cls_u32.c                                |    6 +-
 net/sched/sch_atm.c                                |   98 +-
 net/sched/sch_generic.c                            |   25 +-
 net/sched/sch_htb.c                                |    2 -
 net/sctp/protocol.c                                |    7 +-
 net/sctp/sm_make_chunk.c                           |    2 +-
 net/socket.c                                       |  177 +-
 net/unix/af_unix.c                                 |   99 +-
 net/wanrouter/wanmain.c                            |    7 +-
 net/wanrouter/wanproc.c                            |    7 +-
 net/wireless/chan.c                                |    5 +-
 net/wireless/core.c                                |   65 +-
 net/wireless/core.h                                |    1 +
 net/wireless/genregdb.awk                          |    1 +
 net/wireless/ibss.c                                |    4 +-
 net/wireless/lib80211_crypt_ccmp.c                 |    1 -
 net/wireless/lib80211_crypt_tkip.c                 |    3 +-
 net/wireless/lib80211_crypt_wep.c                  |    1 -
 net/wireless/mlme.c                                |   16 +-
 net/wireless/nl80211.c                             |   93 +-
 net/wireless/reg.c                                 |  668 +-
 net/wireless/reg.h                                 |    2 +-
 net/wireless/scan.c                                |    5 +
 net/wireless/sme.c                                 |    2 +-
 net/wireless/util.c                                |    4 +-
 net/wireless/wext-compat.c                         |   11 +-
 net/xfrm/xfrm_policy.c                             |    3 +-
 1178 files changed, 79952 insertions(+), 58814 deletions(-)
 create mode 100644 Documentation/networking/caif/spi_porting.txt
 create mode 100644 drivers/bluetooth/hci_ath.c
 create mode 100644 drivers/net/bnx2x/Makefile
 rename drivers/net/{ => bnx2x}/bnx2x.h (84%)
 create mode 100644 drivers/net/bnx2x/bnx2x_cmn.c
 create mode 100644 drivers/net/bnx2x/bnx2x_cmn.h
 rename drivers/net/{ => bnx2x}/bnx2x_dump.h (100%)
 create mode 100644 drivers/net/bnx2x/bnx2x_ethtool.c
 rename drivers/net/{ => bnx2x}/bnx2x_fw_defs.h (100%)
 rename drivers/net/{ => bnx2x}/bnx2x_fw_file_hdr.h (100%)
 rename drivers/net/{ => bnx2x}/bnx2x_hsi.h (100%)
 rename drivers/net/{ => bnx2x}/bnx2x_init.h (100%)
 rename drivers/net/{ => bnx2x}/bnx2x_init_ops.h (100%)
 rename drivers/net/{ => bnx2x}/bnx2x_link.c (99%)
 rename drivers/net/{ => bnx2x}/bnx2x_link.h (100%)
 create mode 100644 drivers/net/bnx2x/bnx2x_main.c
 rename drivers/net/{ => bnx2x}/bnx2x_reg.h (100%)
 create mode 100644 drivers/net/bnx2x/bnx2x_stats.c
 create mode 100644 drivers/net/bnx2x/bnx2x_stats.h
 delete mode 100644 drivers/net/bnx2x_main.c
 create mode 100644 drivers/net/caif/caif_spi.c
 create mode 100644 drivers/net/caif/caif_spi_slave.c
 create mode 100644 drivers/net/can/flexcan.c
 create mode 100644 drivers/net/can/usb/esd_usb2.c
 create mode 100644 drivers/net/cxgb4vf/Makefile
 create mode 100644 drivers/net/cxgb4vf/adapter.h
 create mode 100644 drivers/net/cxgb4vf/cxgb4vf_main.c
 create mode 100644 drivers/net/cxgb4vf/sge.c
 create mode 100644 drivers/net/cxgb4vf/t4vf_common.h
 create mode 100644 drivers/net/cxgb4vf/t4vf_defs.h
 create mode 100644 drivers/net/cxgb4vf/t4vf_hw.c
 create mode 100644 drivers/net/wireless/ath/ath5k/sysfs.c
 copy drivers/net/wireless/ath/ath9k/{ar9003_initvals.h => ar9003_2p0_initvals.h} (87%)
 rename drivers/net/wireless/ath/ath9k/{ar9003_initvals.h => ar9003_2p2_initvals.h} (78%)
 create mode 100644 drivers/net/wireless/ath/ath9k/ar9003_paprd.c
 rename drivers/net/wireless/iwlwifi/{iwl-calib.c => iwl-agn-calib.c} (83%)
 create mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-rx.c
 delete mode 100644 drivers/net/wireless/libertas/assoc.c
 delete mode 100644 drivers/net/wireless/libertas/assoc.h
 delete mode 100644 drivers/net/wireless/libertas/scan.c
 delete mode 100644 drivers/net/wireless/libertas/scan.h
 delete mode 100644 drivers/net/wireless/libertas/wext.c
 delete mode 100644 drivers/net/wireless/libertas/wext.h
 create mode 100644 drivers/net/wireless/wl12xx/wl1271_ini.h
 create mode 100644 drivers/net/wireless/wl12xx/wl1271_scan.c
 create mode 100644 drivers/net/wireless/wl12xx/wl1271_scan.h
 create mode 100644 firmware/cxgb3/t3fw-7.10.0.bin.ihex
 delete mode 100644 firmware/cxgb3/t3fw-7.4.0.bin.ihex
 create mode 100644 include/linux/can/platform/flexcan.h
 create mode 100644 include/linux/netfilter/xt_CHECKSUM.h
 create mode 100644 include/linux/netfilter/xt_IDLETIMER.h
 create mode 100644 include/linux/netfilter/xt_cpu.h
 create mode 100644 include/linux/netfilter/xt_ipvs.h
 create mode 100644 include/linux/ptp_classify.h
 create mode 100644 include/linux/u64_stats_sync.h
 create mode 100644 include/net/caif/caif_spi.h
 create mode 100644 net/core/timestamping.c
 create mode 100644 net/mac80211/rc80211_minstrel_ht.c
 create mode 100644 net/mac80211/rc80211_minstrel_ht.h
 create mode 100644 net/mac80211/rc80211_minstrel_ht_debugfs.c
 create mode 100644 net/netfilter/xt_CHECKSUM.c
 create mode 100644 net/netfilter/xt_IDLETIMER.c
 create mode 100644 net/netfilter/xt_cpu.c
 create mode 100644 net/netfilter/xt_ipvs.c

^ permalink raw reply	[flat|nested] 1437+ messages in thread
* [GIT] Networking
@ 2010-08-28 22:23 David Miller
  0 siblings, 0 replies; 1437+ messages in thread
From: David Miller @ 2010-08-28 22:23 UTC (permalink / raw)
  To: torvalds; +Cc: akpm, netdev, linux-kernel


1) Anton Blanchard discovered two flaws in how we handle TCP orphan
   overflows.

   First, since the orphan overflow check uses the weak percpu_counter
   read percpu_counter_read_positive(), it can be off by as much as
   the percpu batch factor (default of 32) and the number of online
   cpus (128 in his case).  This total is 4096 which as it turns out
   is also the default orphan limit for his memory configuration :-)

   Fix this by doing the accurate, but more expensive
   percpu_counter_sum_positive(), check if the weak and potentially
   inaccurate one triggers.

   Next, he and Eric Dumazet noticed that the orphan and two other
   sysctl limits were bogusly calculated.  It had a 4096 constant in
   there (meant to be PAGE_SIZE) and furthermore it used the total
   size of a hash table (which is variable based upon lock debugging
   options etc.) instead of something more meaningful and consistent
   such as the number of hash slots.  Fix written by Eric Dumazet
   based work by Anton and myself.

2) AX25 drops socket reference too early, from Bernard Pidoux.

3) pxa168_eth fixes from Dan Carpenter.  First, phy_mii_ioctl() args
   changed, but pxa168 was not updated.  Also error handling in driver
   probe was busted.

4) Memory leak fix in bridge netfilter from Changli Gao.

5) qlge needs to reset chip before we free up the buffers which the
   chip is potentially still DMA'ing to/from.  Fix from Breno Leitao.

6) If the send side of a socket is shutdown, TCP's poll should indicate
   all the write conditions since the next sendmsg() is going to
   return -EPIPE and the application is not always able to discern this
   case completely on it's own.

   This matches the behavior of BSD (see so_writable() macro definition)
   as well as pretty much every other system checked.

   Fix from KOSAKI Motohiro.

7) 3c59x using netpoll deadlocks, fix from Neil Horman.

8) TCP congestion control core has a kstrdup memory leak, fix from
   Julia Lawall.

9) CAIF protocol needs to use correct unaligned.h header, from Jeff
   Mahoney.

10) l2tp input needs to scrutinize available of ethernet header more
    strictly, since the 'data_len' passed into it comes from potentially
    untrusted sources.  Fix from Eric Dumazet.

Please pull, thanks a lot!

The following changes since commit 303fd2c2ce5addef1aacac962a5b099cc0af71ea:

  Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin (2010-08-28 14:24:49 -0700)

are available in the git repository at:

  master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git master

Anton Vorontsov (1):
      phylib: Fix race between returning phydev and calling adjust_link

Bernard Pidoux F6BVP (1):
      ax25: missplaced sock_put(sk)

Breno Leitao (1):
      qlge: reset the chip before freeing the buffers

Changli Gao (1):
      bridge: netfilter: fix a memory leak

Dan Carpenter (4):
      pxa168_eth: remove unneeded null check
      pxa168_eth: fix error handling in prope
      pxa168_eth: update call to phy_mii_ioctl()
      pxa168_eth: silence gcc warnings

David S. Miller (1):
      tcp: Combat per-cpu skew in orphan tests.

Eric Dumazet (2):
      tcp: fix three tcp sysctls tuning
      l2tp: test for ethernet header in l2tp_eth_dev_recv()

Heiko Carstens (1):
      caif-driver: add HAS_DMA dependency

Jeff Mahoney (1):
      net/caif/cfrfml.c: use asm/unaligned.h

Julia Lawall (1):
      net/ipv4: Eliminate kstrdup memory leak

KOSAKI Motohiro (1):
      tcp: select(writefds) don't hang up when a peer close connection

Neil Horman (1):
      3c59x: Fix deadlock between boomerang_interrupt and boomerang_start_tx

Yinglin Luan (2):
      netxen: fix poll implementation
      qlcnic: fix poll implementation

 drivers/net/3c59x.c                  |   15 ++++++++-
 drivers/net/caif/Kconfig             |    2 +-
 drivers/net/netxen/netxen_nic_main.c |    9 +++++-
 drivers/net/phy/phy_device.c         |    2 +
 drivers/net/pxa168_eth.c             |   58 ++++++++++++++++-----------------
 drivers/net/qlcnic/qlcnic_main.c     |    9 +++++-
 drivers/net/qlge/qlge_main.c         |    4 +-
 include/net/tcp.h                    |   18 ++++++++--
 net/ax25/ax25_ds_timer.c             |    2 +-
 net/bridge/br_netfilter.c            |    2 +-
 net/caif/cfrfml.c                    |    2 +-
 net/ipv4/tcp.c                       |   32 ++++++-------------
 net/ipv4/tcp_cong.c                  |    5 ++-
 net/ipv4/tcp_timer.c                 |    8 ++--
 net/l2tp/l2tp_eth.c                  |    2 +-
 15 files changed, 98 insertions(+), 72 deletions(-)

^ permalink raw reply	[flat|nested] 1437+ messages in thread
* [GIT] Networking
@ 2010-09-03 15:27 David Miller
  0 siblings, 0 replies; 1437+ messages in thread
From: David Miller @ 2010-09-03 15:27 UTC (permalink / raw)
  To: torvalds; +Cc: akpm, netdev, linux-kernel


1) Fix for IRDA OOPS'er reported by Tavis Ormandy.

2) NETLINK_USERSOCK unintentionally broken, make it work again.

3) kthread_stop() OOPS'er fix in vhost by Eric Dumazet.

4) act_police leaks kernel mem, fix from Jeff Mahoney.

5) mdiobus leak in pxa168 driver, from Denis Kirjanov.

6) Kill double ";" to rectify compiler warning, from Nicolas Dichtel.

7) Kconfig help for rp_filter is wrong, fix from Nicolas Dichtel.

8) Fix MII locking in 3c59x driver, from Ben Hutchings.

9) bridge calls ip_fragment() with garbage INET SKB control block,
   just zero it out like we do elsewhere in bridging.

10) Fix crashes in GRO when packets are merged with different headroom
    amounts.  The problem is that in this case the ->csum_start
    packet offset is not adjusted correctly.  Later on we crash trying
    to fixup the checksum at an out-of-range offset.

    From Eric Dumazet.  Special thanks to Plamen Petrov for testing
    various debugging patches to help us track this down.

11) Fix est_tree_lock locking in generic estimator, it must use BH
    protection.  From Jarek Poplawski.

12) Add new PCNET_CS device ID, from Ken Kawasaki.

13) HFSC packet scheduler fix from Michal Soltys, cfmin of parent must
    be updated unconditionally in init_vf().

14) Fix DMA mis-alignment problems in libertas on some platforms,
    from Mike Rapoport.

15) ieee80211_get_tx_rate() return not checked properly in ath5k_txbuf_setup
    leading to OOPS, from John Linville.

16) Two ath9k fixes from Luis R. Rodriguez.  Fix EEPROM reading, and fix
    parsing of 5GHz CTL indexes.

17) Fix TX status flag bit check in p54, fixes power save.
    From Christian Lamparter.

18) mac80211 workqueue timer deletion fix from Johannes Berg.

19) Kernel memory leak fix in wireless extensions, also from Johannes.

20) Circular locking fix in wiphy_register(), from John W. Linville.

21) IPVS passive ftp crash fix from Julian Anastasov.

Please pull, thanks a lot!

The following changes since commit 2bfc96a127bc1cc94d26bfaa40159966064f9c8c:

  Linux 2.6.36-rc3 (2010-08-29 08:36:04 -0700)

are available in the git repository at:
  master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git master

Ben Hutchings (1):
      3c59x: Remove incorrect locking; correct documented lock hierarchy

Breno Leitao (1):
      MAINTAINERS: Add ehea driver as Supported

Christian Lamparter (1):
      p54: fix tx feedback status flag check

David S. Miller (5):
      irda: Correctly clean up self->ias_obj on irda_bind() failure.
      netlink: Make NETLINK_USERSOCK work again.
      Merge branch 'master' of git://git.kernel.org/.../linville/wireless-2.6
      bridge: Clear INET control block of SKBs passed into ip_fragment().
      Revert "sky2: don't do GRO on second port"

Denis Kirjanov (1):
      pxa168_eth: fix a mdiobus leak

Eric Dumazet (2):
      vhost: stop worker only if created
      gro: fix different skb headrooms

Jarek Poplawski (1):
      pkt_sched: Fix lockdep warning on est_tree_lock in gen_estimator

Jeff Mahoney (1):
      net sched: fix kernel leak in act_police

Johannes Berg (2):
      mac80211: delete work timer
      wireless extensions: fix kernel heap content leak

John W. Linville (3):
      ath5k: check return value of ieee80211_get_tx_rate
      MAINTAINERS: change broken url for prism54
      wireless: register wiphy rfkill w/o holding cfg80211_mutex

Julian Anastasov (1):
      ipvs: avoid oops for passive FTP

Ken Kawasaki (1):
      pcnet_cs: add new_id

Luis R. Rodriguez (2):
      ath9k_hw: Fix EEPROM uncompress block reading on AR9003
      ath9k_hw: fix parsing of HT40 5 GHz CTLs

Michal Soltys (1):
      net/sched/sch_hfsc.c: initialize parent's cl_cfmin properly in init_vf()

Mike Rapoport (1):
      libertas: if_sdio: fix buffer alignment in struct if_sdio_card

Nicolas Dichtel (2):
      xfrm_user: avoid a warning with some compiler
      ipv4: minor fix about RPF in help of Kconfig

stephen hemminger (1):
      sky2: don't do GRO on second port

 MAINTAINERS                                    |    8 +++++++-
 drivers/net/3c59x.c                            |    5 +----
 drivers/net/pcmcia/pcnet_cs.c                  |    1 +
 drivers/net/pxa168_eth.c                       |    2 ++
 drivers/net/wireless/ath/ath5k/base.c          |    4 ++++
 drivers/net/wireless/ath/ath9k/ar9003_eeprom.c |    2 +-
 drivers/net/wireless/ath/ath9k/eeprom.h        |    2 +-
 drivers/net/wireless/ath/regd.h                |    1 -
 drivers/net/wireless/libertas/if_sdio.c        |    2 +-
 drivers/net/wireless/p54/txrx.c                |    2 +-
 drivers/vhost/vhost.c                          |    5 ++++-
 net/bridge/br_netfilter.c                      |    6 ++++--
 net/core/gen_estimator.c                       |   12 ++++++------
 net/core/skbuff.c                              |    8 ++++++--
 net/ipv4/Kconfig                               |    2 +-
 net/irda/af_irda.c                             |    4 ++--
 net/mac80211/main.c                            |    6 ++++++
 net/netfilter/ipvs/ip_vs_ftp.c                 |    3 ++-
 net/netlink/af_netlink.c                       |   22 ++++++++++++++++++++++
 net/sched/act_police.c                         |   21 +++++++++------------
 net/sched/sch_hfsc.c                           |    2 +-
 net/wireless/core.c                            |   21 ++++++++++++---------
 net/wireless/wext-compat.c                     |    3 +++
 net/wireless/wext-core.c                       |   16 ++++++++++++++++
 net/xfrm/xfrm_user.c                           |    2 +-
 25 files changed, 114 insertions(+), 48 deletions(-)

^ permalink raw reply	[flat|nested] 1437+ messages in thread
* [GIT] Networking
@ 2010-09-11  4:26 David Miller
  0 siblings, 0 replies; 1437+ messages in thread
From: David Miller @ 2010-09-11  4:26 UTC (permalink / raw)
  To: torvalds; +Cc: akpm, netdev, linux-kernel


Some fixes for regressions added this merge window in here, but some
fixes are for some even older regressions too :-/

1) Fine grained MII locking regression fix in 3c59x driver from
   Ben Hutchings.

2) Off by one in NULL termination in IRDA stack.  Fix from Dan
   Carpenter.

3) Exhausting bind naming space in AF_UNIX can make unix_autobind()
   loop forever.  Fix from Tetsuo Handa.

4) Multipath routing breaks reverse-patch filtering.  It would just
   assume a device match when multiple hops exist for a route, instead
   of properly walking the next-hops array to find a device match.

5) VIA velocity emits lots of DMA debug assertions, and attempts to fix
   those lead to functional regressions, so turn scatter-gather
   support back off by default until we can find a way to fix this
   properly.

   Thanks to Dave Jones for the report and patch testing.

6) Follow-up fix to Eric Dumazet's GRO packet merging adjustments to
   handle differing headroom amounts properly.  From Jarek Poplawski.
   Thanks to Plamen Patrov for the original crash report and seemingly
   endless help with testing.

7) Fix interactions between VHOST and control groups, from Michael S.
   Tsirkin.

8) be2net driver fixes from Ajit Khaparde, wrong stats bump on multicast,
   fix uncorrectable error detection, remove invalid BUG_ON() assertion.

9) stmmac sleeps while holding a spinlock, fix from Giuseppe Cavallaro,
   report by Jiri Slaby.

10) Jiffies overflows in bonding ARp load balancer, from Jiri Bohac.

11) When bridging, need to use device ->select_queue() override when
    present otherwise wireless devices fail, from Helmut Schaa.

12) In IPV6 overlapping fragments are now considered completely illegal,
    because they allow bypassing of firewall rules (ie. first frag has
    TCP header with flow information that's allowed, next flag overlaps
    and overwrites TCP header with attacker's desired ports).  From
    Nicolas Dichtel.

13) Get b44 fifo recovery down to 20msc from several seconds because it
    can happen frequently for users, from Mark Lord and James
    Courtier-Dutton.

14) Active FTP regression fix in IPVS from Julian Anastasov.

15) Potential buffer overflow in niu driver ethtool code, from
    Ben Hutchings.

16) FIB trie lockdep-RCU fixes from Jarek Poplawski.

17) Always relookup routes currently pointing to the blackhole rule,
    as these routes are temporary.  This fixes regressions in IPSEC.
    Fix from Jianzhao Wang.

18) Fix a UDP hashing regression added in 2.6.33, the secondary hash needs
    to be recalculated when the implicit local address change happens
    as a side effect of connect().  From Eric Dumazet.

19) KS8851 RX packet allocation can missize the buffer and allow
    memory corruption.  From Eric Dumazet and Abraham Arce.

20) SCTP address validation tests list_head iterater against NULL
    but that's not what such an iterator is set to when a
    list_for_each_entry() loop exits normally.  From Joe Perches
    and Dan Carpenter.

21) ipheth is marked as "wwan" net device type, but that is not correct.
    Fix from Dan Williams.

Please pull, thanks a lot!

The following changes since commit 3e6dce76d99b328716b43929b9195adfee1de00c:

  Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel (2010-09-10 18:19:43 -0700)

are available in the git repository at:

  master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git master

Ajit Khaparde (3):
      be2net: fix net-snmp error because of wrong packet stats
      be2net: fix a bug in UE detection logic
      be2net: remove a BUG_ON in be_cmds.c

Ben Hutchings (2):
      3c59x: Fix deadlock in vortex_error()
      niu: Fix kernel buffer overflow for ETHTOOL_GRXCLSRLALL

Dan Carpenter (1):
      irda: off by one

Dan Williams (1):
      ipheth: remove incorrect devtype to WWAN

David S. Miller (4):
      ipv4: Fix reverse path filtering with multipath routing.
      via-velocity: Turn scatter-gather support back off.
      Merge branch 'master' of master.kernel.org:/.../torvalds/linux-2.6
      Merge branch 'vhost-net' of git://git.kernel.org/.../mst/vhost

Eric Dumazet (2):
      udp: add rehash on connect()
      KS8851: Correct RX packet allocation

Giuseppe Cavallaro (1):
      stmmac: fix sleep inside atomic

Helmut Schaa (1):
      net: fix tx queue selection for bridged devices implementing select_queue

Jarek Poplawski (2):
      gro: Re-fix different skb headrooms
      ipv4: Suppress lockdep-RCU false positive in FIB trie (3)

Jianzhao Wang (1):
      net: blackhole route should always be recalculated

Jiri Bohac (1):
      bonding: Fix jiffies overflow problems (again)

Joe Perches (2):
      sctp: fix test for end of loop
      MAINTAINERS: Add CAIF

Julian Anastasov (1):
      ipvs: fix active FTP

Li Zefan (1):
      cls_cgroup: Fix rcu lockdep warning

Mark Lord (1):
      PATCH: b44 Handle RX FIFO overflow better (simplified)

Michael S. Tsirkin (3):
      cgroups: fix API thinko
      vhost: fix attach to cgroups regression
      vhost: error handling fix

Nicolas Dichtel (2):
      ipv6: discard overlapping fragment
      netfilter: discard overlapping IPv6 fragment

Tetsuo Handa (1):
      UNIX: Do not loop forever at unix_autobind().

 MAINTAINERS                             |   10 ++++
 drivers/net/3c59x.c                     |   10 +++-
 drivers/net/b44.c                       |    9 ++++
 drivers/net/benet/be.h                  |    1 +
 drivers/net/benet/be_cmds.c             |    8 +--
 drivers/net/benet/be_cmds.h             |    2 +-
 drivers/net/benet/be_ethtool.c          |    1 +
 drivers/net/benet/be_hw.h               |    7 ++-
 drivers/net/benet/be_main.c             |   47 +++++++-----------
 drivers/net/bonding/bond_main.c         |   56 +++++++++++++++-------
 drivers/net/ks8851.c                    |   39 ++++++++-------
 drivers/net/niu.c                       |   16 ++----
 drivers/net/stmmac/stmmac_main.c        |    9 ++--
 drivers/net/usb/ipheth.c                |    7 +--
 drivers/net/via-velocity.c              |    2 +-
 drivers/vhost/vhost.c                   |   80 ++++++++++++++++++++++--------
 include/linux/cgroup.h                  |   11 ++++-
 include/net/cls_cgroup.h                |   10 +++-
 include/net/ip_vs.h                     |    3 +
 include/net/sock.h                      |    1 +
 include/net/udp.h                       |    1 +
 kernel/cgroup.c                         |    9 ++--
 net/core/dev.c                          |   16 +++---
 net/core/skbuff.c                       |    2 +-
 net/ipv4/datagram.c                     |    5 ++-
 net/ipv4/fib_frontend.c                 |   15 +++++-
 net/ipv4/fib_trie.c                     |    8 ++-
 net/ipv4/route.c                        |    7 ++-
 net/ipv4/udp.c                          |   44 +++++++++++++++++
 net/ipv6/datagram.c                     |    7 ++-
 net/ipv6/netfilter/nf_conntrack_reasm.c |   80 ++++++-------------------------
 net/ipv6/reassembly.c                   |   71 ++++++---------------------
 net/ipv6/udp.c                          |   10 ++++
 net/irda/irlan/irlan_common.c           |    2 +-
 net/netfilter/ipvs/ip_vs_core.c         |    1 +
 net/netfilter/ipvs/ip_vs_ftp.c          |    6 --
 net/netfilter/ipvs/ip_vs_xmit.c         |   18 +++++--
 net/sctp/sm_statefuns.c                 |   46 +++++++++---------
 net/unix/af_unix.c                      |   15 +++++-
 39 files changed, 391 insertions(+), 301 deletions(-)

^ permalink raw reply	[flat|nested] 1437+ messages in thread
* [GIT] Networking
@ 2010-09-18  4:14 David Miller
  0 siblings, 0 replies; 1437+ messages in thread
From: David Miller @ 2010-09-18  4:14 UTC (permalink / raw)
  To: torvalds; +Cc: akpm, netdev, linux-kernel


1) A user reported that with 75 byte MSS and 75 byte advertised window
   (some strange embedded device), we packetize in TCP even when the
   full window is available.

   We do this as part of our SWS algorithm, and the logic makes sense
   when MSS is extremely large (say, 64K) but it doesn't have any
   value in this kind of case.

   So avoid the "bound by half of max window" logic when MSS is very
   small.

   Fix from Alexey N. Kuznetsov.

2) Non-linear SKBs are not handled properly by bonding.  From Andy
   Gospodarek.

3) LLC stores negative error codes in an unsinged short, and also
   has signed overflow issues in llc_ui_setsockopt().  From
   Dan Carpenter.

4) NULL deref in ppp_mp_explode(), also from Dan Carpenter.

5) Uninitialized memory reading fixes in USB/HSO, EQL, and
   CXGB3 network drivers.  All from Dan Rosenberg.

6) WOL handlers in 3c59x sleep in atomic, fix from Denis Kirjanov.

7) Fix NULL defer in sch_atm.

8) Add proper dependencies for CONFIG_RPS, otherwise architectures
   not using the generic SMP helpers won't build.

9) IP_NODEFRAG was mistakenly added with only a "setsockopt()"
   handler, add the trivial getsockopt() side.  From Michael Kerrisk.

10) PAL state machine missing an ops pointer validation on resume.
    From Simon Guinot.

11) Need to handle rxfifo errors on 8158 r8169 chips.  Fix by Matthew Garrett.

12) DCA needs to be disabled on some platforms, from Maciej Sosnowski.

13) SCTP remote oops from from Vlad Yasevich.

14) Fix RCU warnings in netpoll_rx(), from Herbert Xu.  More permanent
    long term cure coming from Paul E. McKenney.

15) Fix RCU locking in IPSEC output path, from Eric Dumazet.

Please pull, thanks a lot!

The following changes since commit 03a7ab083e4d619136d6f07ce70fa9de0bc436fc:

  Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 (2010-09-16 12:59:11 -0700)

are available in the git repository at:

  master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git master

Alexey Kuznetsov (1):
      tcp: Prevent overzealous packetization by SWS logic.

Andy Gospodarek (1):
      bonding: correctly process non-linear skbs

Bob Arendt (1):
      ipv4: force_igmp_version ignored when a IGMPv3 query received

Chris Snook (1):
      MAINTAINERS: move atlx discussions to netdev

Dan Carpenter (3):
      net/llc: make opt unsigned in llc_ui_setsockopt()
      ppp: potential NULL dereference in ppp_mp_explode()
      net/llc: storing negative error codes in unsigned short

Dan Rosenberg (3):
      drivers/net/usb/hso.c: prevent reading uninitialized memory
      drivers/net/eql.c: prevent reading uninitialized stack memory
      drivers/net/cxgb3/cxgb3_main.c: prevent reading uninitialized stack memory

David S. Miller (2):
      sch_atm: Fix potential NULL deref.
      net: RPS needs to depend upon USE_GENERIC_SMP_HELPERS

Denis Kirjanov (1):
      3c59x: Remove atomic context inside vortex_{set|get}_wol

Eric Dumazet (2):
      net: use rcu_barrier() in rollback_registered_many
      xfrm: dont assume rcu_read_lock in xfrm_output_one()

Herbert Xu (1):
      netpoll: Disable IRQ around RCU dereference in netpoll_rx

Matthew Garrett (1):
      r8169: Handle rxfifo errors on 8168 chips

Michael Kerrisk (1):
      ipv4: enable getsockopt() for IP_NODEFRAG

Simon Guinot (1):
      phylib: fix PAL state machine restart on resume

Sosnowski, Maciej (1):
      dca: disable dca on IOAT ver.3.0 multiple-IOH platforms

Vlad Yasevich (1):
      sctp: Do not reset the packet during sctp_packet_config().

 MAINTAINERS                    |    2 +-
 drivers/dca/dca-core.c         |   85 +++++++++++++++++++++++++++++++++++++---
 drivers/net/3c59x.c            |    7 +--
 drivers/net/bonding/bond_3ad.c |    3 +
 drivers/net/bonding/bond_alb.c |    3 +
 drivers/net/cxgb3/cxgb3_main.c |    2 +
 drivers/net/eql.c              |    2 +
 drivers/net/phy/mdio_bus.c     |    4 +-
 drivers/net/ppp_generic.c      |    9 +++-
 drivers/net/r8169.c            |    5 +-
 drivers/net/usb/hso.c          |    2 +
 include/linux/netpoll.h        |    8 ++--
 include/net/tcp.h              |   18 +++++++-
 net/Kconfig                    |    2 +-
 net/core/dev.c                 |    2 +-
 net/ipv4/igmp.c                |    2 +-
 net/ipv4/ip_sockglue.c         |    3 +
 net/llc/af_llc.c               |    3 +-
 net/llc/llc_station.c          |    2 +-
 net/sched/sch_atm.c            |    4 --
 net/sctp/output.c              |    1 -
 net/xfrm/xfrm_output.c         |    2 +-
 22 files changed, 136 insertions(+), 35 deletions(-)

^ permalink raw reply	[flat|nested] 1437+ messages in thread
* [GIT] Networking
@ 2010-09-28  7:22 David Miller
  0 siblings, 0 replies; 1437+ messages in thread
From: David Miller @ 2010-09-28  7:22 UTC (permalink / raw)
  To: torvalds; +Cc: akpm, netdev, linux-kernel


1) AF_ROSE digi count signedness fix

2) On 64-bit, send() with iov_len >= 4GB can fail on TCP.

3) qlcnic assumes NET_IP_ALIGN is 2, use the macro instead of assuming.
   From Eric Dumazet.

4) ip_gre needs to check both CONFIG_IPV6 and CONFIG_IPV6_MODULE,
   also from Eric.

5) qlcnic and netxen corrupt skb->truesize breaking socket level and
   system-wide net buffer memory accounting.  Also from Eric Dumazet.

6) IP fragmentation can corrupt skb->truesize resulting in corrupt
   socket memory accounting, and stuck sockets (since the memory
   charge goes negative).  From Eric Dumazet.

7) 3c59x WOL support added some regressions (assumes PCI, which not
   all 3c59x are, also tries to erroneously hit the card when in D3)
   Fix from Jan Beulich.

8) Memory leak in wext private ioctls, fix from Johannes Berg.

9) Fix ATM br2684 scheduling-while-atomic, was invoking atomic notifier
   chain unregister with locks held and irqs disabled, from Karl Hiramoto.

10) Fix drivers using kfree() on a netdev which is always wrong,	
    need to always use free_netdev().  From Kulikov Vasiliy and
    Vasiliy Kulikov.

11) Fix broken resume, and forgetting to clear CMB and SBM in ring
    release, in atl1 driver.  From Luca Tettamanti.

12) Missing unregister_pernet_subsys call in ipv6, from Neil Horman.

13) "struct net" needs __KERNEL__ guard, from Ollie Wild.

14) Several de2104x tulip link handling fixes from Ondrej Zary.

15) net/9p virtio code string comparison is busted, fix from Sven Eckelmann.

16) IPSEC xfrm code uses wrong address family sometimes, from Thomas Egerer.

17) Traversing a tunnel requires resetting the RX queue setting, since
    downstream device might have different number of queues.  From
    Tom Herbert.

18) Fix hopefully the last race in our lockless tcp_poll, from
    Tom Marshall.

19) ipv4 ipsec code erroneously include ECN bits in the TOS it uses,
    which will cause route failures since those bits have internal
    meaning in the ipv4 routing code.  From Ulrich Weber.

20) Both ipv4 and ipv6 routing code spew "Neighbour table overflow"
    making it impossible to tell which of the two the notification is
    about.  Fix the log messages to be prefixed with "ipv{4,6}:"
    From Ulrich Weber.

21) ip_route_newport() needs to handle tproxy just as
    ip_route_connect() does, also from Ulrich Weber.

22) smsc911x missing module alias, from Vincent Stehlé.

23) Don't force a reset during scan in iwlwif, from Wey-Yi Guy.

24) tcp_mark_head_lost() mismarks segmented packets when doing FACK,
    fix from Yuchung Cheng.

25) e1000e bug fixes from Bruce Alan:
    a) Handle bugs in Sx state.
    b) Device reset leaves LEDs and SMBUS address in wrong state
    c) 82566DC link failure
    d) jumbo frames erroneously generate CRC errors

26) Netfilter bug fixes via Patrick McHardy
    a) ipt_REJECT mis-routes when indev==outdev (Changli Gao)
    b) nf_ct_ext_create() can race (Eric Dumazet)
    c) fix dangerous blind test of ->nodefrag (Jiri Olsa)
    d) nf_nat_snmp incorrect csums (Patrick McHardy)
    e) sip_help_tcp() should default to NF_ACCEPT (Simon Horman)

27) vhost bug fixes from Michael S. Tsirkin
    a) vhost-net range checking fix
    b) log ctx signalling inadvertantly in dead code

Please pull, thanks a lot!

The following changes since commit 252a52aa4fa22a668f019e55b3aac3ff71ec1c29:

  Fix pktcdvd ioctl dev_minor range check (2010-09-27 16:29:06 -0700)

are available in the git repository at:
  master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git master

Bruce Allan (6):
      e1000e: 82577/8/9 issues with device in Sx
      e1000e: 82579 SMBus address and LEDs incorrect after device reset
      e1000e: 82566DC fails to get link
      e1000e: 82579 unaccounted missed packets
      e1000e: 82579 jumbo frame workaround causing CRC errors
      e1000e: 82579 do not gate auto config of PHY by hardware during nominal use

Changli Gao (1):
      netfilter: fix ipt_REJECT TCP RST routing for indev == outdev

David S. Miller (5):
      Merge branch 'vhost-net' of git://git.kernel.org/.../mst/vhost
      rose: Fix signedness issues wrt. digi count.
      Merge branch 'master' of git://git.kernel.org/.../linville/wireless-2.6
      Merge branch 'vhost-net' of git://git.kernel.org/.../mst/vhost
      tcp: Fix >4GB writes on 64-bit.

Eric Dumazet (8):
      qlcnic: dont assume NET_IP_ALIGN is 2
      ip_gre: CONFIG_IPV6_MODULE support
      qlcnic: dont set skb->truesize
      netxen: dont set skb->truesize
      ip: fix truesize mismatch in ip fragmentation
      netfilter: tproxy: nf_tproxy_assign_sock() can handle tw sockets
      netfilter: fix a race in nf_ct_ext_create()
      net: fix a lockdep splat

Jan Beulich (1):
      3c59x: fix regression from patch "Add ethtool WOL support"

Jiri Olsa (1):
      netfilter: nf_conntrack_defrag: check socket type before touching nodefrag flag

Johannes Berg (1):
      wext: fix potential private ioctl memory content leak

Karl Hiramoto (1):
      br2684: fix scheduling while atomic

Kulikov Vasiliy (3):
      ibm_newemac: use free_netdev(netdev) instead of kfree()
      rionet: use free_netdev(netdev) instead of kfree()
      sgiseeq: use free_netdev(netdev) instead of kfree()

Luca Tettamanti (2):
      atl1: fix resume
      atl1: zero out CMB and SBM in atl1_free_ring_resources

Michael S. Tsirkin (2):
      vhost-net: fix range checking in mrg bufs case
      vhost: fix log ctx signalling

Neil Horman (1):
      ipv6: add a missing unregister_pernet_subsys call

Ollie Wild (1):
      net: Move "struct net" declaration inside the __KERNEL__ macro guard

Ondrej Zary (4):
      de2104x: disable autonegotiation on broken hardware
      de2104x: fix power management
      de2104x: fix TP link detection
      de2104x: fix ethtool

Patrick McHardy (1):
      netfilter: nf_nat_snmp: fix checksum calculation (v4)

Simon Horman (1):
      netfilter: nf_ct_sip: default to NF_ACCEPT in sip_help_tcp()

Sven Eckelmann (1):
      net/9p: Mount only matching virtio channels

Thomas Egerer (1):
      xfrm: Allow different selector family in temporary state

Tom Herbert (1):
      net: reset skb queue mapping when rx'ing over tunnel

Tom Marshall (1):
      tcp: Fix race in tcp_poll

Ulrich Weber (3):
      xfrm4: strip ECN bits from tos field
      ipv6: add IPv6 to neighbour table overflow warning
      tproxy: check for transparent flag in ip_route_newports

Vasiliy Kulikov (1):
      s390: use free_netdev(netdev) instead of kfree()

Vincent Stehlé (1):
      smsc911x: Add MODULE_ALIAS()

Wey-Yi Guy (1):
      iwlwifi: do not perferm force reset while doing scan

Yuchung Cheng (1):
      tcp: fix TSO FACK loss marking in tcp_mark_head_lost

 drivers/net/3c59x.c                     |   10 ++
 drivers/net/atlx/atl1.c                 |   11 ++-
 drivers/net/e1000e/hw.h                 |    1 +
 drivers/net/e1000e/ich8lan.c            |  197 +++++++++++++++++++++++++-----
 drivers/net/e1000e/netdev.c             |   29 +++--
 drivers/net/ibm_newemac/core.c          |    4 +-
 drivers/net/netxen/netxen_nic_init.c    |    3 -
 drivers/net/qlcnic/qlcnic_init.c        |    7 +-
 drivers/net/rionet.c                    |    2 +-
 drivers/net/sgiseeq.c                   |    2 +-
 drivers/net/smsc911x.c                  |    1 +
 drivers/net/tulip/de2104x.c             |   43 ++++++-
 drivers/net/wireless/iwlwifi/iwl-core.c |    5 +
 drivers/s390/net/ctcm_main.c            |    4 +-
 drivers/vhost/net.c                     |    2 +-
 drivers/vhost/vhost.c                   |    7 +-
 include/linux/netlink.h                 |    4 +-
 include/linux/socket.h                  |    2 +-
 include/net/addrconf.h                  |    1 +
 include/net/dst.h                       |    1 +
 include/net/route.h                     |    2 +
 include/net/xfrm.h                      |    4 +-
 net/9p/trans_virtio.c                   |    3 +-
 net/atm/br2684.c                        |   12 +--
 net/core/iovec.c                        |    5 +-
 net/core/sock.c                         |    8 +-
 net/ipv4/ip_gre.c                       |    8 +-
 net/ipv4/ip_output.c                    |   19 ++-
 net/ipv4/netfilter/ipt_REJECT.c         |    1 +
 net/ipv4/netfilter/nf_defrag_ipv4.c     |    4 +-
 net/ipv4/netfilter/nf_nat_snmp_basic.c  |    6 +-
 net/ipv4/route.c                        |    2 +-
 net/ipv4/tcp.c                          |    9 +-
 net/ipv4/tcp_input.c                    |    5 +-
 net/ipv4/xfrm4_policy.c                 |    2 +-
 net/ipv4/xfrm4_state.c                  |   33 +++--
 net/ipv6/addrconf.c                     |   11 ++-
 net/ipv6/addrlabel.c                    |    5 +
 net/ipv6/ip6_output.c                   |   18 ++-
 net/ipv6/route.c                        |    2 +-
 net/ipv6/xfrm6_state.c                  |   33 +++--
 net/netfilter/nf_conntrack_extend.c     |    4 +-
 net/netfilter/nf_conntrack_sip.c        |    2 +-
 net/netfilter/nf_tproxy_core.c          |    6 +-
 net/rds/tcp_connect.c                   |    4 +-
 net/rds/tcp_listen.c                    |    4 +-
 net/rds/tcp_recv.c                      |    4 +-
 net/rds/tcp_send.c                      |    4 +-
 net/rose/af_rose.c                      |    4 +-
 net/sunrpc/xprtsock.c                   |   28 ++--
 net/wireless/wext-priv.c                |    2 +-
 net/xfrm/xfrm_policy.c                  |    5 +-
 net/xfrm/xfrm_state.c                   |   45 ++++---
 53 files changed, 444 insertions(+), 196 deletions(-)

^ permalink raw reply	[flat|nested] 1437+ messages in thread
* [GIT] Networking
@ 2010-10-03 18:41 David Miller
  0 siblings, 0 replies; 1437+ messages in thread
From: David Miller @ 2010-10-03 18:41 UTC (permalink / raw)
  To: torvalds; +Cc: akpm, netdev, linux-kernel


1) The UM duplicate field regression fix, from Boaz Harrosh.

2) Max SYN retry sysctl doesn't end up generating the right number of
   SYN retransmits due to bad calculations in retransmits_timed_out().
   Fix from Damian Lukowski.

3) We erroneously drop VLAN packets when device is in promiscuous mode,
   fix from Eric Dumazet.

4) Fix ip_gre Kconfig dependenices wrt. ipv6.

5) Phone uses stale protocol header pointer after pskb_may_pull() call,
   fix from Kumar Sanghvi.

6) Use after free fix in mac80211 from Johannes Berg.

7) Fix work queueing in Intel wireless, from Florian Mickler.

Please pull, thanks a lot!

The following changes since commit c6ea21e35bf3691cad59647c771e6606067f627d:

  Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 (2010-10-01 15:03:37 -0700)

are available in the git repository at:

  master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git master

Boaz Harrosh (1):
      um: Proper Fix for f25c80a4: remove duplicate structure field initialization

Damian Lukowski (1):
      net-2.6: SYN retransmits: Add new parameter to retransmits_timed_out()

David S. Miller (2):
      ip_gre: Fix dependencies wrt. ipv6.
      Merge branch 'master' of git://git.kernel.org/.../linville/wireless-2.6

Eric Dumazet (1):
      vlan: dont drop packets from unknown vlans in promiscuous mode

Florian Mickler (1):
      iwl3945: queue the right work if the scan needs to be aborted

Johannes Berg (1):
      mac80211: fix use-after-free

Kumar Sanghvi (1):
      Phonet: Correct header retrieval after pskb_may_pull

 arch/um/drivers/net_kern.c                  |   17 +++--------------
 drivers/net/wireless/iwlwifi/iwl-agn-lib.c  |    2 +-
 drivers/net/wireless/iwlwifi/iwl3945-base.c |    2 +-
 net/8021q/vlan_core.c                       |   14 ++++++++++----
 net/ipv4/Kconfig                            |    1 +
 net/ipv4/tcp_timer.c                        |   24 ++++++++++++++----------
 net/mac80211/rx.c                           |    4 ----
 net/phonet/pep.c                            |    3 ++-
 8 files changed, 32 insertions(+), 35 deletions(-)

^ permalink raw reply	[flat|nested] 1437+ messages in thread
* [GIT] Networking
@ 2010-10-09  3:30 David Miller
  0 siblings, 0 replies; 1437+ messages in thread
From: David Miller @ 2010-10-09  3:30 UTC (permalink / raw)
  To: torvalds; +Cc: akpm, netdev, linux-kernel


1) Memory out-of-bounds accesses in SCTP, from Dan Rosenberg.

2) We accidently handle v3 queries imporperly when in IGMP v2 compat mode.
   Fix from David Stevens.

3) Ref-after-put bug, and lack of dev_get_by_index() failure checking
   in caif_connect(), from Eric Dumazet.

4) Bluetooh can deadlock on writes when socket send buffer fills us,
   but the packets that would release that space are in the backlog,
   because we hold the socket lock while sleeping and therefore can't
   process those backlog packets.

   Fix from Gustavo F. Padovan.

5) IPV6 doesn't check all of the necessary routes when updating the
   PMTU in response to an ICMP.  Fix from Maciej Żenczykowski.

6) When global TCP memory hit is hit, we hang because the sk_wait_event()
   third argument is wrong in sk_stream_wait_memory().

   This is a very very old bug, I am very surprised nobody else has hit
   this problem.

   Fix by Nagendra Singh Tomar.

7) An old commit I made to fix a build failure with some drivers
   was wrong, and didn't fix the INET_LRO dependency problems at
   all.

   So revert that and Ben Hutchings fixes it right by adding the
   necessary "INET" dependencies to drivers which need "INET_LRO".

8) Signedness overflow in offset check of cls_u32 packet scheduler
   classifier module, from Dan Carpenter.

9) Update Intel ethernet driver docs and MAINTAINERS netry, from Jeff Kirsher.

10) SKGE on some motherboards can't do 64-bit DMA properly, fix from
    Stanislaw Gruszka.

11) bond_masters sysfs file gives bogus WARN_ON, fix from Neil HOrman

12) Fix ath9k clock rate calcuation regression, from Felix Fietkau.

13) Kill AddBA timer, otherwise we reference a freed object.  Fix
    from Johannes Berg.

14) Revert mac80211 change to use netif_receive_skb() instead of netif_rx()
    since sometimes this ends up executing in the wrong context, from
    John W. Linville.

15) Use strlcpy() in isdn to avoid going past the end of a buffer.  From
    Dan Carpenter.

16) ETHTOOL_GRXCLSRLALL exposes kernel heap to userspace.  Fix from
    Kees Cook.

17) Revert ConfigReq rejection commit that causes failures in bluetooth
    validation suite.  From Gustavo F. Padovan.

18) rfcomm_sk_state_change() needs to disable local interrupts to avoid
    illegal lock state, also from Gustavo F. Padovan.

Please pull, thanks a lot!

The following changes since commit 6b0cd00bc396daf5c2dcf17a8d82055335341f46:

  Merge branch 'hwpoison-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6 (2010-10-07 13:59:32 -0700)

are available in the git repository at:

  master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git master

Andrei Emeltchenko (1):
      Bluetooth: fix MTU L2CAP configuration parameter

Ben Hutchings (2):
      Revert "ipv4: Make INET_LRO a bool instead of tristate."
      netdev: Depend on INET before selecting INET_LRO

Dan Carpenter (2):
      cls_u32: signedness bug
      isdn: strcpy() => strlcpy()

Dan Rosenberg (2):
      sctp: prevent reading out-of-bounds memory
      sctp: Fix out-of-bounds reading in sctp_asoc_get_hmac()

David S. Miller (3):
      Merge branch 'master' of master.kernel.org:/.../torvalds/linux-2.6
      Merge branch 'master' of git://git.kernel.org/.../padovan/bluetooth-2.6
      Merge branch 'master' of git://git.kernel.org/.../linville/wireless-2.6

David Stevens (1):
      ipv4: correct IGMP behavior on v3 query during v2-compatibility mode

Eric Dumazet (1):
      caif: fix two caif_connect() bugs

Felix Fietkau (1):
      ath9k_hw: fix regression in ANI listen time calculation

Gustavo F. Padovan (5):
      Bluetooth: Simplify L2CAP Streaming mode sending
      Bluetooth: Fix inconsistent lock state with RFCOMM
      Revert "Bluetooth: Don't accept ConfigReq if we aren't in the BT_CONFIG state"
      Bluetooth: Fix deadlock in the ERTM logic
      Bluetooth: Disallow to change L2CAP_OPTIONS values when connected

Jeff Kirsher (4):
      ixgbevf.txt: Update ixgbevf documentation
      e1000.txt: Update e1000 documentation
      e1000e.txt: Add e1000e documentation
      MAINTAINERS: update Intel LAN Ethernet info

Johannes Berg (1):
      mac80211: delete AddBA response timer

John W. Linville (1):
      Revert "mac80211: use netif_receive_skb in ieee80211_tx_status callpath"

Kees Cook (1):
      net: clear heap allocation for ETHTOOL_GRXCLSRLALL

Maciej Żenczykowski (1):
      net: Fix IPv6 PMTU disc. w/ asymmetric routes

Mat Martineau (1):
      Bluetooth: Only enable L2CAP FCS for ERTM or streaming

Nagendra Tomar (1):
      net: Fix the condition passed to sk_wait_event()

Neil Horman (1):
      bonding: fix WARN_ON when writing to bond_master sysfs file

Stanislaw Gruszka (1):
      skge: add quirk to limit DMA

 Documentation/networking/e1000.txt   |  373 +++++++++-------------------------
 Documentation/networking/e1000e.txt  |  302 +++++++++++++++++++++++++++
 Documentation/networking/ixgbevf.txt |   40 +----
 MAINTAINERS                          |   16 ++-
 drivers/isdn/sc/interrupt.c          |   18 ++-
 drivers/net/Kconfig                  |    4 +-
 drivers/net/bonding/bond_main.c      |    9 +
 drivers/net/skge.c                   |   18 ++-
 drivers/net/wireless/ath/ath9k/ani.c |    2 +-
 include/net/bluetooth/bluetooth.h    |   18 ++
 net/bluetooth/l2cap.c                |   62 +++---
 net/bluetooth/rfcomm/sock.c          |    4 +
 net/caif/caif_socket.c               |   21 ++-
 net/core/ethtool.c                   |    2 +-
 net/core/stream.c                    |    8 +-
 net/ipv4/Kconfig                     |    2 +-
 net/ipv4/igmp.c                      |   14 ++-
 net/ipv6/route.c                     |   28 +++-
 net/mac80211/agg-tx.c                |    2 +
 net/mac80211/status.c                |    4 +-
 net/sched/cls_u32.c                  |    2 +-
 net/sctp/auth.c                      |    8 +-
 net/sctp/socket.c                    |   13 +-
 23 files changed, 590 insertions(+), 380 deletions(-)
 create mode 100644 Documentation/networking/e1000e.txt
 mode change 100755 => 100644 Documentation/networking/ixgbevf.txt

^ permalink raw reply	[flat|nested] 1437+ messages in thread
* [GIT] Networking
@ 2010-10-14 17:14 David Miller
  0 siblings, 0 replies; 1437+ messages in thread
From: David Miller @ 2010-10-14 17:14 UTC (permalink / raw)
  To: torvalds; +Cc: akpm, netdev, linux-kernel


One last push before heading off to Spain for the netfilter workshop:

1) r8169 does 16K allocations using GFP_ATOMIC during resume,
   which makes resume fail frequently.  Use dma_*() interfaces
   and GFP_KERNEL where possible.

   From Stanislaw Gruszka.

2) b44 and fec driver mis-manage initial carrier state, breaking NFS
   root mounts and similar, from Paul Fertser and Oskar Schirmer.

3) Kernel heap leak to userspace in privileged ethtool ops, fix from
   Kees Cook.

4) Several use-after free fixes in ATM and wimax from Jiri Slaby.

5) Fixed PHY support regressed upon conversion to phylib in FEC
   driver, fix from Greg Ungerer.

6) ehea sets CHECKSUM_UNNECESSARY erroneously on non-TCP/UDP packets,
   fix from Breno Leitao.

7) TG3 rx_dropped accounting regressed unintentionally, fix from Eric
   Dumazet.

Please pull, thanks a lot!

The following changes since commit 53eeb64e808971207350386121f4bab12fa2f45f:
  Linus Torvalds (1):
        Merge branch 'fixes' of git://git.kernel.org/.../djbw/async_tx

are available in the git repository at:

  master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git master

Breno Leitao (1):
      ehea: Fix a checksum issue on the receive path

Eric Dumazet (1):
      tg3: restore rx_dropped accounting

Greg Ungerer (1):
      net: allow FEC driver to use fixed PHY support

Jiri Slaby (4):
      ATM: solos-pci, remove use after free
      ATM: mpc, fix use after free
      ATM: iphase, remove sleep-inside-atomic
      NET: wimax, fix use after free

Kees Cook (1):
      net: clear heap allocations for privileged ethtool actions

Oskar Schirmer (1):
      net/fec: carrier off initially to avoid root mount failure

Paul Fertser (1):
      b44: fix carrier detection on bind

Stanislaw Gruszka (2):
      r8169: allocate with GFP_KERNEL flag when able to sleep
      r8169: use device model DMA API

 drivers/atm/iphase.c          |    6 ----
 drivers/atm/iphase.h          |    2 +-
 drivers/atm/solos-pci.c       |    8 +++--
 drivers/net/b44.c             |    4 +-
 drivers/net/ehea/ehea_main.c  |    9 +++++-
 drivers/net/ehea/ehea_qmr.h   |    1 +
 drivers/net/fec.c             |   44 +++++++++++++++++++---------
 drivers/net/r8169.c           |   65 ++++++++++++++++++++++-------------------
 drivers/net/tg3.c             |    6 ++-
 drivers/net/tg3.h             |    2 +-
 drivers/net/wimax/i2400m/rx.c |   26 ++++++++--------
 net/atm/mpc.c                 |    2 +-
 net/core/ethtool.c            |    6 ++--
 13 files changed, 104 insertions(+), 77 deletions(-)

^ permalink raw reply	[flat|nested] 1437+ messages in thread
* [GIT] Networking
@ 2010-10-23 18:35 David Miller
  0 siblings, 0 replies; 1437+ messages in thread
From: David Miller @ 2010-10-23 18:35 UTC (permalink / raw)
  To: torvalds; +Cc: akpm, netdev, linux-kernel


Linus, there are three conflicts which I am aware of that you'll need
to take care of when you pull this:

1) net/core/dev.c

   Keep the new trace_netif_receive_skb() call, delete the
   VLAN test and return statement.

2) drivers/net/wireless/ath/ath9k/debug.c

   Just delete everything in the conflict markers, the code
   dealing with fops_rcstat

3) drivers/net/pcmcia/smc91c92.c

   Keep only the "pr_info()" line in the conflict markers.

Changes worth mentioning:

1) TPROXY ipv6 support, from Balazs Scheidler.

2) Many routing, neighbour, and device handling optimizations on SMP from
   Eric Dumazet.  Routing tests now run faster with the routing cache
   disabled (for those who jump quickly to conclusions, NO this does
   not mean we can just remove the routing cache, we still need it for
   the sake of routing metrics etc.)

   Anyways, amazing stuff from Eric, the networking ninja.

3) Cleanup and add sanity to the queue allocation semantics for network
   devices, from Ben Hutchings.

4) Add MAC-level filtering and steering API support, also from Ben
   Hutchings.

5) Move VLAN handling into the core and out of the individual drivers.
   With a few more driver conversions even more code can get removed
   from the VLAN bits.  From Jesse Gross.

6) TCP_USER_TIMEOUT socket option support, from Jerry Chu.

7) Multiqueue support for macvtap driver, from Krishna Kumar.

8) Any-IP support in ipv6, from Maciej Żenczykowski.

9) Make netpoll actually work on bonding, from Neil Horman.

Please pull, thanks a lot!

The following changes since commit 02f36038c568111ad4fc433f6fa760ff5e38fab4:

  Merge branches 'softirq-for-linus', 'x86-debug-for-linus', 'x86-numa-for-linus', 'x86-quirks-for-linus', 'x86-setup-for-linus', 'x86-uv-for-linus' and 'x86-vm86-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip (2010-10-23 08:25:36 -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 (2):
      be2net: fix to dynamically generate MAC Address for VFs
      be2net: stats for packets received due to internal switching in ASIC.

Akinobu Mita (5):
      econet: kill unnecessary spin_lock_init()
      mlx4: use bitmap library
      phonet: use for_each_set_bit
      starfire: use PCI_VDEVICE
      starfire: use BUILD_BUG_ON for netdrv_addr_t

Alban Crequy (1):
      AF_UNIX: Implement SO_TIMESTAMP and SO_TIMETAMPNS on Unix sockets

Alexander Duyck (21):
      ixgbe: remove redundant DMA alignment code
      ixgbe: move setting of GSO size for 82598 into ixgbe_configure_dcb
      ixgbe: combine two modifications of TXDCTL into one
      ixgbe: move configuration of the MTQC register into it's own function
      ixgbe: move Tx ring configuration into a separate function
      ixgbe: consolidate all setting of MRQC into one function
      ixgbe: pull ring configuration into it's own function
      ixgbe: pull PSRTYPE configuration into a separate function
      ixgbe: combine accesses to FCTRL register into ixgbe_set_rx_mode
      ixgbe: bump PS header size to 512 bytes
      ixgbe: remove redundant configuration of vmolr, rename generic variable
      ixgbe: Move max frame size and Rx buffer length configuration into a function
      ixgbe: move all Rx DMA control register writes to one central location
      ixgbe: Move virtualization config into a separate function
      ixgbe: move all GPIE register config into a single function
      ixgbe: pull all Tx init into ixgbe_configure_tx
      ixgbe: combine Rx into into ixgbe_configure_rx
      ixgbe: update all DESC_ADV macros to accept a ring pointer
      ixgbe: rewrite ethtool test to use standard config functions
      ixgbe: fix TX ring enable issues seen when VMDQ is enabled
      igb: clear VF_PROMISC bits instead of setting all other bits

Allan Stephens (16):
      tipc: Provide correct error code for unsupported connect() operation
      tipc: correct problems with misleading flags returned using poll()
      tipc: Check for disabled bearer when processing incoming messages
      tipc: Prevent crash when broadcast link cannot send to all nodes
      tipc: Fix premature broadcast advertisement by sending node
      tipc: Fix bug in broadcast link transmit statistics computation
      tipc: Remove per-connection sequence number logic
      tipc: Optimize tipc_node_has_active_links()
      tipc: Minor enhancements to name table display format
      tipc: Allow connect() to wait indefinitely
      tipc: Prevent missing name table entries when link flip-flops rapidly
      tipc: Minor optimizations to name table translation code
      tipc: Ensure outgoing messages on Ethernet have sufficient headroom
      tipc: Fix misleading error code when enabling Ethernet bearers
      tipc: Simplify bearer shutdown logic
      tipc: delete needless memset from bearer enabling.

Amerigo Wang (2):
      mlx4: remove num_lro parameter
      s2io: remove lro parameter

Amit Kumar Salecha (26):
      qlcnic: fix aer for virtual func
      qlcnic: device state management fixes for virtual func
      qlcnic: add eswitch statistics support
      qlcnic: fix inconsistent lock state
      qlcnic: fix npar state
      qlcnic: mark device state as failed
      qlcnic: fix endiness in eswitch statistics
      qlcnic: update version 5.0.8
      qlcnic: support port vlan id
      qlcnic: fix fw recovery for PF
      qlcnic: change reg name
      qlcnic: support mac learning
      qlcnic: mac vlan learning support
      qlcnic: add cksum flag
      qlcnic: support vlan rx accleration
      qlcnic: vlan gro support
      qlcnic: vlan lro support
      qlcnic: remove fw version check
      qlcnic: update version 5.0.10
      qlcnic: fix internal loopback test
      qlcnic: fix eswitch stats
      qlcnic: fix diag register
      qlcnic: driver private workqueue
      qlcnic: support quiescent mode
      qlcnic: remove private LRO flag
      qlcnic: update driver version 5.0.11

Anders Kaseorg (1):
      tipc: Fix log buffer memory leak if initialization fails

Andrea Gelmini (1):
      net: mac80211: Fix a typo.

Andreas Schwab (2):
      net/de4x5: remove undefined operations
      net/cxgb3: remove undefined operations

Andrei Emeltchenko (4):
      Bluetooth: remove extra newline from debug output
      Bluetooth: check L2CAP length in first ACL fragment
      Bluetooth: check for l2cap header in start fragment
      Bluetooth: clean up rfcomm code

Andrew Gallatin (1):
      myri10ge: DCA update (resubmit)

Andrew Hendry (1):
      X.25 remove bkl in accept

Andrew Morton (2):
      drivers/net/wireless/libertas/cfg.c: needs sched.h
      drivers-net-tulip-de4x5c-fix-copy-length-in-de4x5_ioctl-checkpatch-fixes

Andy Grover (66):
      RDS: Fix BUG_ONs to not fire when in a tasklet
      RDS: Rewrite rds_send_drop_to() for clarity
      RDS: Fix locking in send on m_rs_lock
      RDS: move rds_shutdown_worker impl. to rds_conn_shutdown
      RDS: cleanup: remove "== NULL"s and "!= NULL"s in ptr comparisons
      RDS: break out rdma and data ops into nested structs in rds_message
      RDS: cleanup/fix rds_rdma_unuse
      RDS: Explicitly allocate rm in sendmsg()
      RDS: fold rdma.h into rds.h
      RDS: make m_rdma_op a member of rds_message
      RDS: make sure all sgs alloced are initialized
      RDS: Clear up some confusing code in send_remove_from_sock
      RDS: Implement atomic operations
      RDS: Base init_depth and responder_resources on hw values
      RDS: Do not mask address when pinning pages
      RDS: Whitespace
      RDS: inc_purge() transport function unused - remove it
      RDS/IB: eliminate duplicate code
      RDS/IB: Disallow connections less than RDS 3.1
      RDS/IB: Remove dead code
      RDS/IB: Remove ib_[header/data]_sge() functions
      RDS: rewrite rds_ib_xmit
      RDS: Remove unsignaled_bytes sysctl
      RDS/IB: Make all flow control code conditional on i_flowctl
      RDS: Move loop-only function to loop.c
      RDS: Implement silent atomics
      RDS: Inline rdma_prepare into cmsg_rdma_args
      RDS: purge atomic resources too in rds_message_purge()
      RDS: Remove struct rds_rdma_op
      RDS: Rename data op members prefix from m_ to op_
      RDS: Rewrite rds_send_xmit
      RDS: Do not set op_active in r_m_copy_from_user().
      RDS: Add a warning if trying to allocate 0 sgs
      RDS: queue failure notifications for dropped atomic ops
      RDS: Move some variables around for consistency
      RDS: Add flag for silent ops. Do atomic op before RDMA
      RDS: Make sure cmsgs aren't used in improper ways
      RDS: Perform unmapping ops in stages
      RDS/IB: Do not wait for send ring to be empty on conn shutdown
      RDS: Stop supporting old cong map sending method
      RDS: Refill recv ring directly from tasklet
      RDS: Change send lock from a mutex to a spinlock
      RDS: rds_send_xmit() locking/irq fixes
      RDS: Call rds_send_xmit() directly from sendmsg()
      RDS: Bypass workqueue when queueing cong updates
      RDS: Use NOWAIT in message_map_pages()
      RDS: Fix locking in send on m_rs_lock
      RDS: rds_message_unmapped() doesn't need to check if queue active
      RDS: Move atomic stats from general to ib-specific area
      RDS: Remove send_quota from send_xmit()
      RDS: Do wait_event_interruptible instead of wait_event
      RDS: Get pong working again
      RDS: Update comments in rds_send_xmit()
      RDS/IB: Remove unused variable in ib_remove_addr()
      RDS/IB: add _to_node() macros for numa and use {k,v}malloc_node()
      RDS: Use page_remainder_alloc() for recv bufs
      RDS: Assume recv->r_frag is always NULL in refill_one()
      RDS/IB: Remove ib_recv_unmap_page()
      RDS: whitespace
      RDS: Remove unused XLIST_PTR_TAIL and xlist_protect()
      RDS/IB: Make ib_recv_refill return void
      RDS/IB: Use SLAB_HWCACHE_ALIGN flag for kmem_cache_create()
      RDS: Implement masked atomic operations
      RDS: Add rds.h to exported headers list
      RDS: rds.h: Replace u_int[size]_t with uint[size]_t
      RDS: Remove dead struct from rds.h

Andy Shevchenko (4):
      drivers: isdn: capi: use simple_strtol to convert numbers
      uwb: use '%pM' format to print MAC address
      drivers: atm: use native kernel's hex_to_bin() func
      net: core: use kernel's converter from hex to bin

Andy Walls (1):
      IPv4: route.c: Change checks against 0xffffffff to ipv4_is_lbcast()

Anirban Chakraborty (1):
      qlcnic: Fix driver load issue in FW hang

Anton Blanchard (1):
      ibmveth: Use lighter weight read memory barrier in ibmveth_poll

Arnaud Patard (2):
      rt2x00: fix "buffer size not provably correct" build warning
      phy/marvell: fix 88e1121 support

Arnd Bergmann (3):
      irda/irnet: use noop_llseek
      i4l: kill big kernel lock
      misdn: kill big kernel lock

Balazs Scheidler (12):
      tproxy: kick out TIME_WAIT sockets in case a new connection comes in with the same tuple
      tproxy: add lookup type checks for UDP in nf_tproxy_get_sock_v4()
      tproxy: fix hash locking issue when using port redirection in __inet_inherit_port()
      tproxy: split off ipv6 defragmentation to a separate module
      tproxy: added const specifiers to udp lookup functions
      tproxy: added udp6_lib_lookup function
      tproxy: added tproxy sockopt interface in the IPV6 layer
      tproxy: allow non-local binds of IPv6 sockets if IP_TRANSPARENT is enabled
      tproxy: added IPv6 socket lookup function to nf_tproxy_core
      tproxy: added IPv6 support to the TPROXY target
      tproxy: added IPv6 support to the socket match
      tproxy: use the interface primary IP address as a default value for --on-ip

Bandan Das (3):
      bridge : Sanitize skb before it enters the IP stack
      bonding: cleanup : add space around operators
      bonding: cleanup: remove braces from single block statements

Ben Greear (20):
      ath9k: calcrxfilter should take multiple VIFs into account.
      ath9k: Print rxfilter in debugfs.
      ath5k: Add bssid mask and rxfilter to debugfs.
      mac80211: Support multiple VIFS per AP in debugfs.
      mac80211/ath9k: Support AMPDU with multiple VIFs.
      mac80211: Support receiving data frames on multiple vifs.
      wireless: Use first phyX name available when registering phy devices.
      ath5k: Allow ath5k to support virtual STA and AP interfaces.
      ath5k: Print rx/tx bytes in debugfs
      ath9k: Report total tx/rx bytes and packets in debugfs.
      mac80211: Improve mlme probe response log messages.
      wireless: Set some stats used by /proc/net/wireless (wext)
      ath5k: Print out opmode in debugfs.
      ath5k: Adjust opmode when interfaces are removed.
      wireless: Print wiphy name in sysfs.
      ath5k: Move debugfs under ieee80211/[wiphy-name]
      ath9k: Fix potential use-after-free.
      ath9k: Remove bf_dmacontext.
      ath9k: Null out references to stale pointers.
      net/core: Allow tagged VLAN packets to flow through VETH devices.

Ben Hutchings (46):
      mac80211: Don't squash error codes in key setup functions
      ethtool: Provide a default implementation of ethtool_ops::get_drvinfo
      sfc: Use MCDI RX_BAD_FCS_PKTS count as MAC rx_bad count
      sfc: Accumulate RX_NODESC_DROP count in rx_dropped, not rx_over_errors
      sfc: Remove declarations of functions that no longer exist
      sfc: Fix failure paths in efx_probe_port()
      sfc: Allocate DMA and event rings using GFP_KERNEL
      sfc: Abstract channel and index lookup for RX queues
      sfc: Refactor channel and queue lookup and iteration
      sfc: Allocate each channel separately, along with its RX and TX queues
      sfc: Allow changing the DMA ring sizes dynamically via ethtool
      sfc: Fix order of channel_name array dimensions
      ethtool: Complete kernel-doc comments for RX flow filter and hash control
      ethtool: Remove unimplemented flow specification types
      ethtool, ixgbe: Move RX n-tuple mask fixup to ethtool
      ethtool: Add comments for valid use of flow types
      ethtool: Define RX n-tuple action to clear a rule
      ethtool: Add Ethernet MAC-level filtering/steering
      ethtool: Allocate register dump buffer with vmalloc()
      sfc: Add filter table management
      sfc: Implement the ethtool RX n-tuple control functions
      sfc: Include RX IP filter table in register dump
      sfc: Clean up and correct comments on efx_monitor()
      sfc: Remove support for SFN4111T, SFT9001 and Falcon GMAC
      sfc: Add support for SFE4003 board and TXC43128 PHY
      net: Allow changing number of RX queues after device allocation
      net: Add netif_copy_real_num_queues() for use by virtual net drivers
      bnx2: Use netif_set_real_num_{rx,tx}_queues()
      bnx2x: Use netif_set_real_num_{rx,tx}_queues()
      cxgb3: Use netif_set_real_num_{rx,tx}_queues()
      cxgb4: Use netif_set_real_num_{rx,tx}_queues()
      cxgb4vf: Use netif_set_real_num_{rx, tx}_queues()
      gianfar: Use netif_set_real_num_rx_queues()
      igb: Use netif_set_real_num_{rx,tx}_queues()
      ixgbe: Use netif_set_real_num_{rx,tx}_queues()
      mlx4_en: Use netif_set_real_num_{rx, tx}_queues()
      mv643xx_eth: Use netif_set_real_num_{rx, tx}_queues()
      myri10ge: Use netif_set_real_num_{rx, tx}_queues()
      niu: Use netif_set_real_num_{rx,tx}_queues()
      sfc: Use netif_set_real_num_{rx,tx}_queues()
      8021q: Use netif_copy_real_num_queues() to set queue counts
      tg3: Use netif_set_real_num_{rx,tx}_queues()
      ar9170: Remove MODULE_FIRMWARE references to two-stage firmware
      net: Update kernel-doc for netif_set_real_num_rx_queues()
      sfc: Don't try to set filters with search depths we know won't work
      r6040: Fix multicast filter some more

Benjamin Poirier (1):
      bridge: Forward reserved group addresses if !STP

Bernard Blackham (1):
      smsc95xx: generate random MAC address once, not every ifup

Bill Jordan (4):
      nl80211: Uninitialized variable
      ath9k: add WDS interfaces to ath9k
      cfg80211: patches to allow setting the WDS peer
      mac80211: fix for WDS interfaces

Björn Smedman (3):
      mac80211: minstrel_ht A-MPDU fix
      ath9k: A-MPDU rate control info fix
      ath9k: built-in rate control A-MPDU fix

Bob Copeland (9):
      ath5k: clean up some comments
      ath5k: remove monitor check in receive_frame_ok filter
      ath5k: remove all mention of monitor iftype
      ath5k: don't enable probe request rx for STAs
      mac80211: trivial spelling fixes
      ath5k: trivial spelling fixes
      ath5k: log descriptor chains at a new debug level
      ath5k: fix off-by-one in pilot magnitude mask
      ath5k: reorder base.c to remove fwd decls

Brandon Philips (1):
      net: enable GRO by default for vlan devices

Breno Leitao (4):
      qlge: Fix a deadlock when the interface is going down
      ehea: Remove a silly return
      ehea: using wait queues instead of msleep on ehea_flush_sq
      ehea: converting msleeps to waitqueue on check_sqs() function

Bruce Allan (1):
      e1000e: 82579 performance improvements

Bruno Randolf (25):
      ath: Copy cryptographic capability flags into ath
      ath: Copy key cache management functions from ath9k to ath
      ath5k: Use common ath key management functions
      ath5k: Remove old ath5k key handling functions
      ath/ath9k: Replace common->splitmic with a flag
      ath5k: Use common crypt capabilities flags
      ath9k: Use common ath key management functions
      ath/ath5k/ath9k: Fix crypto capabilities merge issue
      ath5k: Use four hardware queues
      ath5k: Fix queue debug file
      ath5k: Fix TX queues stopping
      ath5k: Move tx frame completion into separate function
      ath5k: Add watchdog for stuck TX queues
      ath5k: Count how many times a queue got stuck
      ath5k: Keep last descriptor in queue
      ath5k: Simplify cw_min/max and AIFS configuration
      ath5k: Add tx queue configuration function
      ath5k: Remove unused variable for atim window
      ath5k: Check and fix ATIM window
      ath5k: Increase "fudge" for beacon timers
      ath5k: Disable interrupts in ath5k_hw_get_tsf64
      ath5k: Fix bitmasks and typos for PCU Diagnostic register
      mac80211: Add WME information element for IBSS
      ath5k: Don't wake internal queues
      nl80211/mac80211: Add retry and failed transmission count to station info

Carolyn Wyborny (2):
      igb: add check for fiber/serdes devices to igb_set_spd_dplx;
      e1000e: Fix for offline diag test failure at first call

Casey Leedom (4):
      cxgb3: Add register bit definition for Fatal Parity Error.
      cxgb3: Set FATALPERREN.
      cxgb3: Leave interrupts for fatal errors asserted in common code.
      cxgb3: Avoid flush_workqueue() deadlock.

Changli Gao (27):
      net: rps: reset network header before calling skb_get_rxhash()
      net: rps: skip fragment when computing rxhash
      net: introduce proto_ports_offset()
      net: rps: use proto_ports_offset() to handle the AH message correctly
      net_sched: cls_flow: use proto_ports_offset() to support AH message
      netfilter: ipt_CLUSTERIP: use proto_ports_offset() to support AH message
      netfilter: xt_hashlimit: use proto_ports_offset() to support AH message
      net_sched: sch_sfq: use proto_ports_offset() to support AH message
      net: rps: fix the wrong network header pointer
      net_sched: cls_flow: add key rxhash
      net: use __be16 instead of u16 for the userspace code
      net: 802.1q: make vlan_hwaccel_do_receive() return void
      net: rds: remove duplication type definitions
      net_sched: act_csum: coding style cleanup
      net: use scnprintf() to avoid potential buffer overflow
      net: arp: code cleanup
      net: rps: add the shortcut for one rps_cpus
      netfilter: nf_nat: add nf_nat_csum()
      netfilter: use NFPROTO_IPV4 instead of AF_INET
      netfilter: nf_nat_core: don't check if the tuple is used if there is no other choice
      netfilter: nf_nat: no IP_NAT_RANGE_MAP_IPS flags when alloc_null_binding()
      netfilter: nf_conntrack: fix the hash random initializing race
      netfilter: save the hash of the tuple in the original direction for latter use
      netfilter: unregister nf hooks, matches and targets in the reverse order
      net_sched: use __TCA_HTB_MAX and TCA_HTB_MAX
      phonet: remove the unused variable pn
      net_sched: remove the unused parameter of qdisc_create_dflt()

Chris Mason (17):
      RDS: Use a generation counter to avoid rds_send_xmit loop
      rds: switch to rwlock on bind_lock
      rds: per-rm flush_wait waitq
      rds: rcu-ize rds_ib_get_device()
      rds: Use RCU for the bind lookup searches
      rds: don't let RDS shutdown a connection while senders are present
      rds: Fix RDMA message reference counting
      RDS: use locking on the connection hash list
      rds: use RCU to protect the connection hash
      rds: Fix reference counting on the for xmit_atomic and xmit_rdma
      RDS/IB: Add caching of frags and incs
      RDS: use friendly gfp masks for prefill
      rds: recycle FMRs through lockless lists
      rds: more FMRs are faster
      RDS: use delayed work for the FMR flushes
      RDS: properly use sg_init_table
      RDS: flush fmrs before allocating new ones

Christian Dietrich (1):
      drivers/net: Removing undead ifdef CHELSIO_T1_1G

Christian Lamparter (40):
      mac80211: put rx handlers into separate functions
      mac80211: remove unused rate function parameter
      mac80211: AMPDU rx reorder timeout timer
      p54spi: fix eeprom checksum
      p54: improve eeprom parser
      p54spi: Kconfig option for config blob
      p54usb: fix off-by-one on !CONFIG_PM
      mac80211: cancel restart_work in ieee80211_unregister_hw
      mac80211: fix rcu-unsafe pointer dereference
      p54: better rssi->dbm conversion for longbow phys
      carl9170: mac80211 glue and command interface
      carl9170: Register maps, tx/rx descriptor formats and eeprom layout
      carl9170: PHY/RF and MAC routines
      carl9170: 802.11 rx/tx processing and usb backend
      carl9170: firmware parser and debugfs code
      carl9170: Makefile, Kconfig files and MAINTAINERS
      carl9170: update AR9170 phy initvals
      carl9170: use rx chainmask from eeprom
      carl9170: fix noise dBm conversion
      carl9170: don't load bogus nf of chain 1
      carl9170: abort tasklet during usb reset
      carl9170: fix state downgrade during reset
      carl9170: reinit phy after HT settings have changed
      carl9170: fix hang in AP mode when HT STA does PSM
      mac80211: clear txflags for ps-filtered frames
      carl9170: remove non-standard ba session teardown
      carl9170: angle brackets for wiki link
      carl9170: remove lost-frame workaround
      carl9170: fix tx_ampdu_upload counter
      carl9170: fix WARN_ON triggered by Broadcom HT STAs
      carl9170: revamp carl9170_tx_prepare
      carl9170: interrupt urbs must not set URB_ZERO_PACKET
      mac80211: fix rx monitor filter refcounters
      carl9170: support firmware-based rx filter
      p54usb: add five more USBIDs
      mac80211: fix possible null-pointer de-reference
      mac80211: temporarily disable reorder release timer
      carl9170: common error path for bad frames
      carl9170: remove stale rx error path
      carl9170: A-MPDU frame type filter

Dan Carpenter (18):
      net/sched: remove unneeded NULL check
      qlge: pull NULL check ahead of dereference
      tokenring: remove unneeded NULL checks
      plip: remove superflous return
      ath5k: re-order one of the frees on unwind
      isdn: potential buffer overflows
      isdn: cleanup: make buffer smaller
      bna: off by one
      rds: signedness bug
      rds: double unlock in rds_ib_cm_handle_connect()
      rds: spin_lock_irq() is not nestable
      airo: remove "basic_rate" module option
      ipw2200: check for allocation failures
      eicon: make buffer larger
      vhost: fix return code for log_access_ok()
      pch_gbe: fix if condition in set_settings()
      ns83820: spin_lock_irq() => spin_lock()
      gianfar: fix double lock typo

Dan Rosenberg (1):
      drivers/net/tulip/de4x5.c: fix union member name in DE4X5_GET_REG ioctl

Dan Williams (7):
      libertas: better scan response debugging
      libertas: better association request debugging
      libertas: [usb] use new firmware locations
      libertas: add two-stage firmware request helper
      libertas: [cs] use common firmware request helper and new firmware locations
      libertas: [sdio] use common firmware request helper and new firmware locations
      libertas: [spi] use common firmware request helper and new firmware locations

David Kilroy (2):
      orinoco: Fix walking past the end of the buffer
      orinoco: update status in MAINTAINERS

David Lamparter (1):
      netns: keep vlan slaves on master netns move

David S. Miller (42):
      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 master.kernel.org:/.../davem/net-2.6
      net: Rename skb_has_frags to skb_has_frag_list
      bna: Delete get_flags and set_flags ethtool methods.
      pkt_sched: Make act_csum depend upon INET.
      mlx4_en: Fix build warning in mlx4_en_create_rx_ring.
      stmmac: Make time functionality depend upon RTC_HCTOSYS_DEVICE
      stmmac: Fix build warnings.
      stmmac: Fix another build warning.
      starfire: Temporary kludge to fix powerpc build.
      Merge branch 'for-davem' of git://git.kernel.org/.../linville/wireless-next-2.6
      Merge branch 'for-davem' of git://oss.oracle.com/git/agrover/linux-2.6
      Merge branch 'master' of master.kernel.org:/.../davem/net-2.6
      bna: Check for NULL before deref in bnad_cb_tx_cleanup
      Merge branch 'dccp' of git://eden-feed.erg.abdn.ac.uk/net-next-2.6
      phonet: Fix build warning.
      Merge branch 'dccp' of git://eden-feed.erg.abdn.ac.uk/net-next-2.6
      sfc: Fix build due to lack of vmalloc.h include.
      ethtool: Fix build due to lack of ethtool.h include.
      Merge branch 'for-davem' of git://git.kernel.org/.../linville/wireless-next-2.6
      Merge branch 'master' of master.kernel.org:/.../davem/net-2.6
      Merge branch 'for-davem' of git://git.kernel.org/.../linville/wireless-next-2.6
      sctp: Fix break indentation in sctp_ioctl().
      Merge branch 'master' of master.kernel.org:/.../davem/net-2.6
      ipvs: Use frag walker helper in SCTP proto support.
      net: relax rtnl_dereference()
      ppp: Use a real SKB control block in fragmentation engine.
      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 'for-davem' of git://git.kernel.org/.../linville/wireless-next-2.6
      Merge branch 'master' of master.kernel.org:/.../davem/net-2.6
      Merge branch 'dccp' of git://eden-feed.erg.abdn.ac.uk/net-next-2.6
      s390: ctcm_mpc: Fix build after netdev refcount changes.
      tipc: Kill tipc_get_mode() completely.
      Merge branch 'can/mcp251x-for-net-next' of git://git.pengutronix.de/git/mkl/linux-2.6
      Merge branch 'for-davem' of git://git.kernel.org/.../linville/wireless-next-2.6
      Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
      Merge branch 'master' of git://git.kernel.org/.../padovan/bluetooth-2.6
      Merge branch 'vhost-net' of git://git.kernel.org/.../mst/vhost
      Merge branch 'master' of git://git.kernel.org/.../kaber/nf-next-2.6
      Merge branch 'master' of master.kernel.org:/.../davem/net-2.6

David Vrabel (2):
      Bluetooth: HCI devices are either BR/EDR or AMP radios
      Bluetooth: Support SDIO devices that are AMP controllers

Denis 'GNUtoo' Carikli (1):
      wl1251: Fix queue stopping/waking for TX path

Denis Kirjanov (13):
      r6040: Free irq line on error path
      ns83820: Use helper to disable chip interrupts
      ns83820: Remove unused have_optical variable.
      ns83820: Add copper device settings
      ns83820: Use predefined autoneg constants
      sundance: Add power management hooks
      sundance: Convert to DMA API
      sundance: Handle DMA mapping errors
      sundance: Use dev_kfree_skb_any() helper
      sundance: Drop legacy _COMPAT_WITH_OLD_KERNEL includes
      sundance: Add initial ethtool stats support
      ibmveth: Cleanup error handling inside ibmveth_open
      ibmveth: Free irq on error path

Diego Elio 'Flameeyes' Pettenò (1):
      sctp: implement SIOCINQ ioctl() (take 3)

Dimitris Michailidis (6):
      cxgb4: handle Rx/Tx queue ranges not starting at 0
      cxgb4: support eeprom read/write on functions other than 0
      cxgb4: fix setting of the function number in transmit descriptors
      cxgb4: update PCI ids
      cxgb4: remove a bogus PCI function number check
      ipv4: Remove leftover rcu_read_unlock calls from __mkroute_output()

Dmitry Kozlov (1):
      PPTP: PPP over IPv4 (Point-to-Point Tunneling Protocol)

Dmitry Kravkov (27):
      bnx2x: Load firmware in open() instead of probe()
      bnx2x: Spread rx buffers between allocated queues
      bnx2x: Moved enabling of MSI to the bnx2x_set_num_queues()
      bnx2x: create folder for bnx2x firmware files
      bnx2x: add 6.0.34 fw files
      bnx2x, cnic, bnx2i: use new FW/HSI
      bnx2x: remove old FW files
      bnx2x: rename MF related fields
      bnx2x: change type of spq_left to atomic
      bnx2x: Add 57712 support
      bnx2x: remove unused parameter in reuse_rx_skb()
      bnx2x: remove unused fields in main driver structure
      bnx2x: use proper constants for dma_unmap* calls
      bnx2x: use L1_CACHE_BYTES instead of magic number
      bnx2x: move msix table initialization to probe()
      bnx2x, cnic: Fix SPQ return credit
      bnx2x: code beautify
      bnx2x: properly initialize FW stats
      bnx2x: update version to 1.60.00-1
      bnx2x: Fixing a typo: added a missing RSS enablement
      bnx2x: remove redundant commands during error handling
      bnx2x: do not deal with power if no capability
      bnx2x: Use correct FW constant for header padding
      bnx2x: remove unnecessary FUNC_FLG_RSS flag and related
      bnx2x: update version to 1.60.00-2
      bnx2x: fix possible deadlock in HC hw block
      bnx2x: update version to 1.60.00-3

Don Skidmore (1):
      ixgbe: cleanup ixgbe_get_drvinfo to be extra careful with buffer boundaries

Eduardo Blanco (1):
      Fixed race condition at ip_vs.ko module init.

Eliad Peller (2):
      wl1271: avoid redundant memcpy of rx_status
      wl1271: bugfix: use bitwise-AND instead of logical-AND

Emil Tantilov (5):
      ixgbe: fix link issues and panic with shared interrupts for 82598
      ixgbevf: declare functions as static
      ixgbe: remove unused functions
      ixgbe: declare functions as static
      ixgbe: update copyright info

Eric Dumazet (121):
      atm: remove a net_device_stats clear
      vxge: Implement 64bit stats
      slip: fix get_stats() method
      net: build_ehash_secret() and rt_bind_peer() cleanups
      atl1c: use net_device_stats from struct net_device
      amd8111e: use net_device_stats from struct net_device
      irda: use net_device_stats from struct net_device
      net: copy_rtnl_link_stats64() simplification
      be2net: get rid of be_get_stats()
      ethoc: get rid of ethoc_stats()
      bcm63xx_enet: use netdev stats
      net: ip_append_data() optim
      bnx2x: small fix in stats handling
      typhoon: fix a race in typhoon_do_get_stats
      gro: __napi_gro_receive() optimizations
      bnx2x: fix wrong return from bnx2x_trylock_hw_lock
      net: struct xfrm_tunnel in read_mostly section
      ipv6: struct xfrm6_tunnel in read_mostly section
      pktgen: remove non used variable
      net: add a comment on netdev->last_rx
      gro: unexport tcp4_gro_receive and tcp4_gro_complete
      net: tunnels should use rcu_dereference
      skge: add GRO support
      net: skbuff.c cleanup
      net: another last_rx round
      net: dev_add_pack() & __dev_remove_pack() changes
      bna: fix stats handling
      drivers/net: avoid some skb->ip_summed initializations
      tulip: use integrated netdev stats
      net: remove two kmemcheck annotations
      r8169: fix rx checksum offload
      net: pskb_expand_head() optimization
      net: poll() optimizations
      r8169: add gro support
      net: introduce rcu_dereference_rtnl
      net: inet_add_protocol() can use cmpxchg()
      tunnels: missing rcu_assign_pointer()
      ixgbevf: remove private net_device_stats
      fib: cleanups
      flow: better memory management
      net: add rtnl_dereference()
      ipip: get rid of ipip_lock
      gre: get rid of ipgre_lock
      sit: get rid of ipip6_lock
      ipv4: ip_ptr cleanups
      ip6tnl: get rid of ip6_tnl_lock
      net: shrinks struct net_device
      ethtool: change ethtool_set_gro() to use ethtool_op_get_rx_csum
      bonding: enable gro by default
      net: reorder struct netdev_hw_addr
      net: rx_dropped accounting
      qlcnic: dont set skb->truesize
      net: constify some ppp/pptp structs
      ipv6: addrconf.h cleanups
      net: return operator cleanup
      ip: take care of last fragment in ip_append_data
      net: propagate NETIF_F_HIGHDMA to vlans
      net: skb_frag_t can be smaller on small arches
      drivers/net: return operator cleanup
      net: update SOCK_MIN_RCVBUF
      rps: allocate rx queues in register_netdevice only
      net: fix rcu use in ip_route_output_slow
      net: loopback driver cleanup
      vlan: use this_cpu_ptr() in vlan_skb_recv()
      tunnels: prepare percpu accounting
      ip_gre: percpu stats accounting
      ipip: percpu stats accounting
      sit: percpu stats accounting
      fib: use atomic_inc_not_zero() in fib_rules_lookup
      net: sk_{detach|attach}_filter() rcu fixes
      net: add a recursion limit in xmit path
      dummy: percpu stats and lockless xmit
      ipip: fix percpu stats accounting
      sit: fix percpu stats accounting
      sit: enable lockless xmits
      ip_gre: lockless xmit
      ipip: enable lockless xmits
      ip6tnl: percpu stats accounting
      net: rename netdev rx_queue to ingress_queue
      ip_gre: comments change
      ipv4: __mkroute_output() speedup
      ipv4: introduce __ip_dev_find()
      ipv4: rcu conversion in ip_route_output_slow
      neigh: reorder fields in struct neighbour
      ipmr: __pim_rcv() is called under rcu_read_lock
      ipmr: RCU conversion of mroute_sk
      ipmr: RCU protection for mfc_cache_array
      ipmr: cleanups
      net: introduce DST_NOCACHE flag
      netfilter: ipt_LOG: add bufferisation to call printk() once
      net: dynamic ingress_queue allocation
      fib: cleanups
      net: add a core netdev->rx_dropped counter
      net neigh: neigh_delete() and neigh_add() changes
      net neigh: RCU conversion of neigh hash table
      fib: RCU conversion of fib_lookup()
      neigh: RCU conversion of struct neighbour
      sundance: get_stats proper locking
      neigh: speedup neigh_hh_init()
      neigh: Protect neigh->ha[] with a seqlock
      net dst: use a percpu_counter to track entries
      neigh: reorder struct neighbour fields
      net: percpu net_device refcount
      r8169: use 50% less ram for RX ring
      net: allocate skbs on local node
      fib6: use FIB_LOOKUP_NOREF in fib6_rule_lookup()
      fib: remove a useless synchronize_rcu() call
      fib_trie: use fls() instead of open coded loop
      fib: avoid false sharing on fib_table_hash
      netns: reorder fields in struct net
      fib_hash: embed initial hash table in fn_zone
      fib_hash: RCU conversion phase 1
      fib_hash: RCU conversion phase 2
      igb: fix stats handling
      net: avoid a dev refcount in ip_mc_find_dev()
      inet: RCU changes in inetdev_by_index()
      net: avoid RCU for NOCACHE dst
      net/sched: fix missing spinlock init
      fib: introduce fib_alias_accessed() helper
      ixgbe: fix stats handling
      l2tp: small cleanup

Fabio Rossi (1):
      ath5k: avoid unneeded calibration error messages

Felix Fietkau (48):
      mac80211: fix driver offchannel notification when the channel does not change
      ath9k: add a separate debug level for stuck beacons
      ath9k_hw: apply the noise floor validation to the median instead of single
      ath9k: use AP beacon miss as a trigger for fast recalibration
      ath9k: shorten the calibration interval during strong interference
      ath9k: fix spurious MIC failure reports
      ath9k: fix BSSID mask calculation
      mac80211: add a note about iterating interfaces during add_interface()
      ath9k_hw: handle rx key miss
      ath9k_hw: remove useless hw capability flags
      ath9k: clean up block ack window handling
      ath9k: fix an aggregation start related race condition
      ath9k: clean up / fix aggregation session flush
      ath9k: move ath_tx_aggr_check() to the rate control module
      ath9k: make the driver specific rate control module optional
      ath9k_hw: simplify revision checks for AR9280
      ath9k_hw: simplify revision checks for AR9285
      ath9k_hw: simplify revision checks for AR9287
      ath9k_htc: remove use of common->ani.noise_floor
      ath9k_hw: keep calibrated noise floor values per channel
      ath9k: do not return default noise floor values via survey
      ath9k: remove the noise floor value in the ani struct
      nl80211: allow drivers to indicate whether the survey data channel is in use
      ath9k: return survey data for all channels instead of just the current one
      ath9k: fix channel flag / regd issues with multiple cards
      ath9k_hw: remove some useless calibration data
      ath9k_hw: clean up calibration flags
      ath9k_hw: merge codepaths that access the cycle counter registers
      ath9k_hw: clean up register write buffering
      ath9k_hw: add a helper function to check for the new ANI implementation
      ath9k_hw: clean up ANI state handling
      ath9k_hw: remove code duplication in phy error counter handling
      ath9k_hw: remove function pointer abstraction for internal ANI ops
      ath9k_hw: merge ath9k_hw_ani_monitor_old and ath9k_hw_ani_monitor_new
      ath9k_hw: store the clock rate in common data on channel changes
      ath5k: store the clock rate in common data on channel changes
      ath9k_hw: move the cycle counter tracking to ath
      ath5k: use the common cycle counter / listen time implementation
      cfg80211: add channel utilization stats to the survey command
      ath9k: add compile time checking for the size of the channel list
      ath9k: implement channel utilization stats for survey
      ath9k: do not track cycle counter updates in powersave mode
      ath9k_hw: fix division by zero in the ANI monitor code
      ath9k_hw: fix PHY counter overflow handling in ANI v1
      ath9k: add missing locking around ath9k_hw_proc_mib_event
      ath9k: make rate control debugfs stats per station
      ath9k: remove sc->cur_rate_table and sc->cur_rate_mode
      ath9k_hw: remove enum wireless_mode and its users

Flavio Leitner (3):
      bonding: rejoin multicast groups on VLANs
      bonding: fix to rejoin multicast groups immediately
      bonding: add retransmit membership reports tunable

Florian Fainelli (9):
      r6040: fix all checkpatch errors and warnings
      cpmac: fix all checkpatch errors and warnings
      au1000-eth: typedefs removal
      au1000-eth: stylistic fixes
      au1000-eth: fix all but one "line over 80 characters warnings"
      au1000-eth: fix bad printk usages
      au1000-eth: fix asm -> linux headers inclusion
      au1000-eth: remove volatiles, switch to I/O accessors
      au1000-eth: change multi-line comments style

Florian Westphal (1):
      tipc: add SO_RCVLOWAT support to stream socket receive path

Frank Blaschka (1):
      qeth: NAPI support for l2 and l3 discipline

Gabor Juhos (1):
      ath9k: get correct tx gain type in ath9k_hw_4k_get_eeprom

Geert Uytterhoeven (1):
      net/m68k: Hydra Ethernet - print whole resource instead of start address

Gerrit Renker (26):
      ccid: ccid-2/3 code cosmetics
      dccp ccid-3: No more CCID control blocks in LISTEN state
      dccp ccid-2: Remove redundant sanity tests
      dccp ccid-2: Simplify dec_pipe and rearming of RTO timer
      dccp ccid-2: Replace broken RTT estimator with better algorithm
      dccp ccid-2: Use u32 timestamps uniformly
      dccp ccid-2: Remove wrappers around sk_{reset,stop}_timer()
      tcp/dccp: Consolidate common code for RFC 3390 conversion
      dccp ccid-2: Share TCP's minimum RTO code
      dccp ccid-3: use per-route RTO or TCP RTO as fallback
      TCP: update initial windows according to RFC 5681
      tcp: update also tcp_output with regard to RFC 5681
      dccp ccid-3: A lower bound for the inter-packet scheduling algorithm
      dccp ccid-3: remove buggy RTT-sampling history lookup
      dccp ccid-3: Simplify and consolidate tx_parse_options
      dccp: Add packet type information to CCID-specific option parsing
      dccp: Replace magic CCID-specific numbers by symbolic constants
      dccp ccid-3: remove dead states
      dccp tfrc/ccid-3: computing the loss rate from the Loss Event Rate
      dccp ccid-3: Remove redundant 'options_received' struct
      dccp: fix the adjustments to AWL and SWL
      dccp: merge now-reduced connect_init() function
      dccp: remove unused argument in CCID tx function
      dccp: schedule an Ack when receiving timestamps
      dccp: cosmetics - warning format
      wext: fix alignment problem in serializing 'struct iw_point'

Giuseppe CAVALLARO (6):
      stmmac: remove dead option in the driver's Kconfig
      stmmac: make ioaddr 'void __iomem *' rather than unsigned long
      stmmac: add CSR Clock range selection
      stmmac: consolidate and tidy-up the COE support
      stmmac: prevent dma init stuck in case of failures.
      stmmac: use one memset() to reset TDES01

Giuseppe Cavallaro (2):
      stmmac: review the wake-up support
      stmmac: remove ifdef NETIF_F_TSO from stmmac_ethtool.c

Grazvydas Ignotas (4):
      wl1251: add missing __packed modifier for some structs
      wl1251: fix event handling mechanism
      wl1251: fix beacon filter table structure
      wl1251: wait for join command complete event

Greg Rose (3):
      ixgbevf: Removed unneeded HW struct members
      ixgbevf: Refactor ring parameter re-size
      igbvf: Remove unneeded pm_qos* calls

Grégoire Baron (1):
      net/sched: add ACT_CSUM action to update packets checksums

Guo-Fu Tseng (5):
      jme: Fix PHY power-off error
      jme: Add comment in jme_set_settings
      jme: Prevent possible read re-order error
      jme: Adding mii-tool support
      jme: Advance version number

Gustavo F. Padovan (4):
      Bluetooth: remove unused variable from cmtp
      Bluetooth: make batostr() print in the right order
      Bluetooth: Use the proper error value from bt_skb_send_alloc()
      Bluetooth: update MAINTAINERS for Bluetooth subsys

Gábor Stefanik (4):
      b43: N-PHY: Implement Host Flags write during device init
      b43: N-PHY: Fix typo in function name (gain_crtl -> gain_ctrl)
      b43: N-PHY: Implement MAC PHY clock set
      b43: N-PHY: Implement RX core state setting for rev.2 and earlier PHYs

Hagen Paul Pfeifer (1):
      tcp: allow effective reduction of TCP's rcv-buffer via setsockopt

Haijun Liu (1):
      Bluetooth: Update conf_state before send config_req out

Hans Schillstrom (1):
      ipvs: IPv6 tunnel mode

Hao Zheng (1):
      bnx2x: Update bnx2x to use new vlan accleration.

Harvey Harrison (3):
      cxgb4vf: make single bit signed bitfields unsigned
      dnet: mark methods static and annotate for correct endianness
      niu: introduce temp variables to avoid sparse warnings when swapping in-situ

Helmut Schaa (32):
      rt2x00: Update comments regarding TXWI and TX_STA_FIFO
      rt2x00: Rename txentry_desc.queue -> txentry_desc.qid
      rt2x00: Update rt2800 comments regarding AMPDU and PACKET_ID in TXWI
      rt2x00: Initialize AMPDU_BA_WINSIZE register
      rt2x00: Check for specific changed flags when updating the erp config
      rt2x00: Mask out unused interrupts in rt2800pci
      rt2x00: Enable missing interrupts in rt61pci
      rt2x00: fix oops in rt2x00lib_txdone with rt61pci
      rt2x00: Don't overwrite beacon buffers in pairwise key setup
      rt2x00: Split out parts of the rt2800_txdone function for easier reuse
      rt2x00: rework tx status handling in rt2800pci
      rt2x00: Fix SM PS check
      rt2x00: Implement HT protection for rt2800
      rt2x00: Don't initialize MM40 HT protection to RTS/CTS on PCI devices
      rt2x00: Fix race between dma mapping and clearing rx entries in rt2800pci
      rt2x00: Allow tx duplication for legacy rates in HT40 mode
      rt2x00: Add register definition for busy time on secondary channel
      rt2x00: add field definitions for the TBTT_SYNC_CFG register
      rt2x00: Don't enable broad- and multicast buffering on USB devices
      mac80211: distinct between max rates and the number of rates the hw can report
      rt2x00: correctly set max_report_rates in rt61pci and rt2800
      rt2x00: Enable rx aggregation in rt2800
      rt2x00: Update comment about the AMPDU flag in the TXWI
      rt2x00: Fix oops caused by error path in rt2x00lib_start
      rt2x00: Improve cooperation between rt2800pci and minstrel
      rt2x00: Work around hw aggregation oddity in rt2800
      rt2x00: Shortcut link state updates when not operating as STA
      rt2x00: Optimize unmapping of skbs
      rt2x00: Use proper type for rxwi_w2 in rt2800_agc_to_rssi
      rt2x00: Use unlikely for error case in rt2x00queue_write_tx_frame
      rt2x00: Remove superfluous initialization of qidx
      rt2x00: Fix tx status handling in rt2800pci

Huang Weiyi (1):
      pxa168_eth: remove duplicated #include

Ian Campbell (1):
      xen: use less generic names in netfront driver.

Ido Yariv (4):
      wl1271: Fix overflow in wl1271_boot_upload_nvs
      wl1271: Handle large SPI transfers
      wl1271: Support firmware RX packet aggregation
      wl1271: Support firmware TX packet aggregation

Ilpo Järvinen (2):
      tcp: sack lost marking fixes
      tcp: use correct counters in CA_CWR state too

Ivo Calado (1):
      dccp: generalise data-loss condition

Ivo van Doorn (31):
      rt2x00: Move USB tx/rx done handling to workqueue
      rt2x00: Set MIMO PS flag in tx descriptor for STAs in dynamic SMPS mode
      rt2x00: Add helper function for reporting tx status
      rt2x00: Request TXWI pointer from driver
      rt2x00: Implement TX status reporting for rt2800usb
      rt2x00: Remove ieee80211_rx_status from rt2x00_dev
      rt2x00: Simplify arguments to rt2x00 driver callback functions
      rt2x00: Reduce indenting
      rt2x00: Move direct access to queue->entries to rt2x00queue.c
      rt2x00: Remove Q_INDEX_CRYPTO and ENTRY_OWNER_DEVICE_CRYPTO
      rt2x00: Fix rt2800 retry calculation
      rt2x00: Merge rt2800{pci/usb} radio enabling/disabling code to rt2800lib
      rt2x00: Fix channel configuration for RF3052
      rt2x00: Fix max TX power settings
      rt2x00: Add rt2800_wait_csr_ready
      rt2x00: Validate TX status results with current data entry
      rt2x00: Wakeup hardware before loading firmware
      rt2x00: Don't set unicast/BSSID masks when clearning MAC or BSSID
      rt2x00: Set PWR_PIN_CFG during initialization
      rt2x00: Correctly kill beacon queue
      rt2x00: Split watchdog check into a DMA and STATUS timeout
      rt2x00: Cleanup rt2x00usb_watchdog_reset_tx
      rt2x00: Add rt73usb device ID
      rt2x00: Improve TX status entry validation
      rt2x00: Simplify Queue function arguments
      rt2x00: Move watchdog work to kernel work_queue
      rt2x00: Validate MCS on RX path
      rt2x00: Fix dead queue when skb allocation failed
      rt2x00: Make queue_entry flags access atomic
      rt2x00: Don't perform watchdog checks on empty queue
      rt2x00: Fix URB error handling

James Hogan (1):
      b44: fix resume, request_irq after hw reset

Jan Engelhardt (5):
      netfilter: xtables: resolve indirect macros 1/3
      netfilter: xtables: resolve indirect macros 2/3
      netfilter: xtables: resolve indirect macros 3/3
      netfilter: xtables: unify {ip,ip6,arp}t_error_target
      netfilter: xtables: remove unused defines

Jan Glauber (1):
      qdio: extend API to allow polling

Jan Kiszka (1):
      CAPI: Silence lockdep warning on get_capi_appl_by_nr usage

Jason Wang (1):
      vhost: max s/g to match qemu

Jay Sternberg (4):
      iwlwifi: enable experimental ucode support
      iwlwifi: move debug options into submenu
      iwlwifi: corrections to debug output of ucode statistics
      iwlwifi: define 100 devices

Jean Delvare (1):
      e1000e: Simplify MSI interrupt testing

Jerry Chu (1):
      tcp: Add TCP_USER_TIMEOUT socket option.

Jesse Brandeburg (5):
      e1000: fix Tx hangs by disabling 64-bit DMA
      e1000: use work queues
      e1000: fix occasional panic on unload
      e1000: use GRO for receive
      e1000e: use hardware writeback batching

Jesse Gross (12):
      ebtables: Allow filtering of hardware accelerated vlan frames.
      vlan: Rename VLAN_GROUP_ARRAY_LEN to VLAN_N_VID.
      vlan: Don't check for vlan group before vlan_tx_tag_present.
      vlan: Enable software emulation for vlan accleration.
      vlan: Avoid hash table lookup to find group.
      vlan: Centralize handling of hardware acceleration.
      ethtool: Add support for vlan accleration.
      bridge: Add support for TX vlan offload.
      bnx2: Update bnx2 to use new vlan accleration.
      ixgbe: Update ixgbe to use new vlan accleration.
      vlan: Calling vlan_hwaccel_do_receive() is always valid.
      bnx2/bnx2x: Unsupported Ethtool operations should return -EINVAL.

Jiri Pirko (1):
      vlan: Use vlan_dev_real_dev in vlan_hwaccel_do_receive

Jiri Slaby (3):
      NET: bna, fix lock imbalance
      NET: pch, fix use after free
      WIRELESS: at76c50x, remove unneeded NULL check

Joe Perches (27):
      pcnet_cs: Use pr_fmt and pr_<level>
      drivers/net: Convert unbounded kzalloc calls to kcalloc
      drivers/net/pcmcia: Use pr_<level> and netdev_<level>
      drivers/net/sungem: Use netdev_<level>, netif_<level> and pr_<level>
      drivers/net/sunvnet.c: Use pr_<level> and netdev_<level>
      include/linux/if_ether.h: Remove unused #define MAC_FMT
      net/mac80211: Use wiphy_<level>
      MAINTAINERS: add info for include/linux/spi/wl12xx.h
      drivers/net: Remove address use from assignments of function pointers
      net/sctp: Use pr_fmt and pr_<level>
      drivers/net/jme: Use pr_<level>
      net/caif: Use pr_fmt
      net/caifcaif_dev.c: Use netdev_<level>
      include/net/raw.h: Convert raw_seq_private macro to inline
      qeth: Use %pI6
      drivers/net/ixgbe/ixgbe_main.c: Checkpatch cleanups
      drivers/net/ixgbe/ixgbe_main.c: Use pr_<level>
      drivers/net/ixgbe/ixgbe_main.c: Add ixgbe_psum
      drivers/net/skfp: Remove pr_<level> uses of KERN_<level>
      drivers/isdn: Use static const char * const where possible
      drivers/net: Use static const char * const where possible
      drivers/net/pcmcia: Use static const char * const where possible
      drivers/net/wireless: Use static const char * const where possible
      net/irda: Use static const char * const where possible
      include/net/cfg80211.h: wiphy_<level> messages use dev_printk
      ath5k: fix build break from "ath5k: Print out opmode in debugfs"
      drivers/net/pch_gbe: Use DEFINE_PCI_DEVICE_TABLE

Johan Hedberg (1):
      Bluetooth: Don't clear the blacklist when closing the HCI device

Johannes Berg (146):
      mac80211: don't check rates on PLCP error frames
      mac80211: unify scan and work mutexes
      iwlwifi: track IBSS manager status
      cfg80211: deauth doesn't always imply disconnect
      mac80211: per interface idle notification
      mac80211: allow drivers to request SM PS mode change
      cfg80211: support sysfs namespaces
      mac80211: use cipher suite selectors
      mac80211: move key tfm setup
      mac80211: remove unused status flag checks
      mac80211: dont advertise WEP if unavailable
      cfg80211: check if WEP is available for shared key auth
      cfg80211: mark ieee80211_hdrlen const
      mac80211: remove unused don't-encrypt flag
      cfg80211/mac80211: extensible frame processing
      wireless: move documentation books
      mac80211-hwsim: allow configuring IBSS
      iwlwifi: refactor iwl_setup_rxon_timing
      mac80211: fix docbook
      nl80211: some documentation fixes
      iwlagn: do not check for AP mode for WEP keys
      iwlwifi: do not spuriously call ieee80211_scan_completed
      cfg80211: add some documentation
      iwlwifi: add 6000g2b BT coexist API
      iwlagn: implement advance BT config command
      iwlagn: set BT IGNORE for some frames
      iwlwifi: add BT notification support for bt coex
      iwlagn: let bluetooth traffic load impact rate scale
      iwlwifi: reset BT when going down
      iwlagn: disable gen2b BT coexistence in IBSS
      iwlagn: keep BT settings across restart
      iwlwifi: use antenna A only under high BT load
      iwlwifi: disable aggregation queue if stopped early
      nl80211: fix missing nesting
      mac80211: fix mesh advertisement
      iwlwifi: initial contextification
      iwlwifi: prepare for PAN queue/fifo assignment
      iwlwifi: define PAN queues/FIFOs
      iwlwifi: contextify broadcast station
      iwlwifi: contextify-stations-completely
      iwlwifi: contextify command sending
      iwlwifi: move QoS into context
      iwlwifi: add context into tx descriptor
      iwlwifi: move virtual interface pointer into context
      iwlwifi: clamp scanning dwell time to all contexts
      iwlwifi: move AP sta ID to context
      iwlwifi: make hw crypto context aware
      iwlwifi: store default station flags in context
      iwlwifi: add context pointer to station
      iwlwifi: move HT configuration data into context
      iwlwifi: introduce beacon context
      iwlwifi: add PAN API
      iwlagn: detect PAN capability
      iwlagn: remove iw_mode check for beacon
      iwlagn: queue frames according to context
      iwlagn: send RXON timing before associating
      iwlagn: send beacon before committing associated RXON
      iwlwifi: send PAN parameters
      iwlwifi: pass context to iwl_send_rxon_timing
      iwlagn: always send RXON timing
      iwlwifi: follow main beacon interval
      iwlwifi: allow using multiple contexts
      mac80211: remove unused scan expire define
      mac80211: allow scan to complete from any context
      wl12xx: remove unneeded locking
      cfg80211 docbook: remove erronous !A
      cfg80211: allow vendor specific cipher suites
      mac80211: allow vendor specific cipher suites
      cfg80211: allow changing port control protocol
      mac80211: allow changing port control protocol
      mac80211: use subqueue helpers
      mac80211: clean up ifdown/cleanup paths
      mac80211: switch to ieee80211_sdata_running
      mac80211: simplify zero address checks
      mac80211: split out concurrent vif checks
      mac80211: support runtime interface type changes
      mac80211_hwsim: support runtime iftype changes
      mac80211: fix offchannel queue stop
      iwlwifi: fix PAN parameters while scanning
      iwlwifi: implement beacon interval change
      iwlwifi: avoid sending too many commands
      iwlwifi: improve timing handling with dual-mode
      iwlwifi: fix and describe iwl_adjust_beacon_interval
      iwlwifi: remove unused conf variables
      iwlwifi: unify scan start checks
      iwlwifi: move scan completed flags handling
      mac80211: match only assigned bss in sta_info_get_bss
      mac80211: use correct station flags lock
      cfg80211/mac80211: use lockdep_assert_held
      mac80211: set running state earlier
      cfg80211/nl80211: introduce p2p device types
      mac80211: add p2p device type support
      mac80211: remove prepare_for_handlers sdata argument
      mac80211: consolidate packet processing
      mac80211: clean up rx handling wrt. found_sta
      mac80211: fix release_reorder_timeout in scan
      mac80211: move packet flags into packet
      cfg80211: always set IBSS basic rates
      cfg80211/mac80211: allow management frame TX in AP mode
      cfg80211: remove spurious __KERNEL__ ifdef
      cfg80211: fix locking
      genetlink: introduce pre_doit/post_doit hooks
      nl80211: use the new genetlink pre/post_doit hooks
      nl80211: use generic check for netif_running
      nl80211: reduce dumping boilerplate
      mac80211: fix deadlock with multiple interfaces
      nl80211: fix remain-on-channel documentation
      mac80211: avoid transmitting delBA to old AP
      cfg80211/mac80211: allow per-station GTKs
      nl80211: fix error in generic netif_running check
      cfg80211: fix BSS double-unlinking
      mac80211: fix sw scan locking
      nl80211: use new genl helpers for WDS
      cfg80211: constify WDS address
      iwlagn: rename iwl_commit_rxon
      iwlwifi: introduce post_scan hook
      iwl3945: use iwl3945_commit_rxon
      iwlwifi: move chain settings to agn
      iwlwifi: rename iwl_mac_beacon_update
      iwlwifi: remove verify_signature eeprom operation
      iwlwifi: move agn specific station code there
      iwlwifi: move tx fail code to agn
      iwlwifi: remove spurious exports
      iwlwifi: remove agn rates info there
      iwlwifi: move iwl_toggle_rx_ant to agn
      iwlwifi: move iwl_dump_csr to agn
      iwlwifi: move iwl_dump_fh to agn
      iwlwifi: remove set_ct_kill operation
      iwlwifi: remove set_pwr_src operation
      iwlwifi: remove apm_ops.stop
      iwlwifi: clean up declarations
      iwlwifi: remove iwl_check_bits
      iwlwifi: fix dual-mode scanning
      Revert "wireless: Use first phyX name available when registering phy devices."
      mac80211: don't kmalloc 16 bytes
      iwl3945: fix queue allocation
      cfg80211: notify drivers about frame registrations
      mac80211: add probe request filter flag
      mac80211: fix SMPS request
      iwlwifi: allow probe-after-rx on 2.4 GHz
      iwlwifi: rename ibss_beacon variable
      iwlwifi: clean up some beacon handling
      iwlwifi: rewrite RXON checks
      iwlwifi: blink LED in IBSS mode
      iwlagn: check beacon frame size
      radiotap: fix vendor namespace parsing

John Fastabend (2):
      net: netif_set_real_num_rx_queues may cap num_rx_queues at init time
      ixgbe: DCB: remove DCB check config

John Feeney (1):
      bnx2: Add PCI Advanced Error Reporting support.

John Heffner (1):
      TCP: Fix setting of snd_ssthresh in tcp_mtu_probe_success

John W. Linville (44):
      b43: update hw/fw version info in wiphy struct
      b43legacy: update hw/fw version info in wiphy struct
      p54: update fw version info in wiphy struct
      rt2x00: update fw version info in wiphy struct
      zd1211rw: update fw version info in wiphy struct
      mac80211: support use of NAPI for bottom-half processing
      rtl8180: use NAPI for bottom-half processing
      rtl8180: use RTL818X_MSR_ADHOC for IBSS connection
      rtl8187: consolidate MSR writes in rtl8187_bss_info_changed
      wireless: upcase alpha2 values in queue_regulatory_request
      iwlwifi: disable aspm by default
      ipw2100: avoid warning from pointer cast in call to IPW_DEBUG_TX
      iwm3200wifi: remove comparison to WIFI_IF_NTFY_MAX in iwm_ntf_wifi_if_wrapper
      b43: move hwrng registration driver to wireless core initialization
      Merge branch 'master' of git://git.kernel.org/.../linville/wireless-2.6
      rt2x00: do not shortcut rt2x00lib_config_antenna
      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
      Merge branch 'wireless-next-2.6' of git://git.kernel.org/.../iwlwifi/iwlwifi-2.6
      mac80211: cancel scan in ieee80211_restart_hw if software scan pending
      mac80211: only cancel software-based scans on suspend
      Merge branch 'master' of git://git.kernel.org/.../linville/wireless-next-2.6 into for-davem
      wl1271: remove warnings in wl1271_sdio_set_power
      iwlwifi: fix sparse warning about wrong enum for band parameter
      ath9k: make ath_ant_div_conf_fast_divbias static
      libertas: correct sparse warnings
      Merge branch 'master' of git://git.kernel.org/.../linville/wireless-next-2.6 into for-davem
      Merge branch 'master' of git://git.kernel.org/.../linville/wireless-2.6
      Revert "mac80211: fix use-after-free"
      wl12xx: fix separate-object-folder builds
      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
      Merge branch 'wireless-next-2.6' of git://git.kernel.org/.../iwlwifi/iwlwifi-2.6
      Merge branch 'wireless-next' of git://git.kernel.org/.../luca/wl12xx
      Merge branch 'master' of git://git.kernel.org/.../linville/wireless-2.6
      mac80211: avoid uninitialized var warning in ieee80211_scan_cancel
      Revert "rtl8180: use NAPI for bottom-half processing"
      Merge branch 'master' of git://git.kernel.org/.../linville/wireless-2.6
      Merge branch 'wireless-next-2.6' of git://git.kernel.org/.../iwlwifi/iwlwifi-2.6
      Merge branch 'master' of git://git.kernel.org/.../linville/wireless-next-2.6 into for-davem
      Merge branch 'wireless-next' of git://git.kernel.org/.../luca/wl12xx
      Merge branch 'wireless-next-2.6' of git://git.kernel.org/.../iwlwifi/iwlwifi-2.6
      Merge branch 'master' of git://git.kernel.org/.../padovan/bluetooth-next-2.6 into for-davem
      Merge branch 'master' of git://git.kernel.org/.../linville/wireless-next-2.6 into for-davem

Jon Mason (2):
      s2io: remove unused code
      s2io: Update driver version

Joseph Gasparakis (1):
      igb: Add support for DH89xxCC

Jouni Malinen (5):
      mac80211: Fix signal strength average initialization for CQM events
      mac80211: Do not generate CQM events based on first Beacon frames
      mac80211: Filter ProbeReq SuppRates based on TX rate mask
      mac80211: Add DS Parameter Set into Probe Request on 2.4 GHz
      ath9k: Set RX filter for Probe Request based on filter flag

Julia Lawall (31):
      drivers/net/wireless/libertas: Adjust confusing if indentation
      drivers/net/wireless/prism54: Adjust confusing if indentation
      drivers/net/wireless/ath/ath9k: Adjust confusing if indentation
      drivers/net/wan: Adjust confusing if indentation
      net/atm: Adjust confusing if indentation
      drivers/net/irda: Adjust confusing if indentation
      drivers/net: Adjust confusing if indentation
      drivers/atm: Adjust confusing if indentation
      drivers/net: Adjust confusing if indentation
      drivers/net/bnx2x: Adjust confusing if indentation
      drivers/net/hamradio: Adjust confusing if indentation
      drivers/net: Adjust confusing if indentation
      drivers/isdn: Adjust confusing if indentation
      net/decnet: Adjust confusing if indentation
      net/ax25: Use available error codes
      net/ax25: Use available error codes
      drivers/net/qlcnic: Use available error codes
      drivers/net/wireless/wl12xx: Use available error codes
      drivers/net/wireless/wl12xx: Use available error codes
      drivers/net/irda: Eliminate memory leak
      net/netfilter/ipvs: Eliminate memory leak
      drivers/net/atl1c: Remove double test
      net/wireless: Remove double test
      drivers/net/can/mscan/mpc5xxx_can.c: Add of_node_put to avoid memory leak
      drivers/net/fs_enet/fs_enet-main.c: Add of_node_put to avoid memory leak
      net/9p/trans_fd.c: Fix unsigned return type
      drivers/atm/firestream.c: Fix unsigned return type
      drivers/net/wireless/iwlwifi/iwl-agn.c: Fix return value from an unsigned function
      drivers/atm/idt77252.c: Remove unnecessary error check
      drivers/net/wireless/p54/eeprom.c: Return -ENOMEM on memory allocation failure
      drivers/net/ax88796.c: Return error code in failure

Julian Anastasov (18):
      ipvs: use pkts for SCTP too
      ipvs: extend connection flags to 32 bits
      ipvs: netfilter connection tracking changes
      ipvs: make rerouting optional with snat_reroute
      ipvs: changes related to service usecnt
      ipvs: fix CHECKSUM_PARTIAL for TCP, UDP
      ipvs: optimize checksums for apps
      ipvs: switch to notrack mode
      ipvs: do not schedule conns from real servers
      ipvs: stop ICMP from FORWARD to local
      ipvs: fix CHECKSUM_PARTIAL for TUN method
      ipvs: create ip_vs_defrag_user
      ipvs: move ip_route_me_harder for ICMP
      ipvs: changes for local real server
      ipvs: changes for local client
      ipvs: inherit forwarding method in backup
      ipvs: provide address family for debugging
      nf_nat: restrict ICMP translation for embedded header

Julian Calaby (1):
      Hostap: Fix "'ret' set but not used" warning message from GCC in hostap

Juuso Oikarinen (28):
      wl1271: Implement CMD_SET_STA_STATE to indicate connection completion to FW
      wl1271: Add trigger to net_device oper_state to change BT coex priority
      wl1271: Fix scan race condition
      wl1271: Change supported channel order for a more optimal scan
      wl1271: Remove outdated FIXME's
      wl1271: Move setting of wake-up conditions to ps.c from cmd.c
      wl1271: Remove acx_fw_version function
      wl1271: Release interrupt *after* releasing the driver context
      wl1271: Remove function cmd_read_memory
      wl1271: Enable/disable 11a support based on INI configuration
      wl1271: Reduce rate used for last PSM entry attempt
      wl1271: Enable 11a support always, prevent scanning for unsupporting chips
      wl1271: Fix tid-configuration of TX frames
      wl1271: Fix AC/TID default configuration
      wl1271: Move scan complete invocation into work function
      wl1271: Fix work cancelling when shutting down the driver
      wl1271: Separate interface removal to another function
      wl1271: Add hardware recovery mechanism
      wl1271: Add handling for failing hardware scan command
      wl1271: Optimize scan duration
      wl1271: Increase connection reliability
      wl1271: Add support for hardware GEM cipher
      mac80211: Fix WMM driver queue configuration
      wl1271: Move work-init calls to hw allocation
      wl1271: Indicate disconnection on hardware failure
      wl1271: Add extended radio parameter initialization
      mac80211: Add validity check for beacon_crc value
      wl1271: Support FEM autodetection

Kalle Valo (7):
      wl1251: update my email address
      wl12xx: change contact person for the include file
      wl1251: remove copyright contact person
      wl1251: move include guard after the license
      wl1251: create a copy of wl12xx_80211.h for wl1251
      wl1251: move to it's own directory
      wl1251: update the new location to the maintainers file

Karl Beldan (1):
      Bluetooth: hci_uart: Fix typo in stats for sco tx

Krishna Kumar (2):
      core: Factor out flow calculation from get_rps_cpu
      macvtap: Implement multiqueue for macvtap driver

Krzysztof Oledzki (1):
      bonding: add Speed/Duplex information to /proc/net/bonding/bond

Krzysztof Piotr Oledzki (2):
      bonding: print information about speed and duplex seen by the driver
      bonding: reread information about speed and duplex when interface goes up

Kumar Sanghvi (4):
      Phonet: Implement Pipe Controller to support Nokia Slim Modems
      Documentation: Update Phonet doc for Pipe Controller implementation
      Phonet: 'connect' socket implementation for Pipe controller
      Documentation: Update Phonet doc for Pipe controller changes

Lars Ericsson (1):
      rt2x00: Antenna diversity does not work in 2.6.35

Luciano Coelho (5):
      wl1271: remove deprecated ACX definition
      wl1271: remove useless 11a check when scanning
      wl1271: fix forced passive scan
      MAINTAINERS: Update git url for the wl1271 driver
      wl1271: remove deprecated __attribute__ ((packed))

Luis R. Rodriguez (15):
      ath9k: add fastcc to debug print for channel change
      ath9k: remove duplicate get_hw_crypto_keytype()
      ath9k: fix power save race conditions
      ath9k: fix regression on beacon loss after bgscan
      ath9k: fix enabling ANI / tx monitor after bg scan
      mac80211: add helper for reseting the connection monitor
      mac80211: reset probe send counter upon connection timer reset
      mac80211: reset connection idle when going offchannel
      mac80211: make the beacon monitor available externally
      mac80211: disable beacon monitor while going offchannel
      mac80211: send last 3/5 probe requests as unicast
      ath9k: fix regression which disabled ps on ath9k
      mac80211: fix offchannel assumption upon association
      mac80211: fix channel assumption for association done work
      ath9k_hw: remove AR9003 2.0 support

Maciej Żenczykowski (1):
      ipv6: Implement Any-IP support for IPv6.

Marc Kleine-Budde (7):
      can: mcp251x: fix NOHZ local_softirq_pending 08 warning
      can: mcp251x: write intf only when needed
      can: mcp251x: Don't use pdata->model for chip selection anymore
      can: mcp251x: define helper functions mcp251x_is_2510, mcp251x_is_2515
      can: mcp251x: optimize 2515, rx int gets cleared automatically
      can: mcp251x: fix endless loop in interrupt handler if CANINTF_MERRF is set
      can: mcp251x: fix generation of error frames

Martin Schwidefsky (1):
      drivers/net/stmmac/: add HAS_IOMEM dependency

Masayuki Ohtake (1):
      net: Add Gigabit Ethernet driver of Topcliff PCH

Mat Martineau (4):
      Bluetooth: Validate PSM values in calls to connect() and bind()
      Bluetooth: Add common code for stream-oriented recvmsg()
      Bluetooth: Use common SOCK_STREAM receive code in RFCOMM
      Bluetooth: Use a stream-oriented recvmsg with SOCK_STREAM L2CAP sockets.

Matt Carlson (26):
      tg3: Fix read DMA FIFO overruns on recent devices
      tg3: Disable TSS
      tg3: Don't send APE events for NCSI firmware
      tg3: Unlock 5717 B0+ support
      tg3: Clarify semantics of TG3_IRQ_MAX_VECS
      tg3: Move producer ring struct to tg3_napi
      tg3: Use skb_is_gso_v6()
      tg3: Dynamically allocate VPD data memory
      tg3: phy tmp variable roundup
      tg3: Fix potential netpoll crash
      tg3: 5719: Prevent tx data corruption
      tg3: Remove 5724 device ID
      tg3: Cleanup missing VPD partno section
      tg3: Futureproof the loopback test
      tg3: Prepare for larger rx ring sizes
      tg3: Add extend rx ring sizes for 5717 and 5719
      tg3: Update version to 3.114
      tg3: Set real_num_rx_queues for non-multiq devs
      tg3: Add support for selfboot format 1 v6
      tg3: Disable unused transmit rings
      tg3: Add clause 45 register accessor methods
      tg3: Add EEE support
      tg3: Cleanup tg3_alloc_rx_skb()
      tg3: Don't allocate jumbo ring for 5780 class devs
      tg3: Report invalid link from tg3_get_settings()
      tg3: Update version to 3.115

Meelis Roos (1):
      tmspci: fix tr%d in printk

Michael Buesch (1):
      p54spi: Add error message for eeprom failure

Michael Chan (14):
      cnic: Pass cp pointer to BNX2X_HW_CID.
      cnic: Use pfid for internal memory offsets.
      cnic: Fine-tune ring init code.
      bnx2: Update firmware to 6.0.x.
      bnx2: Enable AER on PCIE devices only
      cnic: Add common cnic_request_irq()
      cnic: Convert ctx_flags to bit fields
      cnic: Add cnic_bnx2x_destroy_ramrod()
      cnic: Defer iscsi connection cleanup
      cnic: Add cnic_free_uio()
      cnic: Add cnic_uio_dev struct
      cnic: Decouple uio close from cnic shutdown
      cnic: Add support for 57712 device
      bnx2: Increase max rx ring size from 1K to 2K

Michal Simek (1):
      xilinx_emaclite: netpoll support

Mike Frysinger (1):
      Kconfig: have CCWGROUP depend on CLAW

Mohammed Shafi Shajakhan (2):
      ath9k : Fix for displaying the channel number
      ath9k: Fix documentation in rate control

Namhyung Kim (3):
      net: remove address space warnings in net/socket.c
      net/core: remove address space warnings on verify_iovec()
      net/core: add lock context change annotations in net/core/sock.c

Nathan Holstein (1):
      Bluetooth: fix oops in l2cap_connect_req

Neil Horman (9):
      bonding: Fix bonding drivers improper modification of netpoll structure
      bonding: Fix deadlock in bonding driver resulting from internal locking when using netpoll
      bonding: Fix napi poll for bonding driver
      bonding: Fix netconsole to not deadlock on rmmod
      bonding: Re-enable netpoll over bonding
      netpoll: Remove netpoll blocking from uninit path
      netpoll: Revert napi_poll fix for bonding driver
      Revert c6537d6742985da1fbf12ae26cde6a096fd35b5c
      Revert d88dca79d3852a3623f606f781e013d61486828a

Nick Bowler (1):
      netfilter: install missing ebtables headers for userspace

Nick Kossifidis (2):
      ath5k: rename ath5k_hw_set_associd to _set_bssid
      ath5k: remove own (wrong) IEEE80211_MAX_LEN

Nicolas Kaiser (4):
      netfilter: remove duplicated include
      caif: remove duplicated include
      ehea: simplify conditional
      net/tg3: simplify conditional

Nikitas Angelinas (3):
      drivers/net/bnx2x: use ARRAY_SIZE macro in bnx2x_main.c
      drivers/net/wireless/ath/ath9k: use ARRAY_SIZE macro in ani.c
      net/wireless: use ARRAY_SIZE macro in radiotap.c

Nobuhiro Iwamatsu (2):
      Bluetooth: Add support Bluetooth controller of MacbookPro 6,2
      Bluetooth: Add support Bluetooth controller of MacbookPro 7,1

Ohad Ben-Cohen (11):
      wl1271: sdio: claim host only when doing IO
      wl12xx: make wl12xx.h common to both spi and sdio
      wl1271: propagate set_power's return value
      wl12xx: add platform data passing support
      wl1271: take irq info from private board data
      wl1271: make ref_clock configurable by board
      omap: zoom: add fixed regulator device for wlan
      omap: zoom: add mmc3/wl1271 device support
      wl12xx: fix non-wl12xx build scenarios
      wl1271: sdio: enable runtime PM
      wl1271: sdio: add suspend/resume support

Oliver Hartkopp (2):
      net: simplify flags for tx timestamping
      can-raw: add msg_flags to distinguish local traffic

Ondrej Zary (6):
      introduce cx82310_eth: Conexant CX82310-based ADSL router USB ethernet driver
      cxacru: ignore cx82310_eth devices
      cx82310_eth: check usb_string() return value for error
      cx82310_eth: allow empty URBs
      de2104x: disable media debug messages by default
      de2104x: remove experimental status

Otavio Salvador (1):
      net: r6040: store BIOS default MAC in perm_add

Pablo Neira Ayuso (5):
      netfilter: nf_nat: better error handling of nf_ct_expect_related() in helpers
      netfilter: ctnetlink: missing validation of CTA_EXPECT_ZONE attribute
      netfilter: ctnetlink: allow to specify the expectation flags
      netfilter: ctnetlink: add support for user-space expectation helpers
      netfilter: ctnetlink: add expectation deletion events

Patrick McHardy (2):
      netfilter: add missing xt_log.h file
      Merge branch 'for-patrick' of git://git.kernel.org/.../horms/lvs-test-2.6

Paul Fox (1):
      libertas: Communicate USB transfer errors

Paul Gortmaker (3):
      tipc: Optimize handling excess content on incoming messages
      tipc: clean out all instances of #if 0'd unused code
      3c52x: remove IRQF_SAMPLE_RANDOM from legacy MCA drivers.

Pawel Moll (1):
      stmmac: fix_mac_speed is called during 10/100<->1000 speed changes

Peter Meerwald (1):
      net: Improve comments in include/linux/phy.h

Peter Waskiewicz (1):
      ixgbe: Use affinity_hint when Flow Director is enabled

Philip Rakity (1):
      net: pxa168_etc.c recognize additional contributors

Rafał Miłecki (12):
      b43: N-PHY: add missing phyrxchain setting and fix warning in RX core function
      b43: N-PHY: simplify channel switching
      b43: define B43_SHM_SH_CHAN_40MHZ
      b43: N-PHY: don't duplicate setting channel in shared memory
      b43: N-PHY: grab more info about new channel
      b43: N-PHY: store info about current channel's type
      b43: N-PHY: fix logic in band switching
      b43: N-PHY: prepare for rev3+ channel tables
      b43: N-PHY: replace N-specific radio_chanspec with common code
      b43: N-PHY: fix typo: read table when caching IQ LO calibration (do not write)
      b43: N-PHY: put radio-specific code in separated file
      b43: N-PHY: put 2056-radio's specific code in separated file

Rajesh Borundia (12):
      qlcnic: fix for setting function modes
      qlcnic: configure port on eswitch
      qlcnic: configure offload setting on eswitch
      qlcnic: eswitch config fixes
      qlcnic: add api version in reg dump
      qlcnic: fix mac addr read
      qlcnic: fix for setting default eswitch config
      qlcnic: fix mac anti spoof policy
      qlcnic: fix panic while using eth_hdr
      qlcnic: fix mac override capability
      qlcnic: fix promiscous mode for VF
      netxen: fix race in tx stop queue

Rajkumar Manoharan (12):
      ath9k_htc: Enable ANI in associated state only
      ath9k_htc: Enable fastcc for HTC devices.
      ath9k_hw: Restore ANI registers to default during partial reset for AR9271
      ath9k_hw: Support fastcc for AR7010
      ath9k_htc: Fix memory leak on WMI event handler
      ath9k_htc: Fix CPU usage issue during scan period
      ath9k_hw: remove warning in ath9k_hw_def_get_num_ant_config
      ath9k_htc: Fix register read through bulk pipe
      ath9k_htc: Fix beacon distribution in IBSS mode
      ath9k_htc: Fix TKIP disconnect failure with HTC drivers
      ath9k_hw: Fix hw reset failure with HTC driver
      ath9k_htc: set probe request rx filter

Randy Dunlap (4):
      pch_gbe: add header files
      infiniband: fix mlx4 kconfig dependency warning
      net: move MII outside of NET_ETHERNET, fix kconfig warning
      netfilter: fix kconfig unmet dependency warning

Rasesh Mody (4):
      bna: Brocade 10Gb Ethernet device driver
      bna: Fixed build break for allyesconfig
      bna: fix interrupt handling
      bna: scope and dead code cleanup

Roel Kluin (1):
      irda: Test index before read in stir421x_patch_device()

Roopa Prabhu (7):
      enic: Add set mac address
      enic: Add support for firmware management device
      enic: Add new firmware devcmds
      enic: Use offsetof macro in vic tlv length calculation
      enic: Clean up: remove enic_dev_stats_clear
      enic: Check if rq/wq buf not NULL before freeing them
      enic: Mark intr_timer in vnic_enet_config as deprecated

Rémi Denis-Courmont (14):
      Phonet: restore flow control credits when sending fails
      Phonet: correct sendmsg() error code from sock_alloc_send_skb()
      Phonet: do not set POLLOUT in case of send buffer overflow
      Phonet: remove dangling pipe if an endpoint is closed early
      Phonet: resource routing backend
      Phonet: hook resource routing to userspace via ioctl()'s
      Phonet: look up the resource routing table when forwarding
      Phonet: list subscribed resources via proc_fs
      Phonet: resource routing documentation
      Phonet: restore flow control credits when sending fails
      Phonet: add to MAINTAINERS and add myself
      Phonet: advise against enabling the pipe controller
      Phonet: cleanup pipe enable socket option
      Phonet: mark the pipe controller as EXPERIMENTAL

Samuel Ortiz (4):
      irda: Remove BKL instances from af_irda.c
      irda: Remove BKL instances from irnet
      irda: Fix parameter extraction stack overflow
      irda: Fix heap memory corruption in iriap.c

Santiago Leon (20):
      ibmveth: Remove integer divide caused by modulus
      ibmveth: batch rx buffer replacement
      ibmveth: Remove LLTX
      ibmveth: Add tx_copybreak
      ibmveth: Add rx_copybreak
      ibmveth: Add scatter-gather support
      ibmveth: Add optional flush of rx buffer
      ibmveth: Remove duplicate checksum offload setup code
      ibmveth: Enable IPv6 checksum offload
      ibmveth: remove procfs code
      ibmveth: Convert to netdev_alloc_skb
      ibmveth: Remove redundant function prototypes
      ibmveth: Convert driver specific debug to netdev_dbg
      ibmveth: Convert driver specific error functions to netdev_err
      ibmveth: Some formatting fixes
      ibmveth: Coding style fixes
      ibmveth: Return -EINVAL on all ->probe errors
      ibmveth: Convert driver specific assert to BUG_ON
      ibmveth: Remove some unnecessary include files
      ibmveth: Update module information and version

Sascha Hauer (3):
      can: mcp251x: increase rx_errors on overflow, not only rx_over_errors
      can: mcp251x: allow to read two registers in one spi transfer
      can: mcp251x: read-modify-write eflag only when needed

Sathya Perla (1):
      be2net: add multiple RX queue support

Senthil Balasubramanian (3):
      ath9k: fix regression which prevents chip sleep after CAB data
      ath9k: remove unnecessary power save flags.
      ath9k: Introduce a wrapper for power save disable.

Shanyu Zhao (8):
      iwlwifi: do not call ieee80211_frequency_to_channel
      iwlwifi: avoid race condition in channel change
      iwlwifi: cleanup iwl_set_rxon_channel()
      iwlwifi: add iwl_nic_ops structure to iwl_ops
      iwlagn: set CSR register for 6050g2 devices
      iwlwifi: send DC calib config to runtime ucode
      iwlagn: fix default calibration table size
      iwlagn: add temperature offset calib for 6000g2

Simon Horman (20):
      bridge: is PACKET_LOOPBACK unlikely()?
      net: increase the size of priv_flags and add IFF_OVS_DATAPATH
      IPVS: ICMPv6 checksum calculation
      IPVS: convert __ip_vs_sched_lock to a spinlock
      IPVS: convert __ip_vs_securetcp_lock to a spinlock
      ipvs: switch to GFP_KERNEL allocations
      net: fix datapath typo
      netfilter: nf_conntrack_sip: Allow ct_sip_get_header() to be called with a null ct argument
      netfilter: nf_conntrack_sip: Add callid parser
      IPVS: compact ip_vs_sched_persist()
      IPVS: Add struct ip_vs_conn_param
      IPVS: Allow null argument to ip_vs_scheduler_put()
      IPVS: ip_vs_{un,}bind_scheduler NULL arguments
      IPVS: Add struct ip_vs_pe
      IPVS: Add persistence engine data to /proc/net/ip_vs_conn
      IPVS: management of persistence engine modules
      IPVS: Allow configuration of persistence engines
      IPVS: Fallback if persistence engine fails
      IPVS: sip persistence engine
      IPVS: ip_vs_dbg_callid() is only needed for debugging

Sjur Braendeland (4):
      caif: Remove buggy re-definition of pr_debug
      caif: Minor fixes in log prints.
      caif: Fix function NULL pointer check.
      caif: Use default send and receive buffer size in caif_socket.

Somnath Kotur (1):
      be2net: Changes to use only priority codes allowed by f/w

Sony Chacko (8):
      qlcnic: fix link status message
      qlcnic: fix link diag test
      qlcnic: remove unused code
      qlcnic: replace magic numbers with defines
      qlcnic: support anti mac spoofing
      qlcnic: firmware initialization update
      qlcnic: Fix missing error codes
      qlcnic: backout firmware initialization update

Sritej Velaga (5):
      qlcnic: PCI ID addition
      qlcnic: cleanup port mode setting
      qlcnic: set mtu lower limit
      qlcnic: fix board description
      qlcnic: change all P3 references to P3P

Stanislaw Gruszka (29):
      iwlwifi: make scan workqueue functions static
      iwlwifi: fix canceling monitor_recover timer
      iwlwifi: cancel scan when down the device
      iwlwifi: report scan completion when abort fail
      iwlwifi: rework iwl_scan_cancel_timeout
      iwlwifi: rewrite scan completion
      iwlwifi: force scan complete after timeout
      iwlwifi: assure we complete scan in scan_abort and scan_check works
      iwlwifi: do not force complete scan too early
      mac80211: wait for scan work complete before restarting hw
      iwlwifi: cleanup scan initiate check
      iwlwifi: use IWL_DEBUG_SCAN for debug scanning
      iwlwifi: apply settings when finishing scan
      iwlwifi: change WARN_ON to IWL_WARN in iwl_mac_add_interface
      mac80211: perform scan cancel in hw reset work
      mac80211: reduce number of __ieee80211_scan_completed calls
      mac80211: keep lock when calling __ieee80211_scan_completed()
      mac80211: assure we also cancel deferred scan request
      mac80211: do not requeue scan work when not needed
      mac80211: compete scan to cfg80211 if deferred scan fail to start
      Revert "iwlwifi: do not perferm force reset while doing scan"
      r8169: check dma mapping failures
      r8169: init rx ring cleanup
      r8169: replace PCI_DMA_{TO,FROM}DEVICE to DMA_{TO,FROM}_DEVICE
      r8169: use pointer to struct device as local variable
      r8169: do not account fragments as packets
      r8169: changing mtu clean up
      r8169: (re)init phy on resume
      r8169: print errors when dma mapping fail

Stephen Hemminger (6):
      tc: add meta match on receive hash
      bridge: fix locking comment
      ray_cs: make data const
      airo: make strings const
      atlx: make strings const
      netfilter: nf_nat: make find/put static

Stephen Rothwell (3):
      net/sched: need to include net/ip6_checksum.h
      IPVS: include net/ip6_checksum.h for csum_ipv6_magic
      net: include inetdevice.h for rcu_dereference_raw api change

Steve Hodgson (1):
      sfc: Make the dmaq size a run-time setting (rather than compile-time)

Steve deRosier (2):
      mac80211: Fix dangling pointer in ieee80211_xmit
      mac80211: Update mesh constants to approved IEEE ANA values

Sucheta Chakraborty (5):
      qlcnic: turn off lro when rxcsum is disabled.
      qlcnic: rom lock recovery
      qlcnic: fix endianess for lro
      qlcnic: fix vlan TSO on big endian machine
      qlcnic: sparse warning fixes

Teemu Paasikivi (1):
      nl80211: Fix exit from nl80211_set_power_save

Tejun Heo (1):
      net/neighbour: cancel_delayed_work() + flush_scheduled_work() -> cancel_delayed_work_sync()

Thomas Graf (3):
      ipv6: add special mode accept_ra=2 to accept RA while configured as router
      ipv6: add special mode forwarding=2 to send RS while configured as router
      ipv6: Update ip-sysctl.txt documentation for recent changes to accept_ra and forwarding

Thomas Klute (2):
      libertas_tf: if_usb.c: Whitespace cleanup
      libertas_tf: if_usb.c: Some more formatting fixes

Tilman Schmidt (9):
      isdn/gigaset: bas_gigaset locking fix
      isdn/gigaset: fix bas_gigaset AT read error handling
      isdn/gigaset: correct bas_gigaset rx buffer handling
      isdn/gigaset: drop obsolete debug option
      isdn/gigaset: bas_gigaset timer cleanup
      isdn/gigaset: try USB reset for bas_gigaset error recovery
      isdn/gigaset: unclog bas_gigaset AT response pipe
      isdn/gigaset: fix bas_gigaset interrupt read error handling
      isdn/gigaset: improve bas_gigaset USB error reporting

Tina Yang (1):
      RDS: Fix corrupted rds_mrs

Tobias Klauser (8):
      am79c961a: Use net_device_stats from struct net_device
      greth: Use return value of register_netdev
      sunhme: Use return value of register_netdev
      ether1: Use net_device_stats from struct net_device
      ether3: Use net_device_stats from struct net_device
      ep93xx_eth: Use net_device_stats from struct net_device
      tehuti: Use net_device_stats from struct net_device
      slip: Use net_device_stats from struct net_device

Tom Herbert (5):
      ipv4: Allow configuring subnets as local addresses
      net: Fix rxq ref counting
      net: fail alloc_netdev_mq if queue count < 1
      net: cleanups in RX queue allocation
      net: allocate tx queues in register_netdevice

Tomas Winkler (1):
      iwlwifi: fix default LQ table in 5.2 band

Tracey Dent (1):
      Drivers: atm: Makefile: replace the use of <module>-objs with <module>-y

Ursula Braun (1):
      qeth: tagging with VLAN-ID 0

Uwe Kleine-König (2):
      net/phy: fix many "defined but unused" warnings
      don't let BCM63XX_PHY depend on non-existant symbol

Vasanthakumar Thiagarajan (4):
      ath9k_hw: Add capability flag for Antenna diversity and combining feature
      ath9k_hw: Add functions to get/set antenna diversity configuration
      ath9k: Implement an algorithm for Antenna diversity and combining
      ath9k: Fix tx struck state with paprd

Vasanthy Kolluri (8):
      enic: Remove dead code
      enic: Make local functions static
      enic: Update MAINTAINERS
      enic: Add support for multiple hardware receive queues
      enic: Make firmware cognizant of the user set mac address
      enic: Replace firmware devcmd CMD_ENABLE with CMD_ENABLE_WAIT
      enic: Change min MTU
      enic: Fix log message

Vivek Natarajan (3):
      ath9k_common: Move bt_stomp to common for sharing with ath9k_htc.
      ath9k_htc: Add support for bluetooth coexistence.
      ath9k: Change the default LED pattern.

Vladislav Zolotarov (2):
      bnx2x: Optimized the branching in the bnx2x_rx_int()
      bnx2x: prevent false parity error in MSI-X memory of HC block

Wey-Yi Guy (62):
      iwlwifi: make iwl_hw_detect static to _agn
      iwlagn: log pci revision id
      iwlwifi: make iwl_set_hw_params static to _agn
      iwlwifi: separate thermal throttling function
      iwlwifi: fix thermal throttling related power management operation
      iwlwifi: remove unused define
      iwlwifi: additional comments in iwl_cfg
      iwlwifi: max/min aggregation time limit
      iwlwifi: make aggregation time limit configurable
      iwlagn: adjust starting action for rate scale
      iwlagn: continue perform rate scale when error detected
      iwlwifi: additional parameter in REPLY_RX_PHY_CMD
      iwlwifi: more generic name for rssi calc in iwlagn
      iwlwifi: configurable ampdu factor and density
      iwlwifi: remove unused iwl_send_card_state function
      mac80211: fix warning for un-used parameter
      iwlwifi: update out-of-date comments
      iwlwifi: comments cleanup
      iwlwifi: Relax uCode timeout/error checking for 6000g2b
      iwlwifi: add bt full concurrency support
      iwlagn: wifi/bt coex configuration sequence
      iwlwifi: indicate bt_kill condition when receive tx reply
      iwlwifi: add debugfs to control stuck queue timer
      iwlwifi: add bt_init_traffic_load as configurable parameter
      iwlagn: add bt prio_boost to .cfg
      iwlagn: parsing uart message and take actions
      iwlagn: add additional bt related parameters
      iwlagn: add bt_ch_announce module parameter
      iwlagn: set traffic load based on multiple factors
      iwlagn: generic bt coex functions
      iwlagn: update bt status upon scan complete
      iwlwifi: add bt traffic load debugfs file
      iwlwifi: fix compile error without debugging support
      iwlagn: open/close envlope to force move BT state machine
      iwlwifi: remember the last uCode sysassert error code
      iwlwifi: allow configure protection mode
      iwlwifi: make sure runtime calibration is enabled after association
      iwlwifi: remove code repetition
      iwlagn: add bt_status_read for 5150
      iwlagn: keep track fail tx reason counter
      iwlagn: keep track of failure tx status
      iwlagn: log aggregation tx command status
      iwlagn: keep track of aggregated tx frames failure counter
      iwlagn: adding aggregated frame failure status to debugfs
      iwlagn: correct naming for failure reply tx status
      iwlagn: minor coex API changes
      iwlagn: initialize both tx/rx prio boost parameters
      iwlagn: API v5 for 6050 series device
      iwlwifi: schedule to deprecate software scan support
      iwlagn: reduce redundant parameter definitions
      iwlagn: rename iwl5000_tx_power_dbm_cmd
      iwlwifi: remove uncorrect comments
      iwlagn: rename iwl5000_tx_resp
      iwlagn: define 130 series of WiFi/BT combo devices
      iwlagn: fix module firmware name for 130 series device
      iwlagn: add define for MODULE_FIRMWARE
      iwlagn: no version check for experimental uCode
      iiwlagn: always download priority table
      iwlagn: prio_tbl need to download before calibration
      iwlgn: need longer tx queue stuck timer for coex devices
      iwlagn: 6050 ops should be used;
      iwlwifi: move agn only eeprom functions to separate file

Wolfram Sang (1):
      pcnet_cs: Use proper netdev_*-printouts

Yaniv Rosner (18):
      bnx2x: Fix potential link issue of BCM8073/BCM8727
      bnx2x: Fix potential link issue In BCM8727 based boards
      bnx2x: Reset link before any new link settings
      bnx2x: Change BCM848xx configuration according to IEEE
      bnx2x: Remove unneeded setting of XAUI low power to BCM8727
      bnx2x: Change BCM848xx LED configuration
      bnx2x: Add BCM84823 to the supported PHYs
      bnx2x: Update version to 1.52.53-5
      bnx2x: Unify PHY attributes
      bnx2x: Split PHY functions
      bnx2x: Adjust alignment of split PHY functions
      bnx2x: Adjust flow-control with the new scheme
      bnx2x: Move common function into aggregated function
      bnx2x: Apply logic changes for the new scheme
      bnx2x: Organize PHY functions
      bnx2x: Add dual-media changes
      bnx2x: Change LED scheme for dual-media
      bnx2x: Update bnx2x version to 1.52.53-6

Yevgeny Petrilin (16):
      mlx4_en: Fixed incorrect unmapping on RX flow.
      mlx4_en: Setting actual RX ring size
      mlx4_en: Setting dev->perm_addr field
      mlx4_en: performing CLOSE_PORT at the end of tear-down process
      mlx4_en: Fixed MAX_TX_RINGS definition
      mlx4_en: Reporting link state with KERN_INFO
      mlx4_en: Validate port up prior to transmitting
      mlx4_en: Added self diagnostics test implementation
      mlx4_en: Fixing report in Ethtool get_settings
      mlx4_en: get/set ringsize uses actual ring size
      mlx4_en: reconfiguring mac address.
      mlx4_en: UDP RSS support
      mlx4_en: Moving to work with GRO
      mlx4_en: updated driver version
      mlx4_en: Consider napi_get_frags() failure.
      mlx4_en: Fixed Ethtool statistics report

Yi Zou (2):
      e1000/e1000e/igb/ixgb/ixgbe: set NETIF_F_HIGHDMA for VLAN feature flags
      ixgbe: add a refcnt when turning on/off FCoE offload capability

Yuri Kululin (1):
      Bluetooth: Fix RFCOMM RPN negotiation

Zach Brown (23):
      RDS/IB: rds_ib_cm_handle_connect() forgot to unlock c_cm_lock
      RDS/IB: get the xmit max_sge from the RDS IB device on the connection
      RDS/IB: add refcount tracking to struct rds_ib_device
      RDS: introduce rds_conn_connect_if_down()
      RDS/IB: disconnect when IB devices are removed
      rds: remove unused rds_send_acked_before()
      rds: block ints when acquiring c_lock in rds_conn_message_info()
      rds: fix rds_send_xmit() serialization
      RDS/IB: wait for IB dev freeing work to finish during rmmod
      RDS/IB: destroy connections on rmmod
      RDS/IB: create a work queue for FMR flushing
      RDS: return to a single-threaded krdsd
      RDS/IB: always process recv completions
      RDS: remove __init and __exit annotation
      RDS/IB: track signaled sends
      RDS/IB: print IB event strings as well as their number
      RDS/IB: protect the list of IB devices
      RDS: lock rds_conn_count decrement in rds_conn_destroy()
      RDS: remove old rs_transport comment
      RDS: have sockets get transport module references
      RDS: don't call rds_conn_shutdown() from rds_conn_destroy()
      RDS: cancel connection work structs as we shut down
      RDS/IB: print string constants in more places

amit salecha (2):
      qlcnic: update ethtool stats
      netxen: mask correctable error

andrew hendry (5):
      X.25 remove bkl in listen
      X.25 remove bkl in bind
      X.25 remove bkl in connect
      X.25 remove bkl in getsockname
      X.25 remove bkl in poll

ext Anand Gadiyar (1):
      omap: zoom2/3: fix build caused by wl1271 support

françois romieu (1):
      via-velocity: forced 1000 Mbps mode support.

stephen hemminger (33):
      ethtool: allow non-netadmin to query settings
      bridge: avoid ethtool on non running interface
      net: make rx_queue sysfs_ops const
      wan: make read-only data const
      pkt_sched: remov unnecessary bh_disable
      sky2: enable GRO by default
      arp: remove unnecessary export of arp_broken_ops
      tcp: tcp_enter_quickack_mode can be static
      gre: protocol table can be static
      qlcnic: remove dead code
      wimax: make functions local
      fib: fib_rules_cleanup can be static
      ipv6: make __ipv6_isatap_ifid static
      dccp: Kill dead code and add static markers.
      tipc: cleanup function namespace
      stmmac: make ethtool functions local
      stmmac: make function tables const
      netxen: make local function static.
      socket: localize functions
      bridge: make br_parse_ip_options static
      sfc: make functions static
      bonding: make bond_resend_igmp_join_requests_delayed static
      vmxnet3: make bit twiddle routines inline
      pch_gbe: make local functions static
      xfrm6: make xfrm6_tunnel_free_spi local
      rtnetlink: remove rtnl_kill_links
      xfrm: make xfrm_bundle_ok local
      bonding: make release_and_destroy static
      cxgb4: function namespace cleanup (v3)
      napi: unexport napi_reuse_skb
      rds: make local functions/variables static
      9p: client code cleanup
      cxgb3: function namespace cleanup

 Documentation/DocBook/80211.tmpl                   |  495 +
 Documentation/DocBook/Makefile                     |    2 +-
 Documentation/DocBook/mac80211.tmpl                |  337 -
 Documentation/feature-removal-schedule.txt         |    9 +
 Documentation/networking/bonding.txt               |    8 +
 Documentation/networking/can.txt                   |   12 +
 Documentation/networking/dccp.txt                  |   29 +-
 Documentation/networking/ip-sysctl.txt             |   27 +-
 Documentation/networking/phonet.txt                |   56 +
 Documentation/networking/timestamping.txt          |   22 +-
 MAINTAINERS                                        |   62 +-
 arch/arm/mach-omap2/board-omap3pandora.c           |    2 +-
 arch/arm/mach-omap2/board-rx51-peripherals.c       |    2 +-
 arch/arm/mach-omap2/board-zoom-peripherals.c       |   54 +
 arch/s390/include/asm/qdio.h                       |   13 +-
 drivers/atm/Makefile                               |    2 +-
 drivers/atm/firestream.c                           |    4 +-
 drivers/atm/horizon.c                              |    6 +-
 drivers/atm/idt77252.c                             |    6 +-
 drivers/atm/iphase.c                               |    2 +-
 drivers/bluetooth/btmrvl_main.c                    |    4 +-
 drivers/bluetooth/btsdio.c                         |    8 +
 drivers/bluetooth/btusb.c                          |    6 +
 drivers/bluetooth/hci_ldisc.c                      |    2 +-
 drivers/firewire/net.c                             |   13 -
 drivers/ieee1394/eth1394.c                         |   16 -
 drivers/infiniband/hw/mlx4/Kconfig                 |    1 +
 drivers/infiniband/hw/nes/nes_cm.c                 |    4 +-
 drivers/infiniband/hw/nes/nes_verbs.c              |    4 +-
 drivers/isdn/capi/capidrv.c                        |   17 +-
 drivers/isdn/capi/kcapi.c                          |   19 +-
 drivers/isdn/divert/isdn_divert.c                  |    6 +-
 drivers/isdn/gigaset/bas-gigaset.c                 |  400 +-
 drivers/isdn/gigaset/common.c                      |   26 -
 drivers/isdn/gigaset/gigaset.h                     |    3 +-
 drivers/isdn/gigaset/i4l.c                         |    2 -
 drivers/isdn/gigaset/isocdata.c                    |    8 +-
 drivers/isdn/hardware/eicon/debug.c                |    2 +-
 drivers/isdn/hardware/eicon/debuglib.h             |    2 +-
 drivers/isdn/hisax/hfc_sx.c                        |   13 +-
 drivers/isdn/i4l/isdn_tty.c                        |   15 +-
 drivers/isdn/mISDN/dsp_cmx.c                       |    1 +
 drivers/isdn/mISDN/l1oip_core.c                    |    2 +-
 drivers/isdn/mISDN/stack.c                         |    7 -
 drivers/isdn/pcbit/edss1.c                         |    2 +-
 drivers/isdn/pcbit/edss1.h                         |    2 +-
 drivers/net/3c503.c                                |    8 +-
 drivers/net/3c515.c                                |    6 +-
 drivers/net/3c523.c                                |    4 +-
 drivers/net/3c527.c                                |    2 +-
 drivers/net/3c59x.c                                |    2 +-
 drivers/net/8139cp.c                               |    4 +-
 drivers/net/Kconfig                                |   51 +-
 drivers/net/Makefile                               |    3 +
 drivers/net/acenic.c                               |    2 +-
 drivers/net/amd8111e.c                             |   20 +-
 drivers/net/amd8111e.h                             |    1 -
 drivers/net/appletalk/ipddp.c                      |   10 +-
 drivers/net/appletalk/ltpc.c                       |    2 +-
 drivers/net/arm/am79c961a.c                        |   35 +-
 drivers/net/arm/am79c961a.h                        |    1 -
 drivers/net/arm/ep93xx_eth.c                       |   39 +-
 drivers/net/arm/ether1.c                           |   34 +-
 drivers/net/arm/ether1.h                           |    1 -
 drivers/net/arm/ether3.c                           |   33 +-
 drivers/net/arm/ether3.h                           |    1 -
 drivers/net/atarilance.c                           |   24 +-
 drivers/net/atl1c/atl1c.h                          |    1 -
 drivers/net/atl1c/atl1c_hw.c                       |    2 +-
 drivers/net/atl1c/atl1c_main.c                     |   10 +-
 drivers/net/atl1e/atl1e_main.c                     |    6 +-
 drivers/net/atlx/atl1.c                            |   10 +-
 drivers/net/atlx/atl2.c                            |   12 +-
 drivers/net/atp.c                                  |    2 +-
 drivers/net/au1000_eth.c                           |  313 +-
 drivers/net/au1000_eth.h                           |   42 +-
 drivers/net/ax88796.c                              |    1 +
 drivers/net/b44.c                                  |   21 +-
 drivers/net/bcm63xx_enet.c                         |   62 +-
 drivers/net/bcm63xx_enet.h                         |    1 -
 drivers/net/benet/be.h                             |  100 +-
 drivers/net/benet/be_cmds.c                        |  103 +-
 drivers/net/benet/be_cmds.h                        |   65 +-
 drivers/net/benet/be_ethtool.c                     |  177 +-
 drivers/net/benet/be_main.c                        |  644 +-
 drivers/net/bfin_mac.c                             |   10 +-
 drivers/net/bmac.c                                 |    9 +-
 drivers/net/bna/Makefile                           |   11 +
 drivers/net/bna/bfa_cee.c                          |  291 +
 drivers/net/bna/bfa_cee.h                          |   64 +
 drivers/net/bna/bfa_defs.h                         |  243 +
 drivers/net/bna/bfa_defs_cna.h                     |  223 +
 drivers/net/bna/bfa_defs_mfg_comm.h                |  244 +
 drivers/net/bna/bfa_defs_status.h                  |  216 +
 drivers/net/bna/bfa_ioc.c                          | 1732 +++
 drivers/net/bna/bfa_ioc.h                          |  300 +
 drivers/net/bna/bfa_ioc_ct.c                       |  392 +
 drivers/net/bna/bfa_sm.h                           |   88 +
 drivers/net/bna/bfa_wc.h                           |   69 +
 drivers/net/bna/bfi.h                              |  392 +
 drivers/net/bna/bfi_cna.h                          |  199 +
 drivers/net/bna/bfi_ctreg.h                        |  637 +
 drivers/net/bna/bfi_ll.h                           |  438 +
 drivers/net/bna/bna.h                              |  550 +
 drivers/net/bna/bna_ctrl.c                         | 3261 +++++
 drivers/net/bna/bna_hw.h                           | 1490 ++
 drivers/net/bna/bna_txrx.c                         | 4172 ++++++
 drivers/net/bna/bna_types.h                        | 1128 ++
 drivers/net/bna/bnad.c                             | 3264 +++++
 drivers/net/bna/bnad.h                             |  332 +
 drivers/net/bna/bnad_ethtool.c                     | 1277 ++
 drivers/net/bna/cna.h                              |   81 +
 drivers/net/bna/cna_fwimg.c                        |   64 +
 drivers/net/bnx2.c                                 |  253 +-
 drivers/net/bnx2.h                                 |   25 +-
 drivers/net/bnx2x/bnx2x.h                          |  710 +-
 drivers/net/bnx2x/bnx2x_cmn.c                      | 1017 +-
 drivers/net/bnx2x/bnx2x_cmn.h                      |  593 +-
 drivers/net/bnx2x/bnx2x_dump.h                     |   35 +-
 drivers/net/bnx2x/bnx2x_ethtool.c                  |  432 +-
 drivers/net/bnx2x/bnx2x_fw_defs.h                  |  819 +-
 drivers/net/bnx2x/bnx2x_fw_file_hdr.h              |    1 +
 drivers/net/bnx2x/bnx2x_hsi.h                      | 1778 ++-
 drivers/net/bnx2x/bnx2x_init.h                     |   44 +
 drivers/net/bnx2x/bnx2x_init_ops.h                 |  366 +-
 drivers/net/bnx2x/bnx2x_link.c                     | 9097 +++++++------
 drivers/net/bnx2x/bnx2x_link.h                     |  242 +-
 drivers/net/bnx2x/bnx2x_main.c                     | 6098 +++++---
 drivers/net/bnx2x/bnx2x_reg.h                      |  938 ++-
 drivers/net/bnx2x/bnx2x_stats.c                    |  305 +-
 drivers/net/bnx2x/bnx2x_stats.h                    |    8 +-
 drivers/net/bonding/bond_3ad.c                     |  276 +-
 drivers/net/bonding/bond_main.c                    |  181 +-
 drivers/net/bonding/bond_sysfs.c                   |   52 +
 drivers/net/bonding/bonding.h                      |   34 +-
 drivers/net/bsd_comp.c                             |    2 +-
 drivers/net/can/mcp251x.c                          |  103 +-
 drivers/net/can/mscan/mpc5xxx_can.c                |    8 +-
 drivers/net/cassini.c                              |    6 +-
 drivers/net/chelsio/sge.c                          |    6 +-
 drivers/net/chelsio/subr.c                         |    2 -
 drivers/net/chelsio/vsc7326.c                      |    2 +-
 drivers/net/cnic.c                                 |  955 +-
 drivers/net/cnic.h                                 |  118 +-
 drivers/net/cnic_defs.h                            |  456 +-
 drivers/net/cnic_if.h                              |   23 +-
 drivers/net/cpmac.c                                |   39 +-
 drivers/net/cxgb3/adapter.h                        |    3 -
 drivers/net/cxgb3/common.h                         |   18 -
 drivers/net/cxgb3/cxgb3_defs.h                     |    3 -
 drivers/net/cxgb3/cxgb3_main.c                     |   29 +-
 drivers/net/cxgb3/cxgb3_offload.c                  |   11 +-
 drivers/net/cxgb3/mc5.c                            |   38 -
 drivers/net/cxgb3/regs.h                           |    4 +
 drivers/net/cxgb3/sge.c                            |   45 +-
 drivers/net/cxgb3/t3_hw.c                          |  204 +-
 drivers/net/cxgb4/cxgb4.h                          |   17 +-
 drivers/net/cxgb4/cxgb4_main.c                     |  167 +-
 drivers/net/cxgb4/cxgb4_uld.h                      |    6 -
 drivers/net/cxgb4/l2t.c                            |   34 -
 drivers/net/cxgb4/l2t.h                            |    3 -
 drivers/net/cxgb4/sge.c                            |   19 +-
 drivers/net/cxgb4/t4_hw.c                          |  332 -
 drivers/net/cxgb4/t4_hw.h                          |    1 +
 drivers/net/cxgb4/t4fw_api.h                       |    5 +
 drivers/net/cxgb4vf/cxgb4vf_main.c                 |    5 +-
 drivers/net/cxgb4vf/sge.c                          |    3 +-
 drivers/net/cxgb4vf/t4vf_common.h                  |   26 +-
 drivers/net/de620.c                                |    2 +-
 drivers/net/declance.c                             |    2 +-
 drivers/net/defxx.c                                |   66 +-
 drivers/net/dl2k.c                                 |    2 +-
 drivers/net/dm9000.c                               |    2 +-
 drivers/net/dnet.c                                 |   18 +-
 drivers/net/dummy.c                                |   58 +-
 drivers/net/e100.c                                 |    4 +-
 drivers/net/e1000/e1000.h                          |    3 +
 drivers/net/e1000/e1000_main.c                     |  245 +-
 drivers/net/e1000e/82571.c                         |    6 +-
 drivers/net/e1000e/defines.h                       |    2 +
 drivers/net/e1000e/e1000.h                         |   29 +
 drivers/net/e1000e/es2lan.c                        |    1 +
 drivers/net/e1000e/ethtool.c                       |   23 +-
 drivers/net/e1000e/ich8lan.c                       |    2 +-
 drivers/net/e1000e/netdev.c                        |  149 +-
 drivers/net/e1000e/param.c                         |    2 -
 drivers/net/eepro.c                                |    8 +-
 drivers/net/ehea/ehea.h                            |    2 +
 drivers/net/ehea/ehea_main.c                       |   53 +-
 drivers/net/enic/enic.h                            |   27 +-
 drivers/net/enic/enic_main.c                       |  415 +-
 drivers/net/enic/enic_res.c                        |   32 +-
 drivers/net/enic/enic_res.h                        |    2 +-
 drivers/net/enic/vnic_dev.c                        |  133 +-
 drivers/net/enic/vnic_dev.h                        |   19 -
 drivers/net/enic/vnic_devcmd.h                     |   12 +
 drivers/net/enic/vnic_enet.h                       |    2 +-
 drivers/net/enic/vnic_intr.c                       |    5 -
 drivers/net/enic/vnic_resource.h                   |   13 +
 drivers/net/enic/vnic_rq.c                         |    8 +-
 drivers/net/enic/vnic_rq.h                         |    6 +-
 drivers/net/enic/vnic_rss.h                        |    5 -
 drivers/net/enic/vnic_vic.c                        |    7 +-
 drivers/net/enic/vnic_wq.c                         |    8 +-
 drivers/net/enic/vnic_wq.h                         |    4 -
 drivers/net/epic100.c                              |    2 +-
 drivers/net/eth16i.c                               |   16 +-
 drivers/net/ethoc.c                                |    6 -
 drivers/net/fealnx.c                               |    4 +-
 drivers/net/fec_mpc52xx.c                          |    6 -
 drivers/net/forcedeth.c                            |   19 +-
 drivers/net/fs_enet/fs_enet-main.c                 |    3 +-
 drivers/net/fsl_pq_mdio.c                          |    4 +-
 drivers/net/gianfar.c                              |   26 +-
 drivers/net/gianfar_ethtool.c                      |    6 +-
 drivers/net/greth.c                                |    6 +-
 drivers/net/hamachi.c                              |    2 +-
 drivers/net/hamradio/bpqether.c                    |    2 +-
 drivers/net/hamradio/hdlcdrv.c                     |    2 +-
 drivers/net/hamradio/scc.c                         |    3 +-
 drivers/net/hp.c                                   |    8 +-
 drivers/net/hp100.c                                |    6 +-
 drivers/net/hydra.c                                |   13 +-
 drivers/net/ibm_newemac/core.c                     |    6 +-
 drivers/net/ibm_newemac/core.h                     |    6 +-
 drivers/net/ibmlana.c                              |    2 +-
 drivers/net/ibmveth.c                              |  999 +-
 drivers/net/ibmveth.h                              |   59 +-
 drivers/net/igb/e1000_82575.c                      |   18 +-
 drivers/net/igb/e1000_defines.h                    |   31 +
 drivers/net/igb/e1000_hw.h                         |    2 +
 drivers/net/igb/e1000_phy.c                        |  206 +-
 drivers/net/igb/e1000_phy.h                        |    2 +
 drivers/net/igb/igb.h                              |   11 +-
 drivers/net/igb/igb_ethtool.c                      |   52 +-
 drivers/net/igb/igb_main.c                         |  164 +-
 drivers/net/igbvf/ethtool.c                        |    2 +-
 drivers/net/igbvf/netdev.c                         |   11 +-
 drivers/net/ioc3-eth.c                             |    2 +-
 drivers/net/ipg.c                                  |    6 +-
 drivers/net/irda/donauboe.c                        |    4 +-
 drivers/net/irda/irda-usb.c                        |   10 +-
 drivers/net/irda/mcs7780.c                         |    2 +-
 drivers/net/irda/nsc-ircc.c                        |    2 +-
 drivers/net/irda/sir_dev.c                         |    2 +-
 drivers/net/irda/smsc-ircc2.c                      |    2 +-
 drivers/net/irda/stir4200.c                        |    2 +-
 drivers/net/irda/via-ircc.c                        |    3 +-
 drivers/net/irda/via-ircc.h                        |    2 +-
 drivers/net/irda/vlsi_ir.h                         |    2 +-
 drivers/net/iseries_veth.c                         |    2 +-
 drivers/net/ixgb/ixgb_ee.c                         |   32 +-
 drivers/net/ixgb/ixgb_ethtool.c                    |    2 +-
 drivers/net/ixgb/ixgb_hw.c                         |   14 +-
 drivers/net/ixgb/ixgb_main.c                       |   12 +-
 drivers/net/ixgbe/ixgbe.h                          |   39 +-
 drivers/net/ixgbe/ixgbe_82599.c                    |  234 +-
 drivers/net/ixgbe/ixgbe_common.c                   |   50 +-
 drivers/net/ixgbe/ixgbe_common.h                   |    1 -
 drivers/net/ixgbe/ixgbe_dcb.c                      |  219 -
 drivers/net/ixgbe/ixgbe_dcb.h                      |   18 -
 drivers/net/ixgbe/ixgbe_dcb_82598.c                |   67 +-
 drivers/net/ixgbe/ixgbe_dcb_82598.h                |   15 -
 drivers/net/ixgbe/ixgbe_dcb_82599.c                |   69 +-
 drivers/net/ixgbe/ixgbe_dcb_82599.h                |   18 -
 drivers/net/ixgbe/ixgbe_ethtool.c                  |  428 +-
 drivers/net/ixgbe/ixgbe_fcoe.c                     |   13 +-
 drivers/net/ixgbe/ixgbe_fcoe.h                     |    1 +
 drivers/net/ixgbe/ixgbe_main.c                     | 1972 ++--
 drivers/net/ixgbe/ixgbe_mbx.c                      |   21 +-
 drivers/net/ixgbe/ixgbe_mbx.h                      |    5 +-
 drivers/net/ixgbe/ixgbe_sriov.c                    |   19 +-
 drivers/net/ixgbe/ixgbe_sriov.h                    |   10 +-
 drivers/net/ixgbe/ixgbe_type.h                     |    2 +
 drivers/net/ixgbevf/ethtool.c                      |  153 +-
 drivers/net/ixgbevf/ixgbevf.h                      |    1 -
 drivers/net/ixgbevf/ixgbevf_main.c                 |   36 +-
 drivers/net/ixgbevf/mbx.c                          |    2 +-
 drivers/net/ixgbevf/mbx.h                          |    2 -
 drivers/net/ixgbevf/vf.c                           |    2 +-
 drivers/net/ixgbevf/vf.h                           |    2 -
 drivers/net/jme.c                                  |  167 +-
 drivers/net/jme.h                                  |    6 +-
 drivers/net/ll_temac_main.c                        |    4 +-
 drivers/net/loopback.c                             |   28 +-
 drivers/net/lp486e.c                               |    2 +-
 drivers/net/mac8390.c                              |   48 +-
 drivers/net/macb.c                                 |    2 +-
 drivers/net/macvlan.c                              |    4 +
 drivers/net/macvtap.c                              |   99 +-
 drivers/net/meth.c                                 |    2 +-
 drivers/net/mlx4/Makefile                          |    2 +-
 drivers/net/mlx4/alloc.c                           |   17 +-
 drivers/net/mlx4/en_ethtool.c                      |  173 +-
 drivers/net/mlx4/en_main.c                         |   24 +-
 drivers/net/mlx4/en_netdev.c                       |   31 +-
 drivers/net/mlx4/en_port.c                         |   32 +
 drivers/net/mlx4/en_port.h                         |   14 +
 drivers/net/mlx4/en_rx.c                           |  104 +-
 drivers/net/mlx4/en_selftest.c                     |  179 +
 drivers/net/mlx4/en_tx.c                           |   24 +-
 drivers/net/mlx4/eq.c                              |   44 +
 drivers/net/mlx4/fw.c                              |   15 +
 drivers/net/mlx4/fw.h                              |    6 +
 drivers/net/mlx4/main.c                            |    6 +
 drivers/net/mlx4/mlx4_en.h                         |   39 +-
 drivers/net/mlx4/profile.c                         |    2 +-
 drivers/net/mv643xx_eth.c                          |    3 +-
 drivers/net/myri10ge/myri10ge.c                    |   49 +-
 drivers/net/myri_sbus.c                            |    2 +-
 drivers/net/natsemi.c                              |    2 +-
 drivers/net/netconsole.c                           |    9 +-
 drivers/net/netxen/netxen_nic.h                    |   23 +-
 drivers/net/netxen/netxen_nic_hw.c                 |   43 +-
 drivers/net/netxen/netxen_nic_init.c               |   14 +-
 drivers/net/netxen/netxen_nic_main.c               |   49 +-
 drivers/net/niu.c                                  |  133 +-
 drivers/net/ns83820.c                              |   55 +-
 drivers/net/pasemi_mac.c                           |    2 +-
 drivers/net/pasemi_mac_ethtool.c                   |   16 -
 drivers/net/pch_gbe/Makefile                       |    4 +
 drivers/net/pch_gbe/pch_gbe.h                      |  659 +
 drivers/net/pch_gbe/pch_gbe_api.c                  |  245 +
 drivers/net/pch_gbe/pch_gbe_api.h                  |   36 +
 drivers/net/pch_gbe/pch_gbe_ethtool.c              |  585 +
 drivers/net/pch_gbe/pch_gbe_main.c                 | 2477 ++++
 drivers/net/pch_gbe/pch_gbe_param.c                |  499 +
 drivers/net/pch_gbe/pch_gbe_phy.c                  |  274 +
 drivers/net/pch_gbe/pch_gbe_phy.h                  |   37 +
 drivers/net/pci-skeleton.c                         |    2 +-
 drivers/net/pcmcia/3c574_cs.c                      |   88 +-
 drivers/net/pcmcia/3c589_cs.c                      |   17 +-
 drivers/net/pcmcia/axnet_cs.c                      |  187 +-
 drivers/net/pcmcia/com20020_cs.c                   |   32 +-
 drivers/net/pcmcia/fmvj18x_cs.c                    |   60 +-
 drivers/net/pcmcia/ibmtr_cs.c                      |   26 +-
 drivers/net/pcmcia/nmclan_cs.c                     |   56 +-
 drivers/net/pcmcia/pcnet_cs.c                      |  106 +-
 drivers/net/pcmcia/smc91c92_cs.c                   |  105 +-
 drivers/net/pcmcia/xirc2ps_cs.c                    |  104 +-
 drivers/net/pcnet32.c                              |    4 +-
 drivers/net/phy/Kconfig                            |    1 -
 drivers/net/phy/bcm63xx.c                          |    2 +-
 drivers/net/phy/broadcom.c                         |    2 +-
 drivers/net/phy/cicada.c                           |    2 +-
 drivers/net/phy/davicom.c                          |    2 +-
 drivers/net/phy/et1011c.c                          |    2 +-
 drivers/net/phy/icplus.c                           |    2 +-
 drivers/net/phy/lxt.c                              |    2 +-
 drivers/net/phy/marvell.c                          |   33 +-
 drivers/net/phy/micrel.c                           |    2 +-
 drivers/net/phy/national.c                         |    2 +-
 drivers/net/phy/qsemi.c                            |    2 +-
 drivers/net/phy/realtek.c                          |    2 +-
 drivers/net/phy/smsc.c                             |    2 +-
 drivers/net/phy/ste10Xp.c                          |    2 +-
 drivers/net/phy/vitesse.c                          |    2 +-
 drivers/net/plip.c                                 |    9 +-
 drivers/net/ppp_generic.c                          |   46 +-
 drivers/net/pppoe.c                                |    2 +-
 drivers/net/pppox.c                                |    4 +-
 drivers/net/pptp.c                                 |  726 +
 drivers/net/ps3_gelic_net.c                        |    4 +-
 drivers/net/ps3_gelic_wireless.c                   |    6 +-
 drivers/net/pxa168_eth.c                           |    4 +-
 drivers/net/qla3xxx.c                              |    4 +-
 drivers/net/qlcnic/qlcnic.h                        |  179 +-
 drivers/net/qlcnic/qlcnic_ctx.c                    |  411 +-
 drivers/net/qlcnic/qlcnic_ethtool.c                |  226 +-
 drivers/net/qlcnic/qlcnic_hdr.h                    |   47 +-
 drivers/net/qlcnic/qlcnic_hw.c                     |  131 +-
 drivers/net/qlcnic/qlcnic_init.c                   |  332 +-
 drivers/net/qlcnic/qlcnic_main.c                   | 1310 ++-
 drivers/net/qlge/qlge_main.c                       |   36 +-
 drivers/net/r6040.c                                |   92 +-
 drivers/net/r8169.c                                |  400 +-
 drivers/net/rrunner.c                              |    2 +-
 drivers/net/s2io.c                                 |   39 +-
 drivers/net/s2io.h                                 |    9 -
 drivers/net/sb1250-mac.c                           |    2 +-
 drivers/net/sc92031.c                              |   11 -
 drivers/net/sfc/Makefile                           |    7 +-
 drivers/net/sfc/efx.c                              |  353 +-
 drivers/net/sfc/efx.h                              |   46 +-
 drivers/net/sfc/ethtool.c                          |  181 +-
 drivers/net/sfc/falcon.c                           |  136 +-
 drivers/net/sfc/falcon_boards.c                    |  203 +-
 drivers/net/sfc/falcon_gmac.c                      |  230 -
 drivers/net/sfc/falcon_xmac.c                      |    2 +-
 drivers/net/sfc/filter.c                           |  454 +
 drivers/net/sfc/filter.h                           |  189 +
 drivers/net/sfc/mac.h                              |    2 -
 drivers/net/sfc/mcdi.c                             |    4 +-
 drivers/net/sfc/mcdi.h                             |    2 -
 drivers/net/sfc/mcdi_phy.c                         |    3 +-
 drivers/net/sfc/mdio_10g.c                         |   30 +-
 drivers/net/sfc/net_driver.h                       |  117 +-
 drivers/net/sfc/nic.c                              |  199 +-
 drivers/net/sfc/phy.h                              |   18 +-
 drivers/net/sfc/regs.h                             |   14 +
 drivers/net/sfc/rx.c                               |   73 +-
 drivers/net/sfc/selftest.c                         |   17 +-
 drivers/net/sfc/siena.c                            |    6 +-
 drivers/net/sfc/tenxpress.c                        |  424 +-
 drivers/net/sfc/tx.c                               |   78 +-
 drivers/net/sfc/txc43128_phy.c                     |  560 +
 drivers/net/sfc/workarounds.h                      |    9 +-
 drivers/net/sh_eth.c                               |    4 +-
 drivers/net/sis900.c                               |    8 +-
 drivers/net/skfp/cfm.c                             |   10 +-
 drivers/net/skfp/drvfbi.c                          |   16 +-
 drivers/net/skfp/ess.c                             |   46 +-
 drivers/net/skfp/fplustm.c                         |   24 +-
 drivers/net/skfp/hwmtm.c                           |   30 +-
 drivers/net/skfp/hwt.c                             |    4 +-
 drivers/net/skfp/pcmplc.c                          |   22 +-
 drivers/net/skfp/pmf.c                             |   62 +-
 drivers/net/skfp/queue.c                           |    2 +-
 drivers/net/skfp/skfddi.c                          |  116 +-
 drivers/net/skfp/smt.c                             |   78 +-
 drivers/net/skfp/smtdef.c                          |    4 +-
 drivers/net/skfp/smtinit.c                         |    2 +-
 drivers/net/skfp/srf.c                             |    2 +-
 drivers/net/skge.c                                 |    5 +-
 drivers/net/sky2.c                                 |    5 +-
 drivers/net/slip.c                                 |   93 +-
 drivers/net/slip.h                                 |    9 -
 drivers/net/smsc911x.c                             |    2 +-
 drivers/net/spider_net.c                           |    4 +-
 drivers/net/starfire.c                             |   10 +-
 drivers/net/stmmac/Kconfig                         |    5 +-
 drivers/net/stmmac/common.h                        |   61 +-
 drivers/net/stmmac/dwmac100.h                      |    2 +-
 drivers/net/stmmac/dwmac1000.h                     |    4 +-
 drivers/net/stmmac/dwmac1000_core.c                |   36 +-
 drivers/net/stmmac/dwmac1000_dma.c                 |   20 +-
 drivers/net/stmmac/dwmac100_core.c                 |   31 +-
 drivers/net/stmmac/dwmac100_dma.c                  |   20 +-
 drivers/net/stmmac/dwmac_dma.h                     |   16 +-
 drivers/net/stmmac/dwmac_lib.c                     |   22 +-
 drivers/net/stmmac/enh_desc.c                      |    6 +-
 drivers/net/stmmac/norm_desc.c                     |   21 +-
 drivers/net/stmmac/stmmac.h                        |   13 +-
 drivers/net/stmmac/stmmac_ethtool.c                |   63 +-
 drivers/net/stmmac/stmmac_main.c                   |  216 +-
 drivers/net/stmmac/stmmac_mdio.c                   |   26 +-
 drivers/net/sun3lance.c                            |    4 +-
 drivers/net/sunbmac.c                              |    2 +-
 drivers/net/sundance.c                             |  275 +-
 drivers/net/sungem.c                               |  211 +-
 drivers/net/sungem_phy.c                           |    5 +-
 drivers/net/sunhme.c                               |   10 +-
 drivers/net/sunlance.c                             |    2 +-
 drivers/net/sunqe.c                                |    2 +-
 drivers/net/sunvnet.c                              |   50 +-
 drivers/net/tc35815.c                              |    2 +-
 drivers/net/tehuti.c                               |   34 +-
 drivers/net/tehuti.h                               |    1 -
 drivers/net/tg3.c                                  |  734 +-
 drivers/net/tg3.h                                  |   73 +-
 drivers/net/tlan.c                                 |   10 +-
 drivers/net/tlan.h                                 |    8 +-
 drivers/net/tokenring/proteon.c                    |    2 +-
 drivers/net/tokenring/smctr.c                      |  500 +-
 drivers/net/tokenring/tms380tr.c                   |   64 +-
 drivers/net/tokenring/tmspci.c                     |   10 +-
 drivers/net/tsi108_eth.c                           |    2 +-
 drivers/net/tulip/Kconfig                          |    4 +-
 drivers/net/tulip/de2104x.c                        |    3 +-
 drivers/net/tulip/de4x5.c                          |   57 +-
 drivers/net/tulip/dmfe.c                           |    2 +-
 drivers/net/tulip/interrupt.c                      |   77 +-
 drivers/net/tulip/tulip.h                          |    3 +-
 drivers/net/tulip/tulip_core.c                     |   10 +-
 drivers/net/tulip/uli526x.c                        |    4 +-
 drivers/net/tulip/winbond-840.c                    |    2 +-
 drivers/net/tulip/xircom_cb.c                      |   15 -
 drivers/net/typhoon.c                              |   50 +-
 drivers/net/usb/Kconfig                            |    8 +
 drivers/net/usb/Makefile                           |    1 +
 drivers/net/usb/cx82310_eth.c                      |  346 +
 drivers/net/usb/hso.c                              |    9 -
 drivers/net/usb/kaweth.c                           |    9 -
 drivers/net/usb/sierra_net.c                       |    4 +-
 drivers/net/usb/smsc95xx.c                         |    4 +-
 drivers/net/veth.c                                 |    2 +-
 drivers/net/via-velocity.c                         |   86 +-
 drivers/net/via-velocity.h                         |   16 +-
 drivers/net/virtio_net.c                           |   14 -
 drivers/net/vmxnet3/vmxnet3_drv.c                  |   23 +-
 drivers/net/vmxnet3/vmxnet3_int.h                  |   17 +-
 drivers/net/vxge/vxge-main.c                       |   38 +-
 drivers/net/vxge/vxge-main.h                       |    1 -
 drivers/net/wan/c101.c                             |    2 +-
 drivers/net/wan/cycx_drv.c                         |   14 +-
 drivers/net/wan/cycx_main.c                        |    6 +-
 drivers/net/wan/dlci.c                             |   42 +-
 drivers/net/wan/hdlc_cisco.c                       |    4 +-
 drivers/net/wan/lapbether.c                        |    2 +-
 drivers/net/wan/lmc/lmc_main.c                     |    6 +-
 drivers/net/wan/n2.c                               |    6 +-
 drivers/net/wan/pc300_drv.c                        |   20 +-
 drivers/net/wan/pc300_tty.c                        |    2 +-
 drivers/net/wan/pci200syn.c                        |    2 +-
 drivers/net/wan/sdla.c                             |  108 +-
 drivers/net/wan/x25_asy.c                          |    2 +-
 drivers/net/wan/z85230.c                           |    4 +-
 drivers/net/wd.c                                   |    8 +-
 drivers/net/wimax/i2400m/control.c                 |   18 +-
 drivers/net/wimax/i2400m/driver.c                  |    2 +-
 drivers/net/wimax/i2400m/i2400m-sdio.h             |    1 -
 drivers/net/wimax/i2400m/i2400m.h                  |    9 -
 drivers/net/wimax/i2400m/rx.c                      |    2 +-
 drivers/net/wimax/i2400m/sdio-rx.c                 |    2 +-
 drivers/net/wireless/Kconfig                       |    1 +
 drivers/net/wireless/Makefile                      |    2 +
 drivers/net/wireless/airo.c                        |   24 +-
 drivers/net/wireless/at76c50x-usb.c                |   10 +-
 drivers/net/wireless/ath/Kconfig                   |    1 +
 drivers/net/wireless/ath/Makefile                  |    4 +-
 drivers/net/wireless/ath/ar9170/main.c             |   31 +-
 drivers/net/wireless/ath/ar9170/usb.c              |    2 -
 drivers/net/wireless/ath/ath.h                     |   56 +-
 drivers/net/wireless/ath/ath5k/ani.c               |   47 +-
 drivers/net/wireless/ath/ath5k/ani.h               |    5 +-
 drivers/net/wireless/ath/ath5k/ath5k.h             |   31 +-
 drivers/net/wireless/ath/ath5k/attach.c            |   23 +-
 drivers/net/wireless/ath/ath5k/base.c              | 3621 +++---
 drivers/net/wireless/ath/ath5k/base.h              |   33 +-
 drivers/net/wireless/ath/ath5k/debug.c             |  121 +-
 drivers/net/wireless/ath/ath5k/debug.h             |   15 +-
 drivers/net/wireless/ath/ath5k/dma.c               |    8 +-
 drivers/net/wireless/ath/ath5k/eeprom.c            |    4 +-
 drivers/net/wireless/ath/ath5k/pcu.c               |  297 +-
 drivers/net/wireless/ath/ath5k/phy.c               |   26 +-
 drivers/net/wireless/ath/ath5k/qcu.c               |   99 +-
 drivers/net/wireless/ath/ath5k/reg.h               |   73 +-
 drivers/net/wireless/ath/ath5k/reset.c             |   34 +-
 drivers/net/wireless/ath/ath5k/rfbuffer.h          |    4 +-
 drivers/net/wireless/ath/ath9k/Kconfig             |    8 +
 drivers/net/wireless/ath/ath9k/Makefile            |    5 +-
 drivers/net/wireless/ath/ath9k/ani.c               |  655 +-
 drivers/net/wireless/ath/ath9k/ani.h               |   13 +-
 drivers/net/wireless/ath/ath9k/ar5008_phy.c        |   50 +-
 drivers/net/wireless/ath/ath9k/ar9002_calib.c      |   89 +-
 drivers/net/wireless/ath/ath9k/ar9002_hw.c         |   55 +-
 drivers/net/wireless/ath/ath9k/ar9002_phy.c        |   36 +-
 drivers/net/wireless/ath/ath9k/ar9002_phy.h        |    2 +
 .../net/wireless/ath/ath9k/ar9003_2p0_initvals.h   | 1784 ---
 drivers/net/wireless/ath/ath9k/ar9003_calib.c      |   37 +-
 drivers/net/wireless/ath/ath9k/ar9003_eeprom.c     |    2 +-
 drivers/net/wireless/ath/ath9k/ar9003_hw.c         |  164 +-
 drivers/net/wireless/ath/ath9k/ar9003_mac.c        |    5 +-
 drivers/net/wireless/ath/ath9k/ar9003_phy.c        |   20 +-
 drivers/net/wireless/ath/ath9k/ath9k.h             |   86 +-
 drivers/net/wireless/ath/ath9k/beacon.c            |   28 +-
 drivers/net/wireless/ath/ath9k/btcoex.c            |    7 +
 drivers/net/wireless/ath/ath9k/calib.c             |  152 +-
 drivers/net/wireless/ath/ath9k/calib.h             |   11 +-
 drivers/net/wireless/ath/ath9k/common.c            |  290 +-
 drivers/net/wireless/ath/ath9k/common.h            |   16 +-
 drivers/net/wireless/ath/ath9k/debug.c             |  170 +-
 drivers/net/wireless/ath/ath9k/debug.h             |   33 +-
 drivers/net/wireless/ath/ath9k/eeprom.h            |    7 +-
 drivers/net/wireless/ath/ath9k/eeprom_4k.c         |   28 +-
 drivers/net/wireless/ath/ath9k/eeprom_9287.c       |    8 +-
 drivers/net/wireless/ath/ath9k/eeprom_def.c        |   22 +-
 drivers/net/wireless/ath/ath9k/gpio.c              |   40 +-
 drivers/net/wireless/ath/ath9k/hif_usb.c           |   35 +-
 drivers/net/wireless/ath/ath9k/htc.h               |   42 +-
 drivers/net/wireless/ath/ath9k/htc_drv_beacon.c    |    9 +-
 drivers/net/wireless/ath/ath9k/htc_drv_gpio.c      |  134 +
 drivers/net/wireless/ath/ath9k/htc_drv_init.c      |   74 +-
 drivers/net/wireless/ath/ath9k/htc_drv_main.c      |   51 +-
 drivers/net/wireless/ath/ath9k/htc_drv_txrx.c      |    6 +-
 drivers/net/wireless/ath/ath9k/htc_hst.c           |    4 +-
 drivers/net/wireless/ath/ath9k/htc_hst.h           |    2 +-
 drivers/net/wireless/ath/ath9k/hw-ops.h            |   22 -
 drivers/net/wireless/ath/ath9k/hw.c                |  418 +-
 drivers/net/wireless/ath/ath9k/hw.h                |  116 +-
 drivers/net/wireless/ath/ath9k/init.c              |   76 +-
 drivers/net/wireless/ath/ath9k/mac.c               |   13 +-
 drivers/net/wireless/ath/ath9k/mac.h               |   21 -
 drivers/net/wireless/ath/ath9k/main.c              |  310 +-
 drivers/net/wireless/ath/ath9k/phy.h               |    3 -
 drivers/net/wireless/ath/ath9k/rc.c                |  200 +-
 drivers/net/wireless/ath/ath9k/rc.h                |   37 +-
 drivers/net/wireless/ath/ath9k/recv.c              |  602 +-
 drivers/net/wireless/ath/ath9k/reg.h               |   48 +-
 drivers/net/wireless/ath/ath9k/virtual.c           |   63 +-
 drivers/net/wireless/ath/ath9k/wmi.c               |   74 +-
 drivers/net/wireless/ath/ath9k/wmi.h               |    7 +-
 drivers/net/wireless/ath/ath9k/xmit.c              |  184 +-
 drivers/net/wireless/ath/carl9170/Kconfig          |   41 +
 drivers/net/wireless/ath/carl9170/Makefile         |    4 +
 drivers/net/wireless/ath/carl9170/carl9170.h       |  628 +
 drivers/net/wireless/ath/carl9170/cmd.c            |  188 +
 drivers/net/wireless/ath/carl9170/cmd.h            |  168 +
 drivers/net/wireless/ath/carl9170/debug.c          |  902 ++
 drivers/net/wireless/ath/carl9170/debug.h          |  134 +
 drivers/net/wireless/ath/carl9170/eeprom.h         |  216 +
 drivers/net/wireless/ath/carl9170/fw.c             |  402 +
 drivers/net/wireless/ath/carl9170/fwcmd.h          |  284 +
 drivers/net/wireless/ath/carl9170/fwdesc.h         |  241 +
 drivers/net/wireless/ath/carl9170/hw.h             |  739 +
 drivers/net/wireless/ath/carl9170/led.c            |  190 +
 drivers/net/wireless/ath/carl9170/mac.c            |  604 +
 drivers/net/wireless/ath/carl9170/main.c           | 1891 +++
 drivers/net/wireless/ath/carl9170/phy.c            | 1810 +++
 drivers/net/wireless/ath/carl9170/phy.h            |  564 +
 drivers/net/wireless/ath/carl9170/rx.c             |  938 ++
 drivers/net/wireless/ath/carl9170/tx.c             | 1335 ++
 drivers/net/wireless/ath/carl9170/usb.c            | 1136 ++
 drivers/net/wireless/ath/carl9170/version.h        |    7 +
 drivers/net/wireless/ath/carl9170/wlan.h           |  420 +
 drivers/net/wireless/ath/debug.c                   |   29 +
 drivers/net/wireless/ath/debug.h                   |   12 +
 drivers/net/wireless/ath/hw.c                      |   59 +
 drivers/net/wireless/ath/key.c                     |  568 +
 drivers/net/wireless/ath/reg.h                     |   34 +
 drivers/net/wireless/b43/Makefile                  |    2 +
 drivers/net/wireless/b43/b43.h                     |    3 +-
 drivers/net/wireless/b43/main.c                    |   30 +-
 drivers/net/wireless/b43/phy_common.c              |    6 +-
 drivers/net/wireless/b43/phy_common.h              |    5 +-
 drivers/net/wireless/b43/phy_n.c                   |  211 +-
 drivers/net/wireless/b43/phy_n.h                   |  218 +-
 drivers/net/wireless/b43/radio_2055.c              | 1332 ++
 drivers/net/wireless/b43/radio_2055.h              |  254 +
 drivers/net/wireless/b43/radio_2056.c              |   43 +
 drivers/net/wireless/b43/radio_2056.h              |   42 +
 drivers/net/wireless/b43/tables_nphy.c             | 1311 +--
 drivers/net/wireless/b43/tables_nphy.h             |   59 +-
 drivers/net/wireless/b43legacy/main.c              |    5 +
 drivers/net/wireless/hostap/hostap_ioctl.c         |    2 +-
 drivers/net/wireless/ipw2x00/ipw2100.c             |   10 +-
 drivers/net/wireless/ipw2x00/ipw2200.c             |   20 +-
 drivers/net/wireless/iwlwifi/Kconfig               |   10 +
 drivers/net/wireless/iwlwifi/Makefile              |    1 +
 drivers/net/wireless/iwlwifi/iwl-1000.c            |  119 +-
 drivers/net/wireless/iwlwifi/iwl-3945-hw.h         |    3 +-
 drivers/net/wireless/iwlwifi/iwl-3945-rs.c         |    7 +-
 drivers/net/wireless/iwlwifi/iwl-3945.c            |  191 +-
 drivers/net/wireless/iwlwifi/iwl-3945.h            |   11 +-
 drivers/net/wireless/iwlwifi/iwl-4965.c            |  134 +-
 drivers/net/wireless/iwlwifi/iwl-5000-hw.h         |    2 +-
 drivers/net/wireless/iwlwifi/iwl-5000.c            |  245 +-
 drivers/net/wireless/iwlwifi/iwl-6000-hw.h         |    2 +-
 drivers/net/wireless/iwlwifi/iwl-6000.c            |  754 +-
 drivers/net/wireless/iwlwifi/iwl-agn-calib.c       |   58 +-
 .../iwlwifi/{iwl-calib.h => iwl-agn-calib.h}       |    4 +
 drivers/net/wireless/iwlwifi/iwl-agn-debugfs.c     |  515 +-
 drivers/net/wireless/iwlwifi/iwl-agn-debugfs.h     |    7 +
 drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c      |  454 +
 drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c        |  157 +-
 drivers/net/wireless/iwlwifi/iwl-agn-ict.c         |    2 +-
 drivers/net/wireless/iwlwifi/iwl-agn-lib.c         | 1121 ++-
 drivers/net/wireless/iwlwifi/iwl-agn-rs.c          |  404 +-
 drivers/net/wireless/iwlwifi/iwl-agn-rs.h          |   21 +-
 drivers/net/wireless/iwlwifi/iwl-agn-rx.c          |   35 +-
 drivers/net/wireless/iwlwifi/iwl-agn-sta.c         |  716 +
 drivers/net/wireless/iwlwifi/iwl-agn-tt.c          |  699 +
 drivers/net/wireless/iwlwifi/iwl-agn-tt.h          |  129 +
 drivers/net/wireless/iwlwifi/iwl-agn-tx.c          |  208 +-
 drivers/net/wireless/iwlwifi/iwl-agn-ucode.c       |  118 +-
 drivers/net/wireless/iwlwifi/iwl-agn.c             |  890 +-
 drivers/net/wireless/iwlwifi/iwl-agn.h             |   96 +-
 drivers/net/wireless/iwlwifi/iwl-commands.h        |  585 +-
 drivers/net/wireless/iwlwifi/iwl-core.c            | 1451 +--
 drivers/net/wireless/iwlwifi/iwl-core.h            |  261 +-
 drivers/net/wireless/iwlwifi/iwl-csr.h             |    3 +-
 drivers/net/wireless/iwlwifi/iwl-debugfs.c         |  209 +-
 drivers/net/wireless/iwlwifi/iwl-dev.h             |  257 +-
 drivers/net/wireless/iwlwifi/iwl-eeprom.c          |  393 +-
 drivers/net/wireless/iwlwifi/iwl-eeprom.h          |    8 +-
 drivers/net/wireless/iwlwifi/iwl-hcmd.c            |   13 +-
 drivers/net/wireless/iwlwifi/iwl-helpers.h         |    5 -
 drivers/net/wireless/iwlwifi/iwl-led.c             |    6 +-
 drivers/net/wireless/iwlwifi/iwl-power.c           |  642 +-
 drivers/net/wireless/iwlwifi/iwl-power.h           |   93 -
 drivers/net/wireless/iwlwifi/iwl-prph.h            |    9 +-
 drivers/net/wireless/iwlwifi/iwl-rx.c              |   10 +-
 drivers/net/wireless/iwlwifi/iwl-scan.c            |  441 +-
 drivers/net/wireless/iwlwifi/iwl-sta.c             |  759 +-
 drivers/net/wireless/iwlwifi/iwl-sta.h             |   69 +-
 drivers/net/wireless/iwlwifi/iwl-tx.c              |   81 +-
 drivers/net/wireless/iwlwifi/iwl3945-base.c        |  434 +-
 drivers/net/wireless/iwmc3200wifi/cfg80211.c       |    7 +-
 drivers/net/wireless/iwmc3200wifi/rx.c             |    7 +-
 drivers/net/wireless/libertas/cfg.c                |   72 +-
 drivers/net/wireless/libertas/decl.h               |   13 +
 drivers/net/wireless/libertas/if_cs.c              |  130 +-
 drivers/net/wireless/libertas/if_sdio.c            |  161 +-
 drivers/net/wireless/libertas/if_sdio.h            |    4 -
 drivers/net/wireless/libertas/if_spi.c             |  150 +-
 drivers/net/wireless/libertas/if_spi.h             |    5 -
 drivers/net/wireless/libertas/if_usb.c             |   64 +-
 drivers/net/wireless/libertas/if_usb.h             |    1 +
 drivers/net/wireless/libertas/main.c               |  105 +
 drivers/net/wireless/libertas/mesh.c               |    2 +-
 drivers/net/wireless/libertas_tf/if_usb.c          |   57 +-
 drivers/net/wireless/mac80211_hwsim.c              |   31 +-
 drivers/net/wireless/orinoco/hw.c                  |    9 +-
 drivers/net/wireless/orinoco/wext.c                |   11 +-
 drivers/net/wireless/p54/Kconfig                   |   18 +
 drivers/net/wireless/p54/eeprom.c                  |   25 +-
 drivers/net/wireless/p54/fwio.c                    |    6 +-
 drivers/net/wireless/p54/main.c                    |    9 +-
 drivers/net/wireless/p54/p54spi.c                  |    9 +-
 drivers/net/wireless/p54/p54spi_eeprom.h           |    2 +-
 drivers/net/wireless/p54/p54usb.c                  |   15 +-
 drivers/net/wireless/p54/txrx.c                    |   25 +-
 drivers/net/wireless/prism54/isl_ioctl.c           |    2 +-
 drivers/net/wireless/ray_cs.c                      |   44 +-
 drivers/net/wireless/rndis_wlan.c                  |   12 +-
 drivers/net/wireless/rt2x00/rt2400pci.c            |  149 +-
 drivers/net/wireless/rt2x00/rt2500pci.c            |  156 +-
 drivers/net/wireless/rt2x00/rt2500usb.c            |   78 +-
 drivers/net/wireless/rt2x00/rt2800.h               |  109 +-
 drivers/net/wireless/rt2x00/rt2800lib.c            |  625 +-
 drivers/net/wireless/rt2x00/rt2800lib.h            |   28 +-
 drivers/net/wireless/rt2x00/rt2800pci.c            |  400 +-
 drivers/net/wireless/rt2x00/rt2800usb.c            |  159 +-
 drivers/net/wireless/rt2x00/rt2x00.h               |   70 +-
 drivers/net/wireless/rt2x00/rt2x00config.c         |   24 +-
 drivers/net/wireless/rt2x00/rt2x00crypto.c         |   17 +-
 drivers/net/wireless/rt2x00/rt2x00debug.c          |   13 +-
 drivers/net/wireless/rt2x00/rt2x00dev.c            |  194 +-
 drivers/net/wireless/rt2x00/rt2x00firmware.c       |    3 +
 drivers/net/wireless/rt2x00/rt2x00ht.c             |   25 +-
 drivers/net/wireless/rt2x00/rt2x00lib.h            |   14 +-
 drivers/net/wireless/rt2x00/rt2x00link.c           |   24 +-
 drivers/net/wireless/rt2x00/rt2x00mac.c            |    6 +-
 drivers/net/wireless/rt2x00/rt2x00pci.c            |    2 +-
 drivers/net/wireless/rt2x00/rt2x00queue.c          |  138 +-
 drivers/net/wireless/rt2x00/rt2x00queue.h          |   56 +-
 drivers/net/wireless/rt2x00/rt2x00usb.c            |  320 +-
 drivers/net/wireless/rt2x00/rt2x00usb.h            |   12 +-
 drivers/net/wireless/rt2x00/rt61pci.c              |  123 +-
 drivers/net/wireless/rt2x00/rt73usb.c              |   96 +-
 drivers/net/wireless/rtl818x/rtl8180_dev.c         |   15 +-
 drivers/net/wireless/rtl818x/rtl8187_dev.c         |    9 +-
 drivers/net/wireless/wl1251/Kconfig                |   33 +
 drivers/net/wireless/wl1251/Makefile               |    6 +
 .../wireless/{wl12xx/wl1251_acx.c => wl1251/acx.c} |   10 +-
 .../wireless/{wl12xx/wl1251_acx.h => wl1251/acx.h} |   12 +-
 .../{wl12xx/wl1251_boot.c => wl1251/boot.c}        |   16 +-
 .../{wl12xx/wl1251_boot.h => wl1251/boot.h}        |    2 -
 .../wireless/{wl12xx/wl1251_cmd.c => wl1251/cmd.c} |   12 +-
 .../wireless/{wl12xx/wl1251_cmd.h => wl1251/cmd.h} |    8 +-
 .../{wl12xx/wl1251_debugfs.c => wl1251/debugfs.c}  |    8 +-
 .../{wl12xx/wl1251_debugfs.h => wl1251/debugfs.h}  |    2 -
 .../{wl12xx/wl1251_event.c => wl1251/event.c}      |   41 +-
 .../{wl12xx/wl1251_event.h => wl1251/event.h}      |    3 +-
 .../{wl12xx/wl1251_init.c => wl1251/init.c}        |   10 +-
 .../{wl12xx/wl1251_init.h => wl1251/init.h}        |    2 -
 .../wireless/{wl12xx/wl1251_io.c => wl1251/io.c}   |    6 +-
 .../wireless/{wl12xx/wl1251_io.h => wl1251/io.h}   |    0
 .../{wl12xx/wl1251_main.c => wl1251/main.c}        |   75 +-
 .../wireless/{wl12xx/wl1251_ps.c => wl1251/ps.c}   |   10 +-
 .../wireless/{wl12xx/wl1251_ps.h => wl1251/ps.h}   |   10 +-
 .../wireless/{wl12xx/wl1251_reg.h => wl1251/reg.h} |    2 -
 .../wireless/{wl12xx/wl1251_rx.c => wl1251/rx.c}   |   12 +-
 .../wireless/{wl12xx/wl1251_rx.h => wl1251/rx.h}   |    2 -
 .../{wl12xx/wl1251_sdio.c => wl1251/sdio.c}        |    4 +-
 .../wireless/{wl12xx/wl1251_spi.c => wl1251/spi.c} |   10 +-
 .../wireless/{wl12xx/wl1251_spi.h => wl1251/spi.h} |    8 +-
 .../wireless/{wl12xx/wl1251_tx.c => wl1251/tx.c}   |   34 +-
 .../wireless/{wl12xx/wl1251_tx.h => wl1251/tx.h}   |    4 +-
 drivers/net/wireless/{wl12xx => wl1251}/wl1251.h   |    7 +-
 drivers/net/wireless/wl1251/wl12xx_80211.h         |  156 +
 drivers/net/wireless/wl12xx/Kconfig                |   39 +-
 drivers/net/wireless/wl12xx/Makefile               |   12 +-
 drivers/net/wireless/wl12xx/wl1271.h               |   32 +-
 drivers/net/wireless/wl12xx/wl1271_acx.c           |   36 +-
 drivers/net/wireless/wl12xx/wl1271_acx.h           |   31 -
 drivers/net/wireless/wl12xx/wl1271_boot.c          |   67 +-
 drivers/net/wireless/wl12xx/wl1271_boot.h          |    1 -
 drivers/net/wireless/wl12xx/wl1271_cmd.c           |  143 +-
 drivers/net/wireless/wl12xx/wl1271_cmd.h           |   73 +-
 drivers/net/wireless/wl12xx/wl1271_conf.h          |   78 +-
 drivers/net/wireless/wl12xx/wl1271_event.c         |   15 +-
 drivers/net/wireless/wl12xx/wl1271_init.c          |   39 +-
 drivers/net/wireless/wl12xx/wl1271_io.h            |    9 +-
 drivers/net/wireless/wl12xx/wl1271_main.c          |  416 +-
 drivers/net/wireless/wl12xx/wl1271_ps.c            |   20 +-
 drivers/net/wireless/wl12xx/wl1271_ps.h            |    2 +-
 drivers/net/wireless/wl12xx/wl1271_rx.c            |   67 +-
 drivers/net/wireless/wl12xx/wl1271_scan.c          |   83 +-
 drivers/net/wireless/wl12xx/wl1271_scan.h          |    6 +-
 drivers/net/wireless/wl12xx/wl1271_sdio.c          |   98 +-
 drivers/net/wireless/wl12xx/wl1271_spi.c           |  151 +-
 drivers/net/wireless/wl12xx/wl1271_testmode.c      |   14 +-
 drivers/net/wireless/wl12xx/wl1271_tx.c            |  109 +-
 drivers/net/wireless/wl12xx/wl1271_tx.h            |   17 -
 drivers/net/wireless/wl12xx/wl12xx_platform_data.c |   28 +
 drivers/net/wireless/wl3501_cs.c                   |   11 -
 drivers/net/wireless/zd1211rw/zd_chip.c            |    5 +
 drivers/net/xen-netfront.c                         |   14 +-
 drivers/net/xilinx_emaclite.c                      |   15 +-
 drivers/net/yellowfin.c                            |    2 +-
 drivers/s390/cio/qdio.h                            |   29 +
 drivers/s390/cio/qdio_debug.c                      |   33 +-
 drivers/s390/cio/qdio_main.c                       |  138 +-
 drivers/s390/cio/qdio_setup.c                      |    1 +
 drivers/s390/cio/qdio_thinint.c                    |   66 +-
 drivers/s390/net/Kconfig                           |    2 +-
 drivers/s390/net/ctcm_mpc.c                        |    2 +-
 drivers/s390/net/qeth_core.h                       |   17 +
 drivers/s390/net/qeth_core_main.c                  |   26 +-
 drivers/s390/net/qeth_l2_main.c                    |  175 +-
 drivers/s390/net/qeth_l3_main.c                    |  218 +-
 drivers/s390/scsi/zfcp_qdio.c                      |    6 +-
 drivers/scsi/bnx2i/57xx_iscsi_constants.h          |    2 +
 drivers/scsi/bnx2i/bnx2i.h                         |    2 +
 drivers/scsi/bnx2i/bnx2i_hwi.c                     |    3 +-
 drivers/usb/atm/cxacru.c                           |   18 +-
 drivers/uwb/address.c                              |    5 +-
 drivers/uwb/wlp/wss-lc.c                           |    7 +-
 drivers/vhost/net.c                                |    2 +-
 drivers/vhost/vhost.c                              |   51 +-
 drivers/vhost/vhost.h                              |   18 +-
 firmware/Makefile                                  |   14 +-
 firmware/WHENCE                                    |   15 +-
 firmware/bnx2/bnx2-mips-06-5.0.0.j6.fw.ihex        | 5908 --------
 firmware/bnx2/bnx2-mips-06-6.0.15.fw.ihex          | 5815 ++++++++
 firmware/bnx2/bnx2-mips-09-5.0.0.j15.fw.ihex       | 6081 --------
 firmware/bnx2/bnx2-mips-09-6.0.17.fw.ihex          | 6488 ++++++++
 firmware/bnx2/bnx2-rv2p-06-5.0.0.j3.fw.ihex        |  424 -
 firmware/bnx2/bnx2-rv2p-06-6.0.15.fw.ihex          |  366 +
 firmware/bnx2/bnx2-rv2p-09-5.0.0.j10.fw.ihex       |  462 -
 firmware/bnx2/bnx2-rv2p-09-6.0.17.fw.ihex          |  392 +
 firmware/bnx2/bnx2-rv2p-09ax-5.0.0.j10.fw.ihex     |  499 -
 firmware/bnx2/bnx2-rv2p-09ax-6.0.17.fw.ihex        |  425 +
 firmware/bnx2x-e1-5.2.13.0.fw.ihex                 |10191 -------------
 firmware/bnx2x-e1h-5.2.13.0.fw.ihex                |12849 ----------------
 firmware/bnx2x/bnx2x-e1-6.0.34.0.fw.ihex           | 9476 ++++++++++++
 firmware/bnx2x/bnx2x-e1h-6.0.34.0.fw.ihex          |13178 +++++++++++++++++
 firmware/bnx2x/bnx2x-e2-6.0.34.0.fw.ihex           |15442 ++++++++++++++++++++
 include/linux/Kbuild                               |    1 +
 include/linux/atmdev.h                             |    2 +-
 include/linux/can/platform/mcp251x.h               |    4 -
 include/linux/dccp.h                               |    6 +-
 include/linux/etherdevice.h                        |   22 +-
 include/linux/ethtool.h                            |  190 +-
 include/linux/ieee80211.h                          |   71 +-
 include/linux/if.h                                 |    2 +
 include/linux/if_bonding.h                         |    3 +
 include/linux/if_ether.h                           |    2 -
 include/linux/if_macvlan.h                         |    9 +-
 include/linux/if_pppox.h                           |   52 +-
 include/linux/if_vlan.h                            |   31 +-
 include/linux/in.h                                 |   19 +
 include/linux/in6.h                                |    4 +
 include/linux/inetdevice.h                         |   21 +-
 include/linux/ip_vs.h                              |   15 +
 include/linux/ipv6.h                               |    4 +-
 include/linux/mlx4/cmd.h                           |    1 +
 include/linux/mlx4/device.h                        |    7 +
 include/linux/mmc/sdio_ids.h                       |    1 +
 include/linux/mroute.h                             |    1 +
 include/linux/netdevice.h                          |  120 +-
 include/linux/netfilter/nf_conntrack_common.h      |    6 +
 include/linux/netfilter/nf_conntrack_sip.h         |    1 +
 include/linux/netfilter/nfnetlink_conntrack.h      |    1 +
 include/linux/netfilter/x_tables.h                 |    5 +
 include/linux/netfilter/xt_TPROXY.h                |   13 +-
 include/linux/netfilter_arp/arp_tables.h           |   68 +-
 include/linux/netfilter_bridge/Kbuild              |    2 +
 include/linux/netfilter_ipv4/ip_tables.h           |  107 +-
 include/linux/netfilter_ipv6/ip6_tables.h          |  110 +-
 include/linux/netpoll.h                            |    9 +-
 include/linux/nl80211.h                            |  210 +-
 include/linux/pci_ids.h                            |    3 +
 include/linux/phonet.h                             |    5 +
 include/linux/phy.h                                |    4 +-
 include/linux/pkt_cls.h                            |    1 +
 include/linux/rds.h                                |  115 +-
 include/linux/rtnetlink.h                          |   30 +
 include/linux/skbuff.h                             |  117 +-
 include/linux/socket.h                             |    1 -
 include/linux/ssb/ssb_regs.h                       |    1 +
 include/linux/stmmac.h                             |    6 +-
 include/linux/tc_act/Kbuild                        |    1 +
 include/linux/tc_act/tc_csum.h                     |   32 +
 include/linux/tc_ematch/tc_em_meta.h               |    1 +
 include/linux/tcp.h                                |    1 +
 include/linux/tipc.h                               |   30 +-
 include/linux/wireless.h                           |    2 +-
 include/linux/{spi => }/wl12xx.h                   |   23 +-
 include/net/9p/client.h                            |    3 -
 include/net/addrconf.h                             |   65 +-
 include/net/arp.h                                  |    2 -
 include/net/bluetooth/bluetooth.h                  |    2 +
 include/net/bluetooth/hci.h                        |    2 +-
 include/net/bluetooth/hci_core.h                   |    2 +-
 include/net/bluetooth/l2cap.h                      |    2 +-
 include/net/bluetooth/rfcomm.h                     |    5 -
 include/net/cfg80211.h                             |  296 +-
 include/net/dst.h                                  |   33 +-
 include/net/dst_ops.h                              |   37 +-
 include/net/fib_rules.h                            |    3 +-
 include/net/flow.h                                 |    1 +
 include/net/genetlink.h                            |   18 +
 include/net/gre.h                                  |   18 +
 include/net/inet_connection_sock.h                 |    1 +
 include/net/inet_ecn.h                             |    2 +-
 include/net/inet_hashtables.h                      |    2 +-
 include/net/ip.h                                   |    6 +-
 include/net/ip_fib.h                               |   17 +-
 include/net/ip_vs.h                                |  180 +-
 include/net/ipip.h                                 |   12 +-
 include/net/ipv6.h                                 |   35 +-
 include/net/irda/irlan_common.h                    |    1 -
 include/net/irda/irlan_event.h                     |    2 +-
 include/net/irda/irlap.h                           |    2 +-
 include/net/irda/irlmp.h                           |    2 +-
 include/net/irda/irttp.h                           |    2 +-
 include/net/mac80211.h                             |  195 +-
 include/net/neighbour.h                            |   47 +-
 include/net/net_namespace.h                        |   17 +-
 include/net/netfilter/ipv6/nf_defrag_ipv6.h        |    6 +
 include/net/netfilter/nf_conntrack_expect.h        |   12 +-
 include/net/netfilter/nf_nat_protocol.h            |    3 -
 include/net/netfilter/nf_tproxy_core.h             |  192 +-
 include/net/netfilter/xt_log.h                     |   54 +
 include/net/netns/xfrm.h                           |    9 +-
 include/net/phonet/pep.h                           |   26 +
 include/net/phonet/phonet.h                        |    5 +
 include/net/phonet/pn_dev.h                        |    1 +
 include/net/raw.h                                  |    5 +-
 include/net/rtnetlink.h                            |    1 -
 include/net/sch_generic.h                          |    5 +-
 include/net/sctp/sctp.h                            |   60 +-
 include/net/sctp/sm.h                              |   10 +-
 include/net/sctp/structs.h                         |    2 +-
 include/net/sctp/tsnmap.h                          |    2 +-
 include/net/sock.h                                 |   14 +-
 include/net/tc_act/tc_csum.h                       |   15 +
 include/net/tcp.h                                  |   11 +-
 include/net/tipc/tipc.h                            |   71 -
 include/net/tipc/tipc_msg.h                        |   10 +-
 include/net/tipc/tipc_port.h                       |    2 -
 include/net/udp.h                                  |    3 +
 include/net/xfrm.h                                 |    3 -
 net/802/fc.c                                       |    2 +-
 net/802/fddi.c                                     |   12 +-
 net/802/hippi.c                                    |    2 +-
 net/802/tr.c                                       |    2 +-
 net/8021q/vlan.c                                   |   93 +-
 net/8021q/vlan.h                                   |   17 -
 net/8021q/vlan_core.c                              |  121 +-
 net/8021q/vlan_dev.c                               |   10 +-
 net/9p/client.c                                    |   55 +-
 net/9p/trans_fd.c                                  |    2 +-
 net/atm/clip.c                                     |    4 +-
 net/atm/common.c                                   |    2 +-
 net/atm/lec.c                                      |    1 -
 net/ax25/af_ax25.c                                 |    2 +-
 net/ax25/ax25_route.c                              |    4 +-
 net/bluetooth/af_bluetooth.c                       |  114 +-
 net/bluetooth/cmtp/core.c                          |    6 +-
 net/bluetooth/hci_core.c                           |    1 -
 net/bluetooth/hci_sysfs.c                          |   21 +-
 net/bluetooth/hidp/core.c                          |    8 +-
 net/bluetooth/l2cap.c                              |   60 +-
 net/bluetooth/lib.c                                |    4 +-
 net/bluetooth/rfcomm/core.c                        |   43 +-
 net/bluetooth/rfcomm/sock.c                        |  104 +-
 net/bluetooth/rfcomm/tty.c                         |    4 +-
 net/bridge/br_device.c                             |    8 +-
 net/bridge/br_if.c                                 |   29 +-
 net/bridge/br_input.c                              |    4 +-
 net/bridge/br_netfilter.c                          |  134 +-
 net/bridge/netfilter/ebt_vlan.c                    |   25 +-
 net/bridge/netfilter/ebtables.c                    |   15 +-
 net/caif/caif_dev.c                                |   24 +-
 net/caif/caif_socket.c                             |   27 +-
 net/caif/cfcnfg.c                                  |   49 +-
 net/caif/cfctrl.c                                  |   59 +-
 net/caif/cfdbgl.c                                  |    4 +-
 net/caif/cfdgml.c                                  |   11 +-
 net/caif/cffrml.c                                  |   14 +-
 net/caif/cfmuxl.c                                  |   14 +-
 net/caif/cfpkt_skbuff.c                            |   48 +-
 net/caif/cfrfml.c                                  |   12 +-
 net/caif/cfserl.c                                  |    4 +-
 net/caif/cfsrvl.c                                  |   17 +-
 net/caif/cfutill.c                                 |   12 +-
 net/caif/cfveil.c                                  |   11 +-
 net/caif/cfvidl.c                                  |    6 +-
 net/caif/chnl_net.c                                |   47 +-
 net/can/raw.c                                      |   37 +-
 net/core/datagram.c                                |    5 +-
 net/core/dev.c                                     |  598 +-
 net/core/dst.c                                     |   39 +-
 net/core/ethtool.c                                 |   91 +-
 net/core/fib_rules.c                               |   16 +-
 net/core/filter.c                                  |   10 +-
 net/core/flow.c                                    |   82 +-
 net/core/gen_estimator.c                           |    4 +-
 net/core/iovec.c                                   |    6 +-
 net/core/neighbour.c                               |  486 +-
 net/core/net-sysfs.c                               |   39 +-
 net/core/net-sysfs.h                               |    4 +
 net/core/netpoll.c                                 |    6 +-
 net/core/pktgen.c                                  |   12 +-
 net/core/rtnetlink.c                               |   39 +-
 net/core/skbuff.c                                  |  105 +-
 net/core/sock.c                                    |    4 +
 net/core/utils.c                                   |   15 +-
 net/dccp/ccid.h                                    |   52 +-
 net/dccp/ccids/Kconfig                             |   31 -
 net/dccp/ccids/ccid2.c                             |  289 +-
 net/dccp/ccids/ccid2.h                             |   35 +-
 net/dccp/ccids/ccid3.c                             |  256 +-
 net/dccp/ccids/ccid3.h                             |   51 +-
 net/dccp/ccids/lib/loss_interval.c                 |    2 +-
 net/dccp/ccids/lib/packet_history.c                |   39 -
 net/dccp/ccids/lib/packet_history.h                |   22 +-
 net/dccp/ccids/lib/tfrc.h                          |    1 +
 net/dccp/ccids/lib/tfrc_equation.c                 |   14 +
 net/dccp/dccp.h                                    |   46 +-
 net/dccp/feat.c                                    |   10 -
 net/dccp/feat.h                                    |    1 -
 net/dccp/input.c                                   |   20 +-
 net/dccp/ipv4.c                                    |   10 +-
 net/dccp/ipv6.c                                    |   10 +-
 net/dccp/minisocks.c                               |   30 +-
 net/dccp/options.c                                 |   31 +-
 net/dccp/output.c                                  |   20 +-
 net/dccp/proto.c                                   |   50 +-
 net/decnet/dn_neigh.c                              |   13 +-
 net/decnet/dn_nsp_out.c                            |    8 +-
 net/decnet/dn_route.c                              |    3 +-
 net/econet/af_econet.c                             |    6 +-
 net/ethernet/eth.c                                 |    8 +-
 net/ipv4/Kconfig                                   |    8 +-
 net/ipv4/Makefile                                  |    1 +
 net/ipv4/af_inet.c                                 |    8 +-
 net/ipv4/arp.c                                     |  245 +-
 net/ipv4/datagram.c                                |    2 +-
 net/ipv4/devinet.c                                 |   11 +-
 net/ipv4/fib_frontend.c                            |  192 +-
 net/ipv4/fib_hash.c                                |  291 +-
 net/ipv4/fib_lookup.h                              |   11 +-
 net/ipv4/fib_rules.c                               |   13 +-
 net/ipv4/fib_semantics.c                           |  297 +-
 net/ipv4/fib_trie.c                                |   84 +-
 net/ipv4/gre.c                                     |  151 +
 net/ipv4/icmp.c                                    |    4 +-
 net/ipv4/igmp.c                                    |   22 +-
 net/ipv4/inet_diag.c                               |    2 +-
 net/ipv4/inet_hashtables.c                         |   28 +-
 net/ipv4/ip_fragment.c                             |    6 +-
 net/ipv4/ip_gre.c                                  |  237 +-
 net/ipv4/ip_options.c                              |    3 +-
 net/ipv4/ip_output.c                               |   24 +-
 net/ipv4/ipip.c                                    |  212 +-
 net/ipv4/ipmr.c                                    |  428 +-
 net/ipv4/netfilter/Kconfig                         |    4 +-
 net/ipv4/netfilter/arp_tables.c                    |   64 +-
 net/ipv4/netfilter/arpt_mangle.c                   |    2 +-
 net/ipv4/netfilter/ip_tables.c                     |   84 +-
 net/ipv4/netfilter/ipt_CLUSTERIP.c                 |   31 +-
 net/ipv4/netfilter/ipt_LOG.c                       |  145 +-
 net/ipv4/netfilter/nf_nat_amanda.c                 |    9 +-
 net/ipv4/netfilter/nf_nat_core.c                   |   51 +-
 net/ipv4/netfilter/nf_nat_ftp.c                    |    9 +-
 net/ipv4/netfilter/nf_nat_h323.c                   |   53 +-
 net/ipv4/netfilter/nf_nat_helper.c                 |   76 +-
 net/ipv4/netfilter/nf_nat_irc.c                    |    9 +-
 net/ipv4/netfilter/nf_nat_rule.c                   |   17 +-
 net/ipv4/netfilter/nf_nat_sip.c                    |   27 +-
 net/ipv4/protocol.c                                |   31 +-
 net/ipv4/raw.c                                     |    2 +-
 net/ipv4/route.c                                   |  190 +-
 net/ipv4/tcp.c                                     |   11 +-
 net/ipv4/tcp_input.c                               |   55 +-
 net/ipv4/tcp_ipv4.c                                |   12 +-
 net/ipv4/tcp_minisocks.c                           |    2 +-
 net/ipv4/tcp_output.c                              |   31 +-
 net/ipv4/tcp_timer.c                               |   50 +-
 net/ipv4/tcp_westwood.c                            |    2 +-
 net/ipv4/tunnel4.c                                 |   19 +-
 net/ipv4/udp.c                                     |    4 +-
 net/ipv4/xfrm4_policy.c                            |    4 +-
 net/ipv4/xfrm4_tunnel.c                            |    4 +-
 net/ipv6/addrconf.c                                |    8 +-
 net/ipv6/addrlabel.c                               |    5 +-
 net/ipv6/af_inet6.c                                |    9 +-
 net/ipv6/datagram.c                                |   19 +
 net/ipv6/exthdrs_core.c                            |    4 +-
 net/ipv6/fib6_rules.c                              |    3 +-
 net/ipv6/ip6_fib.c                                 |    9 +-
 net/ipv6/ip6_output.c                              |    6 +-
 net/ipv6/ip6_tunnel.c                              |  157 +-
 net/ipv6/ip6mr.c                                   |    1 +
 net/ipv6/ipv6_sockglue.c                           |   23 +
 net/ipv6/ndisc.c                                   |   36 +-
 net/ipv6/netfilter/Kconfig                         |    4 +-
 net/ipv6/netfilter/Makefile                        |    5 +-
 net/ipv6/netfilter/ip6_tables.c                    |   98 +-
 net/ipv6/netfilter/ip6t_LOG.c                      |  157 +-
 net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c     |   78 +-
 net/ipv6/netfilter/nf_conntrack_reasm.c            |   16 +-
 net/ipv6/netfilter/nf_defrag_ipv6_hooks.c          |  131 +
 net/ipv6/protocol.c                                |   32 +-
 net/ipv6/raw.c                                     |   12 +-
 net/ipv6/reassembly.c                              |    2 +-
 net/ipv6/route.c                                   |   50 +-
 net/ipv6/sit.c                                     |  165 +-
 net/ipv6/tcp_ipv6.c                                |   14 +-
 net/ipv6/tunnel6.c                                 |   17 +-
 net/ipv6/udp.c                                     |   16 +-
 net/ipv6/xfrm6_policy.c                            |   10 +-
 net/ipv6/xfrm6_tunnel.c                            |    8 +-
 net/irda/af_irda.c                                 |  380 +-
 net/irda/discovery.c                               |    2 +-
 net/irda/ircomm/ircomm_tty.c                       |    4 +-
 net/irda/iriap.c                                   |    3 +-
 net/irda/irlan/irlan_eth.c                         |   32 +-
 net/irda/irlan/irlan_event.c                       |    2 +-
 net/irda/irlmp.c                                   |    2 +-
 net/irda/irlmp_frame.c                             |    2 +-
 net/irda/irnet/irnet.h                             |    2 +
 net/irda/irnet/irnet_irda.c                        |   22 +-
 net/irda/irnet/irnet_ppp.c                         |   69 +-
 net/irda/irnet/irnet_ppp.h                         |    3 +-
 net/irda/parameters.c                              |    4 +-
 net/key/af_key.c                                   |    4 +-
 net/l2tp/l2tp_eth.c                                |    1 -
 net/l2tp/l2tp_ip.c                                 |    4 +-
 net/l2tp/l2tp_ppp.c                                |    2 +-
 net/mac80211/aes_ccm.c                             |    6 +-
 net/mac80211/aes_cmac.c                            |    6 +-
 net/mac80211/agg-rx.c                              |   30 +-
 net/mac80211/agg-tx.c                              |   14 +-
 net/mac80211/cfg.c                                 |  244 +-
 net/mac80211/chan.c                                |    2 +-
 net/mac80211/debugfs.c                             |    7 +-
 net/mac80211/debugfs_key.c                         |   55 +-
 net/mac80211/debugfs_netdev.c                      |    3 +
 net/mac80211/debugfs_sta.c                         |    5 +-
 net/mac80211/driver-ops.h                          |   14 +
 net/mac80211/driver-trace.h                        |   42 +-
 net/mac80211/ht.c                                  |   47 +-
 net/mac80211/ibss.c                                |   77 +-
 net/mac80211/ieee80211_i.h                         |  133 +-
 net/mac80211/iface.c                               |  460 +-
 net/mac80211/key.c                                 |  168 +-
 net/mac80211/key.h                                 |   13 +-
 net/mac80211/main.c                                |  194 +-
 net/mac80211/mesh_plink.c                          |   17 +-
 net/mac80211/mlme.c                                |  173 +-
 net/mac80211/offchannel.c                          |   26 +-
 net/mac80211/pm.c                                  |    2 +-
 net/mac80211/rate.c                                |   11 +-
 net/mac80211/rc80211_minstrel_ht.c                 |    7 +-
 net/mac80211/rc80211_pid_debugfs.c                 |    2 +-
 net/mac80211/rx.c                                  |  819 +-
 net/mac80211/scan.c                                |  179 +-
 net/mac80211/sta_info.c                            |   52 +-
 net/mac80211/sta_info.h                            |   24 +-
 net/mac80211/status.c                              |   14 +-
 net/mac80211/tx.c                                  |   73 +-
 net/mac80211/util.c                                |  102 +-
 net/mac80211/wep.c                                 |   10 +-
 net/mac80211/work.c                                |   39 +-
 net/mac80211/wpa.c                                 |   34 +-
 net/netfilter/core.c                               |    6 +-
 net/netfilter/ipvs/Kconfig                         |   20 +-
 net/netfilter/ipvs/Makefile                        |   10 +-
 net/netfilter/ipvs/ip_vs_app.c                     |    6 +-
 net/netfilter/ipvs/ip_vs_conn.c                    |  286 +-
 net/netfilter/ipvs/ip_vs_core.c                    |  819 +-
 net/netfilter/ipvs/ip_vs_ctl.c                     |  392 +-
 net/netfilter/ipvs/ip_vs_ftp.c                     |  194 +-
 net/netfilter/ipvs/ip_vs_nfct.c                    |  292 +
 net/netfilter/ipvs/ip_vs_pe.c                      |  147 +
 net/netfilter/ipvs/ip_vs_pe_sip.c                  |  169 +
 net/netfilter/ipvs/ip_vs_proto.c                   |    8 +-
 net/netfilter/ipvs/ip_vs_proto_ah_esp.c            |   99 +-
 net/netfilter/ipvs/ip_vs_proto_sctp.c              |   27 +-
 net/netfilter/ipvs/ip_vs_proto_tcp.c               |   52 +-
 net/netfilter/ipvs/ip_vs_proto_udp.c               |   51 +-
 net/netfilter/ipvs/ip_vs_sched.c                   |   47 +-
 net/netfilter/ipvs/ip_vs_sync.c                    |   46 +-
 net/netfilter/ipvs/ip_vs_xmit.c                    |  696 +-
 net/netfilter/nf_conntrack_core.c                  |  131 +-
 net/netfilter/nf_conntrack_expect.c                |   68 +-
 net/netfilter/nf_conntrack_netlink.c               |   77 +-
 net/netfilter/nf_conntrack_sip.c                   |   42 +
 net/netfilter/nf_tproxy_core.c                     |   35 -
 net/netfilter/x_tables.c                           |   12 +-
 net/netfilter/xt_TPROXY.c                          |  366 +-
 net/netfilter/xt_hashlimit.c                       |   15 +-
 net/netfilter/xt_ipvs.c                            |    1 -
 net/netfilter/xt_socket.c                          |  167 +-
 net/netlink/genetlink.c                            |   14 +-
 net/packet/af_packet.c                             |    4 +-
 net/phonet/Kconfig                                 |   12 +
 net/phonet/af_phonet.c                             |   17 +
 net/phonet/datagram.c                              |   13 +
 net/phonet/pep.c                                   |  388 +-
 net/phonet/pn_dev.c                                |    5 +-
 net/phonet/socket.c                                |  289 +-
 net/rds/af_rds.c                                   |   26 +-
 net/rds/bind.c                                     |   82 +-
 net/rds/cong.c                                     |    8 +-
 net/rds/connection.c                               |  159 +-
 net/rds/ib.c                                       |  200 +-
 net/rds/ib.h                                       |  104 +-
 net/rds/ib_cm.c                                    |  184 +-
 net/rds/ib_rdma.c                                  |  318 +-
 net/rds/ib_recv.c                                  |  549 +-
 net/rds/ib_send.c                                  |  682 +-
 net/rds/ib_stats.c                                 |    2 +
 net/rds/ib_sysctl.c                                |   19 +-
 net/rds/info.c                                     |   12 +-
 net/rds/iw.c                                       |    8 +-
 net/rds/iw.h                                       |   15 +-
 net/rds/iw_cm.c                                    |   14 +-
 net/rds/iw_rdma.c                                  |    8 +-
 net/rds/iw_recv.c                                  |   24 +-
 net/rds/iw_send.c                                  |   93 +-
 net/rds/iw_sysctl.c                                |    6 +-
 net/rds/loop.c                                     |   31 +-
 net/rds/message.c                                  |  142 +-
 net/rds/page.c                                     |    8 +-
 net/rds/rdma.c                                     |  339 +-
 net/rds/rdma.h                                     |   85 -
 net/rds/rdma_transport.c                           |   44 +-
 net/rds/rdma_transport.h                           |    4 -
 net/rds/rds.h                                      |  192 +-
 net/rds/recv.c                                     |   12 +-
 net/rds/send.c                                     |  548 +-
 net/rds/stats.c                                    |    6 +-
 net/rds/sysctl.c                                   |    4 +-
 net/rds/tcp.c                                      |   12 +-
 net/rds/tcp.h                                      |    9 +-
 net/rds/tcp_connect.c                              |    2 +-
 net/rds/tcp_listen.c                               |    6 +-
 net/rds/tcp_recv.c                                 |   17 +-
 net/rds/tcp_send.c                                 |   68 +-
 net/rds/threads.c                                  |   69 +-
 net/rds/transport.c                                |   19 +-
 net/rds/xlist.h                                    |   80 +
 net/rfkill/input.c                                 |    2 +-
 net/rose/rose_link.c                               |    4 +-
 net/sched/Kconfig                                  |   10 +
 net/sched/Makefile                                 |    1 +
 net/sched/act_csum.c                               |  595 +
 net/sched/act_ipt.c                                |   14 +-
 net/sched/cls_flow.c                               |   74 +-
 net/sched/em_meta.c                                |    6 +
 net/sched/sch_api.c                                |   44 +-
 net/sched/sch_atm.c                                |    5 +-
 net/sched/sch_cbq.c                                |   12 +-
 net/sched/sch_drr.c                                |    4 +-
 net/sched/sch_dsmark.c                             |    6 +-
 net/sched/sch_fifo.c                               |    3 +-
 net/sched/sch_generic.c                            |   24 +-
 net/sched/sch_hfsc.c                               |    8 +-
 net/sched/sch_htb.c                                |   12 +-
 net/sched/sch_mq.c                                 |    2 +-
 net/sched/sch_multiq.c                             |    3 +-
 net/sched/sch_netem.c                              |    3 +-
 net/sched/sch_prio.c                               |    2 +-
 net/sched/sch_sfq.c                                |   33 +-
 net/sched/sch_teql.c                               |    8 +-
 net/sctp/associola.c                               |    2 +
 net/sctp/chunk.c                                   |    2 +
 net/sctp/inqueue.c                                 |    2 +
 net/sctp/ipv6.c                                    |    4 +-
 net/sctp/objcnt.c                                  |    5 +-
 net/sctp/output.c                                  |    2 +
 net/sctp/outqueue.c                                |   34 +-
 net/sctp/probe.c                                   |    4 +-
 net/sctp/protocol.c                                |   19 +-
 net/sctp/sm_make_chunk.c                           |    2 +
 net/sctp/sm_sideeffect.c                           |   21 +-
 net/sctp/sm_statefuns.c                            |   20 +-
 net/sctp/sm_statetable.c                           |   42 +-
 net/sctp/socket.c                                  |   85 +-
 net/sctp/transport.c                               |    9 +-
 net/socket.c                                       |   37 +-
 net/sunrpc/auth_gss/auth_gss.c                     |    2 +-
 net/sunrpc/auth_gss/gss_generic_token.c            |   44 +-
 net/sunrpc/auth_gss/gss_krb5_seqnum.c              |    2 +-
 net/sunrpc/auth_gss/gss_mech_switch.c              |    2 +-
 net/sunrpc/sched.c                                 |    2 +-
 net/tipc/addr.c                                    |    7 +-
 net/tipc/bcast.c                                   |   51 +-
 net/tipc/bcast.h                                   |    3 -
 net/tipc/bearer.c                                  |   42 +-
 net/tipc/cluster.c                                 |   21 +-
 net/tipc/cluster.h                                 |    2 +-
 net/tipc/config.c                                  |  148 +-
 net/tipc/config.h                                  |    6 -
 net/tipc/core.c                                    |   38 +-
 net/tipc/core.h                                    |    9 +-
 net/tipc/dbg.c                                     |   17 +-
 net/tipc/dbg.h                                     |    3 -
 net/tipc/discover.c                                |   44 +-
 net/tipc/discover.h                                |    5 -
 net/tipc/eth_media.c                               |   48 +-
 net/tipc/link.c                                    |  188 +-
 net/tipc/link.h                                    |   24 +-
 net/tipc/msg.c                                     |    2 +-
 net/tipc/msg.h                                     |    6 +-
 net/tipc/name_distr.c                              |    2 +-
 net/tipc/name_table.c                              |   67 +-
 net/tipc/net.c                                     |   10 +-
 net/tipc/node.c                                    |   73 +-
 net/tipc/node.h                                    |    3 +-
 net/tipc/port.c                                    |  295 +-
 net/tipc/port.h                                    |    4 +-
 net/tipc/ref.c                                     |   17 -
 net/tipc/ref.h                                     |    1 -
 net/tipc/socket.c                                  |   83 +-
 net/tipc/subscr.c                                  |   77 +-
 net/tipc/subscr.h                                  |    2 +
 net/tipc/zone.c                                    |   11 -
 net/tipc/zone.h                                    |    1 -
 net/unix/af_unix.c                                 |   10 +-
 net/wireless/core.c                                |   66 +-
 net/wireless/core.h                                |   34 +-
 net/wireless/ibss.c                                |   21 +-
 net/wireless/mlme.c                                |  225 +-
 net/wireless/nl80211.c                             | 2189 ++--
 net/wireless/nl80211.h                             |   14 +-
 net/wireless/radiotap.c                            |   61 +-
 net/wireless/reg.c                                 |   22 +-
 net/wireless/scan.c                                |   12 +-
 net/wireless/sme.c                                 |   11 +-
 net/wireless/sysfs.c                               |   18 +
 net/wireless/util.c                                |   40 +-
 net/wireless/wext-compat.c                         |   42 +-
 net/wireless/wext-core.c                           |    2 +-
 net/wireless/wext-sme.c                            |    2 +
 net/x25/af_x25.c                                   |   34 +-
 net/xfrm/xfrm_policy.c                             |    7 +-
 1343 files changed, 157285 insertions(+), 84043 deletions(-)
 create mode 100644 Documentation/DocBook/80211.tmpl
 delete mode 100644 Documentation/DocBook/mac80211.tmpl
 create mode 100644 drivers/net/bna/Makefile
 create mode 100644 drivers/net/bna/bfa_cee.c
 create mode 100644 drivers/net/bna/bfa_cee.h
 create mode 100644 drivers/net/bna/bfa_defs.h
 create mode 100644 drivers/net/bna/bfa_defs_cna.h
 create mode 100644 drivers/net/bna/bfa_defs_mfg_comm.h
 create mode 100644 drivers/net/bna/bfa_defs_status.h
 create mode 100644 drivers/net/bna/bfa_ioc.c
 create mode 100644 drivers/net/bna/bfa_ioc.h
 create mode 100644 drivers/net/bna/bfa_ioc_ct.c
 create mode 100644 drivers/net/bna/bfa_sm.h
 create mode 100644 drivers/net/bna/bfa_wc.h
 create mode 100644 drivers/net/bna/bfi.h
 create mode 100644 drivers/net/bna/bfi_cna.h
 create mode 100644 drivers/net/bna/bfi_ctreg.h
 create mode 100644 drivers/net/bna/bfi_ll.h
 create mode 100644 drivers/net/bna/bna.h
 create mode 100644 drivers/net/bna/bna_ctrl.c
 create mode 100644 drivers/net/bna/bna_hw.h
 create mode 100644 drivers/net/bna/bna_txrx.c
 create mode 100644 drivers/net/bna/bna_types.h
 create mode 100644 drivers/net/bna/bnad.c
 create mode 100644 drivers/net/bna/bnad.h
 create mode 100644 drivers/net/bna/bnad_ethtool.c
 create mode 100644 drivers/net/bna/cna.h
 create mode 100644 drivers/net/bna/cna_fwimg.c
 create mode 100644 drivers/net/mlx4/en_selftest.c
 create mode 100644 drivers/net/pch_gbe/Makefile
 create mode 100644 drivers/net/pch_gbe/pch_gbe.h
 create mode 100644 drivers/net/pch_gbe/pch_gbe_api.c
 create mode 100644 drivers/net/pch_gbe/pch_gbe_api.h
 create mode 100644 drivers/net/pch_gbe/pch_gbe_ethtool.c
 create mode 100644 drivers/net/pch_gbe/pch_gbe_main.c
 create mode 100644 drivers/net/pch_gbe/pch_gbe_param.c
 create mode 100644 drivers/net/pch_gbe/pch_gbe_phy.c
 create mode 100644 drivers/net/pch_gbe/pch_gbe_phy.h
 create mode 100644 drivers/net/pptp.c
 delete mode 100644 drivers/net/sfc/falcon_gmac.c
 create mode 100644 drivers/net/sfc/filter.c
 create mode 100644 drivers/net/sfc/filter.h
 create mode 100644 drivers/net/sfc/txc43128_phy.c
 create mode 100644 drivers/net/usb/cx82310_eth.c
 delete mode 100644 drivers/net/wireless/ath/ath9k/ar9003_2p0_initvals.h
 create mode 100644 drivers/net/wireless/ath/ath9k/htc_drv_gpio.c
 create mode 100644 drivers/net/wireless/ath/carl9170/Kconfig
 create mode 100644 drivers/net/wireless/ath/carl9170/Makefile
 create mode 100644 drivers/net/wireless/ath/carl9170/carl9170.h
 create mode 100644 drivers/net/wireless/ath/carl9170/cmd.c
 create mode 100644 drivers/net/wireless/ath/carl9170/cmd.h
 create mode 100644 drivers/net/wireless/ath/carl9170/debug.c
 create mode 100644 drivers/net/wireless/ath/carl9170/debug.h
 create mode 100644 drivers/net/wireless/ath/carl9170/eeprom.h
 create mode 100644 drivers/net/wireless/ath/carl9170/fw.c
 create mode 100644 drivers/net/wireless/ath/carl9170/fwcmd.h
 create mode 100644 drivers/net/wireless/ath/carl9170/fwdesc.h
 create mode 100644 drivers/net/wireless/ath/carl9170/hw.h
 create mode 100644 drivers/net/wireless/ath/carl9170/led.c
 create mode 100644 drivers/net/wireless/ath/carl9170/mac.c
 create mode 100644 drivers/net/wireless/ath/carl9170/main.c
 create mode 100644 drivers/net/wireless/ath/carl9170/phy.c
 create mode 100644 drivers/net/wireless/ath/carl9170/phy.h
 create mode 100644 drivers/net/wireless/ath/carl9170/rx.c
 create mode 100644 drivers/net/wireless/ath/carl9170/tx.c
 create mode 100644 drivers/net/wireless/ath/carl9170/usb.c
 create mode 100644 drivers/net/wireless/ath/carl9170/version.h
 create mode 100644 drivers/net/wireless/ath/carl9170/wlan.h
 create mode 100644 drivers/net/wireless/ath/key.c
 create mode 100644 drivers/net/wireless/b43/radio_2055.c
 create mode 100644 drivers/net/wireless/b43/radio_2055.h
 create mode 100644 drivers/net/wireless/b43/radio_2056.c
 create mode 100644 drivers/net/wireless/b43/radio_2056.h
 rename drivers/net/wireless/iwlwifi/{iwl-calib.h => iwl-agn-calib.h} (95%)
 create mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c
 create mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-sta.c
 create mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-tt.c
 create mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-tt.h
 create mode 100644 drivers/net/wireless/wl1251/Kconfig
 create mode 100644 drivers/net/wireless/wl1251/Makefile
 rename drivers/net/wireless/{wl12xx/wl1251_acx.c => wl1251/acx.c} (99%)
 rename drivers/net/wireless/{wl12xx/wl1251_acx.h => wl1251/acx.h} (99%)
 rename drivers/net/wireless/{wl12xx/wl1251_boot.c => wl1251/boot.c} (98%)
 rename drivers/net/wireless/{wl12xx/wl1251_boot.h => wl1251/boot.h} (96%)
 rename drivers/net/wireless/{wl12xx/wl1251_cmd.c => wl1251/cmd.c} (98%)
 rename drivers/net/wireless/{wl12xx/wl1251_cmd.h => wl1251/cmd.h} (99%)
 rename drivers/net/wireless/{wl12xx/wl1251_debugfs.c => wl1251/debugfs.c} (99%)
 rename drivers/net/wireless/{wl12xx/wl1251_debugfs.h => wl1251/debugfs.h} (95%)
 rename drivers/net/wireless/{wl12xx/wl1251_event.c => wl1251/event.c} (81%)
 rename drivers/net/wireless/{wl12xx/wl1251_event.h => wl1251/event.h} (98%)
 rename drivers/net/wireless/{wl12xx/wl1251_init.c => wl1251/init.c} (98%)
 rename drivers/net/wireless/{wl12xx/wl1251_init.h => wl1251/init.h} (97%)
 rename drivers/net/wireless/{wl12xx/wl1251_io.c => wl1251/io.c} (98%)
 rename drivers/net/wireless/{wl12xx/wl1251_io.h => wl1251/io.h} (100%)
 rename drivers/net/wireless/{wl12xx/wl1251_main.c => wl1251/main.c} (96%)
 rename drivers/net/wireless/{wl12xx/wl1251_ps.c => wl1251/ps.c} (96%)
 rename drivers/net/wireless/{wl12xx/wl1251_ps.h => wl1251/ps.h} (93%)
 rename drivers/net/wireless/{wl12xx/wl1251_reg.h => wl1251/reg.h} (99%)
 rename drivers/net/wireless/{wl12xx/wl1251_rx.c => wl1251/rx.c} (96%)
 rename drivers/net/wireless/{wl12xx/wl1251_rx.h => wl1251/rx.h} (98%)
 rename drivers/net/wireless/{wl12xx/wl1251_sdio.c => wl1251/sdio.c} (98%)
 rename drivers/net/wireless/{wl12xx/wl1251_spi.c => wl1251/spi.c} (97%)
 rename drivers/net/wireless/{wl12xx/wl1251_spi.h => wl1251/spi.h} (94%)
 rename drivers/net/wireless/{wl12xx/wl1251_tx.c => wl1251/tx.c} (95%)
 rename drivers/net/wireless/{wl12xx/wl1251_tx.h => wl1251/tx.h} (98%)
 rename drivers/net/wireless/{wl12xx => wl1251}/wl1251.h (98%)
 create mode 100644 drivers/net/wireless/wl1251/wl12xx_80211.h
 create mode 100644 drivers/net/wireless/wl12xx/wl12xx_platform_data.c
 delete mode 100644 firmware/bnx2/bnx2-mips-06-5.0.0.j6.fw.ihex
 create mode 100644 firmware/bnx2/bnx2-mips-06-6.0.15.fw.ihex
 delete mode 100644 firmware/bnx2/bnx2-mips-09-5.0.0.j15.fw.ihex
 create mode 100644 firmware/bnx2/bnx2-mips-09-6.0.17.fw.ihex
 delete mode 100644 firmware/bnx2/bnx2-rv2p-06-5.0.0.j3.fw.ihex
 create mode 100644 firmware/bnx2/bnx2-rv2p-06-6.0.15.fw.ihex
 delete mode 100644 firmware/bnx2/bnx2-rv2p-09-5.0.0.j10.fw.ihex
 create mode 100644 firmware/bnx2/bnx2-rv2p-09-6.0.17.fw.ihex
 delete mode 100644 firmware/bnx2/bnx2-rv2p-09ax-5.0.0.j10.fw.ihex
 create mode 100644 firmware/bnx2/bnx2-rv2p-09ax-6.0.17.fw.ihex
 delete mode 100644 firmware/bnx2x-e1-5.2.13.0.fw.ihex
 delete mode 100644 firmware/bnx2x-e1h-5.2.13.0.fw.ihex
 create mode 100644 firmware/bnx2x/bnx2x-e1-6.0.34.0.fw.ihex
 create mode 100644 firmware/bnx2x/bnx2x-e1h-6.0.34.0.fw.ihex
 create mode 100644 firmware/bnx2x/bnx2x-e2-6.0.34.0.fw.ihex
 create mode 100644 include/linux/tc_act/tc_csum.h
 rename include/linux/{spi => }/wl12xx.h (68%)
 create mode 100644 include/net/gre.h
 create mode 100644 include/net/netfilter/ipv6/nf_defrag_ipv6.h
 create mode 100644 include/net/netfilter/xt_log.h
 create mode 100644 include/net/tc_act/tc_csum.h
 create mode 100644 net/ipv4/gre.c
 create mode 100644 net/ipv6/netfilter/nf_defrag_ipv6_hooks.c
 create mode 100644 net/netfilter/ipvs/ip_vs_nfct.c
 create mode 100644 net/netfilter/ipvs/ip_vs_pe.c
 create mode 100644 net/netfilter/ipvs/ip_vs_pe_sip.c
 delete mode 100644 net/rds/rdma.h
 create mode 100644 net/rds/xlist.h
 create mode 100644 net/sched/act_csum.c

^ permalink raw reply	[flat|nested] 1437+ messages in thread
* [GIT] Networking
@ 2010-10-27 22:05 David Miller
  0 siblings, 0 replies; 1437+ messages in thread
From: David Miller @ 2010-10-27 22:05 UTC (permalink / raw)
  To: torvalds; +Cc: akpm, netdev, linux-kernel


Hey, I'll resolve the verify_iovec() issue this evening so that we can
wrap that sucker up.  But for now here's some fallout fixing changes
as well as some other misc stuff:

1) dev_can_checksum() doesn't handle nested VLAN properly, also
   generic checksum capability does not imply FCOE checksumming.
   Both from Ben Hutchings.

2) typhoon driver fails to wait for RX mode commands to finish,
   also use new VLAN accel interfaces.  From David Dillow.

3) Tunnel transmit recursion limit too low, increase to 10.

4) Fix tms380tr build failure on x86-64 due to too large udelay().

5) ipv6 TPROXY needs to check CAP_NET_ADMIN just like ipv4, from
   Balazs Scheidler.

6) Add caif-u5500 driver, from Amarnath Revanna.

7) Add tscan1 CAN driver, from Andre B. Oliveira.

8) Missed MTU updates in ip6_tunnel, from Anders Franzen.

9) Lots of missing __rcu annotations, from Eric Dumazet.

10) Fix bonding lockdep spew, from Jarek Poplawski.

11) Fix slhc double-export of symbol, from Denis Kirjanov.

12) cxgb4 too-early-queue access crash fix from Dimitris Michailidis,
    also use new VLAN accel interfaces.

13) mlx4_en out-of-bounds array access fix from Eli Cohen.

14) IPv6 temporary address handling fixes from Glenn Wurster.

15) Fix RX crashes in gianfar, from Jarek Poplawski.

16) Fix ipv6 defrag dependencies with ip6tables and tproxy, from KOVACS Krisztian.

17) Missing CONFIG_SYSCTL checks in ipv6 reasm netfilter code.

18) Tunnel RCU protection fix from Pavel Emelyanov.

19) be2net bug fixes from Somnath Kotur (calling netif_carrier_off() too
    early, UDP packet handling, and worker thread destruction and
    scheduling bugs).

20) qlcnic can use invalid VLAN ids, from Sony Chacko.

21) Accidental exporting of static functions in l2tp, from Stephen Rothwell.

22) Toss lazy workqueue from connector, from Tejun Heo.

23) Final function staticization round from Stephen Hemminger.

Please pull, thanks a lot!

The following changes since commit 12ba8d1e9262ce81a695795410bd9ee5c9407ba1:

  fix braino in fs: do not assign default i_ino in new_inode (2010-10-26 20:25:45 -0700)

are available in the git repository at:
  master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git master

Amarnath Revanna (3):
      caif-u5500: Adding shared memory include
      caif-u5500: CAIF shared memory mailbox interface
      caif-u5500: Build config for CAIF shared mem driver

Anders Franzen (1):
      ip6_tunnel dont update the mtu on the route.

Andre B. Oliveira (1):
      can: tscan1: add driver for TS-CAN1 boards

Balazs Scheidler (1):
      tproxy: Add missing CAP_NET_ADMIN check to ipv6 side

Ben Greear (2):
      ath9k: Properly initialize ath_common->cc_lock.
      ath5k: Properly initialize ath_common->cc_lock.

Ben Hutchings (2):
      net: Fix some corner cases in dev_can_checksum()
      net: NETIF_F_HW_CSUM does not imply FCoE CRC offload

Breno Leitao (1):
      ehea: Fixing statistics

Christian Lamparter (4):
      carl9170: fix async command buffer leak
      mac80211: don't sanitize invalid rates
      carl9170: fix memory leak issue in async cmd macro wrappers
      carl9170: fix scheduling while atomic

David Dillow (2):
      typhoon: wait for RX mode commands to finish
      typhoon: update to new VLAN acceleration model

David S. Miller (4):
      net: Increase xmit RECURSION_LIMIT to 10.
      tms380tr: Use mdelay() in tms380tr_wait().
      netfilter: Add missing CONFIG_SYSCTL checks in ipv6's nf_conntrack_reasm.c
      Merge branch 'master' of git://git.kernel.org/.../linville/wireless-2.6

Denis Kirjanov (1):
      slhc: Don't export symbols twice

Dimitris Michailidis (2):
      cxgb4: fix crash due to manipulating queues before registration
      cxgb4: update to utilize the newer VLAN infrastructure

Divy Le Ray (1):
      cxgb3: fix device opening error path

Don Fry (1):
      iwlwifi: quiet a noisy printk

Eli Cohen (1):
      mlx4_en: Fix out of bounds array access

Eric Dumazet (17):
      netlink: fix netlink_change_ngroups()
      vlan: rcu annotations
      ipv6: ip6_ptr rcu annotations
      net/802: add __rcu annotations
      tunnels: add _rcu annotations
      rps: add __rcu annotations
      net_ns: add __rcu annotations
      net: add __rcu annotation to sk_filter
      ipv4: add __rcu annotations to ip_ra_chain
      fib: fix fib_nl_newrule()
      fib_hash: fix rcu sparse and logical errors
      ipv4: add __rcu annotations to routes.c
      net: add __rcu annotations to protocol
      tunnels: add __rcu annotations
      fib_rules: __rcu annotates ctarget
      inetpeer: __rcu annotations
      ehea: fix use after free

Felix Fietkau (3):
      ath9k: fix crash in ath_update_survey_stats
      ath9k: fix handling of rate control probe frames
      ath9k: resume aggregation immediately after a hardware reset

Glenn Wurster (2):
      IPv6: Create temporary address if none exists.
      IPv6: Temp addresses are immediately deleted.

Grazvydas Ignotas (1):
      wl1251: fix module names

Guo-Fu Tseng (1):
      jme: Support WoL after shutdown

Harvey Harrison (3):
      vmxnet3: remove set_flag_le{16,64} helpers
      vmxnet3: annotate hwaddr members as __iomem pointers
      vmxnet3: fix typo setting confPA

Jarek Poplawski (2):
      gianfar: Fix crashes on RX path (Was Re: [Bugme-new] [Bug 19692] New: linux-2.6.36-rc5 crash with gianfar ethernet at full line rate traffic)
      bonding: Fix lockdep warning after bond_vlan_rx_register()

Joe Perches (1):
      drivers/atm/eni.c: Remove multiple uses of KERN_<level>

Joshua Hoke (1):
      macb: Don't re-enable interrupts while in polling mode

Julia Lawall (3):
      drivers/net/sb1000.c: delete double assignment
      drivers/net/typhoon.c: delete double assignment
      drivers/isdn: delete double assignment

KOVACS Krisztian (1):
      netfilter: fix module dependency issues with IPv6 defragmentation, ip6tables and xt_TPROXY

Luis R. Rodriguez (2):
      cfg80211: fix regression on processing country IEs
      ath9k_hw: Fix TX carrier leakage for IEEE compliance on AR9003 2.2

Marc Kleine-Budde (12):
      can: at91_can: use correct bit to enable CAN_CTRLMODE_3_SAMPLES
      can: at91_can: fix reception of extended frames
      can: at91_can: fix use after free of priv
      can: at91_can: fix compiler warning in at91_irq_err_state
      can: at91_can: fix section mismatch warning
      can: at91_can: implement and use at91_get_berr_counter
      can: at91_can: set bittiming in chip_start
      can: at91_can: convert readl, writel their __raw pendants
      can: at91_can: convert dev_<level> printing to netdev_<level>
      can: at91_can: add KBUILD_MODNAME to bittiming constant
      can: flexcan: fix use after free of priv
      can: mcp251x: fix reception of standard RTR frames

Masayuki Ohtake (1):
      can: Topcliff: Add PCH_CAN driver.

Nicolas Kaiser (1):
      drivers/net: sgiseeq: fix return on error

Paul Gortmaker (1):
      pktgen: clean up handling of local/transient counter vars

Pavel Emelyanov (1):
      tunnels: Fix tunnels change rcu protection

Rafael J. Wysocki (1):
      tg3: Do not call device_set_wakeup_enable() under spin_lock_bh

Rafał Miłecki (1):
      b43: N-PHY: fix infinite-loop-typo

Rajkumar Manoharan (1):
      mac80211: Fix ibss station got expired immediately

Randy Dunlap (1):
      pch_can: depends on PCI

Ron Mercer (1):
      qlge: bugfix: Restoring the vlan setting.

Senthil Balasubramanian (1):
      ath9k_hw: Fix divide by zero cases in paprd.

Somnath Kotur (3):
      be2net: Call netif_carier_off() after register_netdev()
      be2net: Fix CSO for UDP packets
      be2net: Schedule/Destroy worker thread in probe()/remove() rather than open()/close()

Sony Chacko (2):
      qlcnic: reduce rx ring size
      qlcnic: define valid vlan id range

Stephen Rothwell (1):
      l2tp: static functions should not be exported

Tejun Heo (2):
      connector: remove lazy workqueue creation
      mac80211: cancel restart_work explicitly instead of depending on flush_scheduled_work()

Ursula Braun (1):
      ipv6: fix refcnt problem related to POSTDAD state

amit salecha (1):
      qlcnic: fix mac learning

sjur.brandeland@stericsson.com (1):
      caif-u5500: CAIF shared memory transport protocol

stephen hemminger (12):
      mlx4: make functions local and remove dead code.
      l2tp: make local function static
      benet: remove dead code
      benet: make be_poll_rx local
      atl1c: make functions static
      atlx: make local functions/data static
      phylib: make local function static
      vxge: make functions local and remove dead code
      qlge: make local functions static
      qlge: disable unsed dump code
      bnx2x: make local function static and remove dead code
      e1000: make e1000_reinit_safe local

 Documentation/networking/phy.txt                   |   18 -
 drivers/atm/eni.c                                  |    7 +-
 drivers/connector/cn_queue.c                       |   75 +-
 drivers/connector/connector.c                      |    9 +-
 drivers/isdn/hardware/mISDN/mISDNinfineon.c        |    2 +-
 drivers/isdn/hisax/l3_1tr6.c                       |    6 +-
 drivers/net/atl1c/atl1c.h                          |    2 -
 drivers/net/atl1c/atl1c_main.c                     |    6 +-
 drivers/net/atlx/atl1.c                            |   12 +-
 drivers/net/atlx/atl1.h                            |    9 +-
 drivers/net/atlx/atlx.c                            |    4 +
 drivers/net/benet/be_cmds.c                        |   36 -
 drivers/net/benet/be_cmds.h                        |    2 -
 drivers/net/benet/be_main.c                        |   49 +-
 drivers/net/bnx2x/bnx2x.h                          |    5 -
 drivers/net/bnx2x/bnx2x_cmn.c                      |    3 +-
 drivers/net/bnx2x/bnx2x_cmn.h                      |   55 -
 drivers/net/bnx2x/bnx2x_init_ops.h                 |   34 +-
 drivers/net/bnx2x/bnx2x_link.c                     |  137 +--
 drivers/net/bnx2x/bnx2x_link.h                     |   15 -
 drivers/net/bnx2x/bnx2x_main.c                     |   55 +-
 drivers/net/bonding/bond_main.c                    |    4 +-
 drivers/net/caif/Kconfig                           |    7 +
 drivers/net/caif/Makefile                          |    4 +
 drivers/net/caif/caif_shm_u5500.c                  |  129 ++
 drivers/net/caif/caif_shmcore.c                    |  744 ++++++++++
 drivers/net/can/Kconfig                            |    8 +
 drivers/net/can/Makefile                           |    1 +
 drivers/net/can/at91_can.c                         |   95 +-
 drivers/net/can/flexcan.c                          |    3 +-
 drivers/net/can/mcp251x.c                          |    3 +
 drivers/net/can/pch_can.c                          | 1463 ++++++++++++++++++++
 drivers/net/can/sja1000/Kconfig                    |   12 +
 drivers/net/can/sja1000/Makefile                   |    1 +
 drivers/net/can/sja1000/tscan1.c                   |  216 +++
 drivers/net/cxgb3/cxgb3_main.c                     |    8 +-
 drivers/net/cxgb4/cxgb4.h                          |    1 -
 drivers/net/cxgb4/cxgb4_main.c                     |   33 +-
 drivers/net/cxgb4/sge.c                            |   23 +-
 drivers/net/e1000/e1000_main.c                     |    2 +-
 drivers/net/ehea/ehea.h                            |    2 +
 drivers/net/ehea/ehea_main.c                       |   42 +-
 drivers/net/gianfar.c                              |    6 +-
 drivers/net/jme.c                                  |   45 +-
 drivers/net/macb.c                                 |   27 +-
 drivers/net/mlx4/icm.c                             |   28 +-
 drivers/net/mlx4/icm.h                             |    2 -
 drivers/net/mlx4/port.c                            |   11 +
 drivers/net/phy/phy.c                              |   13 +-
 drivers/net/phy/phy_device.c                       |   19 +-
 drivers/net/qlcnic/qlcnic.h                        |    7 +-
 drivers/net/qlcnic/qlcnic_ethtool.c                |   23 +-
 drivers/net/qlcnic/qlcnic_main.c                   |   19 +-
 drivers/net/qlge/qlge.h                            |   12 +-
 drivers/net/qlge/qlge_main.c                       |   24 +-
 drivers/net/qlge/qlge_mpi.c                        |    6 +-
 drivers/net/sb1000.c                               |    6 +-
 drivers/net/sgiseeq.c                              |    2 +-
 drivers/net/slhc.c                                 |   15 +-
 drivers/net/tg3.c                                  |   10 +-
 drivers/net/tokenring/tms380tr.c                   |    2 +-
 drivers/net/typhoon.c                              |   92 +-
 drivers/net/vmxnet3/upt1_defs.h                    |    8 +-
 drivers/net/vmxnet3/vmxnet3_defs.h                 |    6 +-
 drivers/net/vmxnet3/vmxnet3_drv.c                  |   22 +-
 drivers/net/vmxnet3/vmxnet3_ethtool.c              |   14 +-
 drivers/net/vmxnet3/vmxnet3_int.h                  |   19 +-
 drivers/net/vxge/vxge-config.c                     |  332 ++++--
 drivers/net/vxge/vxge-config.h                     |  227 +---
 drivers/net/vxge/vxge-ethtool.c                    |    2 +-
 drivers/net/vxge/vxge-main.c                       |   64 +-
 drivers/net/vxge/vxge-main.h                       |   59 +-
 drivers/net/vxge/vxge-traffic.c                    |  101 +--
 drivers/net/vxge/vxge-traffic.h                    |  134 --
 drivers/net/wireless/ath/ath5k/base.c              |    1 +
 .../net/wireless/ath/ath9k/ar9003_2p2_initvals.h   |  191 ++-
 drivers/net/wireless/ath/ath9k/ar9003_paprd.c      |   14 +-
 drivers/net/wireless/ath/ath9k/beacon.c            |    2 +-
 drivers/net/wireless/ath/ath9k/init.c              |    1 +
 drivers/net/wireless/ath/ath9k/main.c              |    7 +-
 drivers/net/wireless/ath/ath9k/xmit.c              |    8 +-
 drivers/net/wireless/ath/carl9170/cmd.h            |   51 +-
 drivers/net/wireless/ath/carl9170/main.c           |    2 +-
 drivers/net/wireless/ath/carl9170/usb.c            |   25 +-
 drivers/net/wireless/b43/phy_n.c                   |    2 +-
 drivers/net/wireless/iwlwifi/iwl-agn-tx.c          |    3 +-
 drivers/net/wireless/wl1251/Makefile               |    8 +-
 include/linux/connector.h                          |    8 -
 include/linux/netdevice.h                          |   18 +-
 include/linux/phy.h                                |   12 -
 include/net/caif/caif_shm.h                        |   26 +
 include/net/dst.h                                  |    2 +-
 include/net/fib_rules.h                            |    2 +-
 include/net/garp.h                                 |    2 +-
 include/net/inetpeer.h                             |    2 +-
 include/net/ip.h                                   |    4 +-
 include/net/ip6_tunnel.h                           |    2 +-
 include/net/ipip.h                                 |    6 +-
 include/net/net_namespace.h                        |    2 +-
 include/net/protocol.h                             |    4 +-
 include/net/sock.h                                 |    2 +-
 include/net/xfrm.h                                 |    4 +-
 net/802/garp.c                                     |   18 +-
 net/802/stp.c                                      |    4 +-
 net/8021q/vlan.c                                   |    6 +-
 net/core/dev.c                                     |   38 +-
 net/core/fib_rules.c                               |   21 +-
 net/core/filter.c                                  |    4 +-
 net/core/net-sysfs.c                               |   20 +-
 net/core/net_namespace.c                           |    4 +-
 net/core/pktgen.c                                  |   30 +-
 net/core/sock.c                                    |    2 +-
 net/core/sysctl_net_core.c                         |    3 +-
 net/ipv4/fib_hash.c                                |   36 +-
 net/ipv4/gre.c                                     |    5 +-
 net/ipv4/inetpeer.c                                |  138 ++-
 net/ipv4/ip_gre.c                                  |    1 +
 net/ipv4/ip_sockglue.c                             |   10 +-
 net/ipv4/ipip.c                                    |    1 +
 net/ipv4/protocol.c                                |    8 +-
 net/ipv4/route.c                                   |   75 +-
 net/ipv4/tunnel4.c                                 |   29 +-
 net/ipv4/udp.c                                     |    2 +-
 net/ipv6/addrconf.c                                |   16 +-
 net/ipv6/ip6_tunnel.c                              |    2 +
 net/ipv6/ipv6_sockglue.c                           |    4 +
 net/ipv6/netfilter/Kconfig                         |    5 +
 net/ipv6/netfilter/Makefile                        |    5 +-
 net/ipv6/netfilter/nf_conntrack_reasm.c            |    5 +-
 net/ipv6/protocol.c                                |    8 +-
 net/ipv6/raw.c                                     |    2 +-
 net/ipv6/sit.c                                     |    1 +
 net/ipv6/tunnel6.c                                 |   24 +-
 net/ipv6/udp.c                                     |    2 +-
 net/l2tp/l2tp_core.c                               |   53 +-
 net/l2tp/l2tp_core.h                               |   33 -
 net/l2tp/l2tp_ip.c                                 |    2 +-
 net/mac80211/ibss.c                                |    1 +
 net/mac80211/main.c                                |    8 +-
 net/mac80211/rate.c                                |    3 +
 net/netfilter/Kconfig                              |    2 +
 net/netfilter/xt_TPROXY.c                          |   10 +-
 net/netfilter/xt_socket.c                          |   12 +-
 net/netlink/af_netlink.c                           |   65 +-
 net/wireless/reg.c                                 |    2 +-
 145 files changed, 4008 insertions(+), 1822 deletions(-)
 create mode 100644 drivers/net/caif/caif_shm_u5500.c
 create mode 100644 drivers/net/caif/caif_shmcore.c
 create mode 100644 drivers/net/can/pch_can.c
 create mode 100644 drivers/net/can/sja1000/tscan1.c
 create mode 100644 include/net/caif/caif_shm.h

^ permalink raw reply	[flat|nested] 1437+ messages in thread
* [GIT] Networking
@ 2010-10-29 19:59 David Miller
  2010-10-29 21:41 ` Linus Torvalds
  0 siblings, 1 reply; 1437+ messages in thread
From: David Miller @ 2010-10-29 19:59 UTC (permalink / raw)
  To: torvalds; +Cc: akpm, netdev, linux-kernel


This has the verify_iovec() INT_MAX limiter change as well as:

1) kdump fix in netxen from Rajesh Borundia

2) 8390 oops in probe regression fix from Pavel Emelyanov

3) ipv4 routing table memory leak on namespace stop, also from Pavel
   Emelyanov.

4) cxgb3 probe OOPS fix from Nishanth Aravamudan

5) Limit kernel stack usage of root in pktgen, from Nelson Elhage,
   although this needs a few more tweaks I think.

6) Fix panic in cxgb3 tx desc freeing, from Krishna Kumar.

7) DCCP updates from Gerrit Renker

8) pch_gbe build fix, due to missing dependency

9) Signedness fix in netfilte xt_socket code.

10) Atheros driver fixes from Felix Fietkau, Jones Desougi, Luis
    R. Rodriguez, Mohammed Shafi Shajakhan, and Rajkumar Manoharan

Please pull, thanks a lot!

The following changes since commit 1e431a9d6478940c0b5fcfa1c17a336fc0683409:

  Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb (2010-10-29 11:49:38 -0700)

are available in the git repository at:

  master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git master

Carolyn Wyborny (2):
      e1000e: reset PHY after errors detected
      e1000e: Add check for reset flags before displaying reset message

David S. Miller (4):
      pch_gbe: Select MII.
      net: Limit socket I/O iovec total length to INT_MAX.
      netfilter: xt_socket: Make tproto signed in socket_mt6_v1().
      Merge branch 'master' of git://git.kernel.org/.../linville/wireless-2.6

Dmitry Artamonow (1):
      USB: gadget: fix ethernet gadget crash in gether_setup

Emil Tantilov (2):
      ixgb: call pci_disable_device in ixgb_remove
      igbvf: fix panic on load

Felix Fietkau (1):
      ath9k: fix tx aggregation flush on AR9003

Geert Uytterhoeven (1):
      net: atarilance - flags should be unsigned long

Gerrit Renker (4):
      dccp: Return-value convention of hc_tx_send_packet()
      dccp: Extend CCID packet dequeueing interface
      dccp: Refine the wait-for-ccid mechanism
      dccp ccid-2: Stop polling

Jesper Juhl (1):
      mac80211: fix failure to check kmalloc return value in key_key_read

Jesse Gross (1):
      igb: Fix unused variable warning.

John Fastabend (1):
      ixgbe: DCB, fix TX hang occurring in stress condition with PFC

Jones Desougi (1):
      ath5k: Fix double free on hw attach error path

Jouni Malinen (1):
      mac80211: Fix scan_ies_len to include DS Params

Krishna Kumar (1):
      cxgb3: Fix panic in free_tx_desc()

Larry Finger (1):
      b43: Fix warning at drivers/mmc/core/core.c:237 in mmc_wait_for_cmd

Luis R. Rodriguez (4):
      ath9k: add locking for stopping RX
      ath9k: add locking for starting the PCU on RX
      ath9k: rename rxflushlock to pcu_lock
      ath9k: lock reset and PCU start/stopping

Mohammed Shafi Shajakhan (1):
      ath9k: Fix incorrect access of rate flags in RC

Nelson Elhage (1):
      pktgen: Limit how much data we copy onto the stack.

Nishanth Aravamudan (1):
      cxgb3: fix crash due to manipulating queues before registration

Paul Fox (1):
      libertas: Fix sd8686 firmware reload

Pavel Emelyanov (2):
      8390: Don't oops on starting dev queue
      fib: Fix fib zone and its hash leak on namespace stop

Rajesh Borundia (1):
      netxen: fix kdump

Rajkumar Manoharan (1):
      ath9k_htc: Set proper firmware offset for Netgear WNDA3200

avisconti (1):
      stmmac: enable/disable rx/tx in the core with a single write.

 drivers/net/Kconfig                      |    1 +
 drivers/net/atarilance.c                 |    2 +-
 drivers/net/cxgb3/cxgb3_main.c           |    2 +-
 drivers/net/cxgb3/sge.c                  |    4 +-
 drivers/net/e1000e/82571.c               |   38 ++++++
 drivers/net/e1000e/e1000.h               |    3 +
 drivers/net/e1000e/netdev.c              |   29 ++++-
 drivers/net/igb/igb_main.c               |    1 -
 drivers/net/igbvf/netdev.c               |    8 +-
 drivers/net/ixgb/ixgb_main.c             |    1 +
 drivers/net/ixgbe/ixgbe_dcb.c            |   39 +++++-
 drivers/net/ixgbe/ixgbe_dcb.h            |    5 +-
 drivers/net/ixgbe/ixgbe_dcb_82599.c      |    5 +
 drivers/net/ixgbe/ixgbe_dcb_82599.h      |    3 +
 drivers/net/ixgbe/ixgbe_main.c           |   12 ++-
 drivers/net/lib8390.c                    |    1 -
 drivers/net/netxen/netxen_nic_ctx.c      |   15 --
 drivers/net/netxen/netxen_nic_main.c     |    7 +
 drivers/net/stmmac/stmmac_main.c         |   40 ++-----
 drivers/net/wireless/ath/ath5k/attach.c  |   17 +--
 drivers/net/wireless/ath/ath9k/ath9k.h   |    2 +-
 drivers/net/wireless/ath/ath9k/hif_usb.c |   10 +-
 drivers/net/wireless/ath/ath9k/main.c    |   31 ++++-
 drivers/net/wireless/ath/ath9k/rc.c      |    2 +-
 drivers/net/wireless/ath/ath9k/recv.c    |   15 +-
 drivers/net/wireless/ath/ath9k/xmit.c    |   18 ++--
 drivers/net/wireless/b43/sdio.c          |    2 +
 drivers/net/wireless/libertas/if_sdio.c  |   32 ++++-
 drivers/usb/gadget/u_ether.c             |    2 +-
 include/linux/dccp.h                     |    4 +-
 include/linux/socket.h                   |    2 +-
 include/net/ip_fib.h                     |    2 +
 net/compat.c                             |   10 +-
 net/core/iovec.c                         |   20 ++--
 net/core/pktgen.c                        |    7 +-
 net/dccp/ccid.h                          |   34 +++++-
 net/dccp/ccids/ccid2.c                   |   23 ++-
 net/dccp/ccids/ccid2.h                   |    5 +
 net/dccp/ccids/ccid3.c                   |   12 +-
 net/dccp/dccp.h                          |    5 +-
 net/dccp/output.c                        |  209 ++++++++++++++++++------------
 net/dccp/proto.c                         |   21 +++-
 net/dccp/timer.c                         |   27 ++--
 net/ipv4/fib_frontend.c                  |    2 +-
 net/ipv4/fib_hash.c                      |   18 +++
 net/ipv4/fib_trie.c                      |    5 +
 net/mac80211/debugfs_key.c               |    6 +-
 net/mac80211/main.c                      |    5 +-
 net/netfilter/xt_socket.c                |    7 +-
 49 files changed, 525 insertions(+), 246 deletions(-)

^ permalink raw reply	[flat|nested] 1437+ messages in thread
* [GIT] Networking
@ 2010-10-31  1:32 David Miller
  2010-10-31  9:19 ` Ben Hutchings
  0 siblings, 1 reply; 1437+ messages in thread
From: David Miller @ 2010-10-31  1:32 UTC (permalink / raw)
  To: torvalds; +Cc: akpm, netdev, linux-kernel


Last pull request before 2.6.37-rc1, I really wanted to get your
sendto/recvfrom patch in here as well as the RDS fixes.

I did a bunch of tests with the various I/O calls using different
lengths, like 10, (2^31 - 1), 2^31, 2^32, and larger on 64-bit and it
all seems to be doing the right thing at least with TCP and UDP.

Also:

1) Fix ipv6 UDP statistic regression, from Eric Dumazet.

2) Fix GRE fallback tunnel init, also from Eric Dumazet.

3) Endianness fixes from vmxnet driver, from Harvey Harrison.

4) New ID for pcnet_cs driver.

5) Stack info leak to userland fix in mISDN, from Kulikov Vasiliy.

6) netxen_nic probe crash due to too early tx queue manipulation,
   fix from Denis Kirjanov.

7) RDS fixes from you and Andy Grover.

8) Fix sparse and section mismatch problems in new pch_can driver,
   from Marc Kleine-Budde.

Please pull, thanks a lot!

The following changes since commit b7bdcc47114595b4b359fe0f7d941bb901e9261d:

  Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-kconfig (2010-10-29 14:43:30 -0700)

are available in the git repository at:

  master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git master

Andy Grover (4):
      RDS: Return -EINVAL if rds_rdma_pages returns an error
      RDS: Clean up error handling in rds_cmsg_rdma_args
      RDS: Copy rds_iovecs into kernel memory instead of rereading from userspace
      RDS: Let rds_message_alloc_sgs() return NULL

Cyril Chemparathy (1):
      phy/marvell: rename 88ec048 to 88e1318s and fix mscr1 addr

Denis Kirjanov (1):
      netxen_nic: Fix the tx queue manipulation bug in netxen_nic_probe

Eric Dumazet (2):
      ipv6/udp: report SndbufErrors and RcvbufErrors
      ip_gre: fix fallback tunnel setup

Hans J. Koch (1):
      netdev: can: Change mail address of Hans J. Koch

Harvey Harrison (2):
      vmxnet3: remove unnecessary byteswapping in BAR writing macros
      vmxnet: trivial annotation of protocol constant

Ken Kawasaki (1):
      pcnet_cs: add new_id

Kulikov Vasiliy (1):
      isdn: mISDN: socket: fix information leak to userland

Linus Torvalds (2):
      net: fix rds_iovec page count overflow
      net: Truncate recvfrom and sendto length to INT_MAX.

Marc Kleine-Budde (2):
      can: pch_can: fix sparse warning
      can: pch_can: fix section mismatch warning by using a whitelisted name

 drivers/isdn/mISDN/socket.c          |    2 +
 drivers/net/can/at91_can.c           |    2 +-
 drivers/net/can/pch_can.c            |   10 ++--
 drivers/net/netxen/netxen_nic_main.c |    1 -
 drivers/net/pcmcia/pcnet_cs.c        |    1 +
 drivers/net/phy/marvell.c            |   18 +++---
 drivers/net/vmxnet3/vmxnet3_drv.c    |    2 +-
 drivers/net/vmxnet3/vmxnet3_int.h    |    8 +-
 include/linux/marvell_phy.h          |    2 +-
 net/ipv4/ip_gre.c                    |    6 +-
 net/ipv6/proc.c                      |    4 +
 net/rds/message.c                    |    5 ++
 net/rds/rdma.c                       |  126 ++++++++++++++++++++++-----------
 net/rds/send.c                       |    4 +
 net/socket.c                         |    4 +
 15 files changed, 128 insertions(+), 67 deletions(-)

^ permalink raw reply	[flat|nested] 1437+ messages in thread
* [GIT] Networking
@ 2010-11-05 22:14 David Miller
  0 siblings, 0 replies; 1437+ messages in thread
From: David Miller @ 2010-11-05 22:14 UTC (permalink / raw)
  To: torvalds; +Cc: akpm, netdev, linux-kernel


Here are the bug fixes that have queued up since -rc1,
several "touches netdev queue before device registry"
cases as well as the "net dst" percpu fixup you want
to see merged ASAP.

Please pull, thanks a lot!

The following changes since commit ff8b16d7e15a8ba2a6086645614a483e048e3fbf:

  vmstat: fix offset calculation on void* (2010-11-03 14:39:58 -0400)

are available in the git repository at:
  master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git master

Amerigo Wang (1):
      netxen: remove unused firmware exports

André Carvalho de Matos (1):
      caif: Bugfix for socket priority, bindtodev and dbg channel.

David S. Miller (2):
      ibm_newemac: Remove netif_stop_queue() in emac_probe().
      Merge branch 'master' of git://git.kernel.org/.../kaber/nf-2.6

Divy Le Ray (3):
      cxgb3: remove call to stop TX queues at load time.
      cxgb4: remove call to stop TX queues at load time.
      cxgb4vf: remove call to stop TX queues at load time.

Dmitry Artamonow (1):
      USB: gadget: fix ethernet gadget crash in gether_setup

Dr. David Alan Gilbert (1):
      l2tp: kzalloc with swapped params in l2tp_dfs_seq_open

Eric Dumazet (7):
      netfilter: nf_conntrack: allow nf_ct_alloc_hashtable() to get highmem pages
      netfilter: fix nf_conntrack_l4proto_register()
      jme: fix panic on load
      qlcnic: fix panic on load
      atl1 : fix panic on load
      de2104x: fix panic on load
      fib: fib_result_assign() should not change fib refcounts

Herbert Xu (1):
      cls_cgroup: Fix crash on module unload

Jan Engelhardt (1):
      netfilter: ip6_tables: fix information leak to userspace

John Faith (1):
      smsc911x: Set Ethernet EEPROM size to supported device's size

Ming Lei (1):
      usbnet: fix usb_autopm_get_interface failure(v1)

Nelson Elhage (2):
      netlink: Make nlmsg_find_attr take a const nlmsghdr*.
      inet_diag: Make sure we actually run the same bytecode we audited.

Patrick McHardy (1):
      netfilter: nf_nat: fix compiler warning with CONFIG_NF_CT_NETLINK=n

Pavel Emelyanov (2):
      rds: Lost locking in loop connection freeing
      rds: Remove kfreed tcp conn from list

Sjur Brændeland (1):
      caif: SPI-driver bugfix - incorrect padding.

Thomas Graf (1):
      text ematch: check for NULL pointer before destroying textsearch config

Tom Herbert (1):
      net: check queue_index from sock is valid for device

Uwe Kleine-König (1):
      trivial: fix typos concerning "function"

Vasiliy Kulikov (2):
      ipv4: netfilter: arp_tables: fix information leak to userland
      ipv4: netfilter: ip_tables: fix information leak to userland

Xiaotian Feng (1):
      net dst: fix percpu_counter list corruption and poison overwritten

Yaniv Rosner (8):
      bnx2x: Restore appropriate delay during BMAC reset
      bnx2x: Fix waiting for reset complete on BCM848x3 PHYs
      bnx2x: Fix port selection in case of E2
      bnx2x: Clear latch indication on link reset
      bnx2x: Fix resetting BCM8726 PHY during common init
      bnx2x: Do not enable CL37 BAM unless it is explicitly enabled
      bnx2x: Reset 8073 phy during common init
      bnx2x: Update version number

andrew hendry (1):
      memory corruption in X.25 facilities parsing

sjur.brandeland@stericsson.com (1):
      caif: Remove noisy printout when disconnecting caif socket

 drivers/isdn/hisax/isar.c            |    4 +-
 drivers/net/atlx/atl1.c              |    1 -
 drivers/net/bnx2x/bnx2x.h            |    4 +-
 drivers/net/bnx2x/bnx2x_hsi.h        |    9 +++++-
 drivers/net/bnx2x/bnx2x_link.c       |   57 +++++++++++++++++++++++++---------
 drivers/net/caif/caif_spi.c          |   57 +++++++++++++++++++++++++---------
 drivers/net/caif/caif_spi_slave.c    |   13 +++++--
 drivers/net/cxgb3/cxgb3_main.c       |    1 -
 drivers/net/cxgb4/cxgb4_main.c       |    1 -
 drivers/net/cxgb4vf/cxgb4vf_main.c   |    1 -
 drivers/net/ibm_newemac/core.c       |    1 -
 drivers/net/jme.c                    |    4 --
 drivers/net/netxen/netxen_nic_main.c |    3 --
 drivers/net/qlcnic/qlcnic_main.c     |    1 -
 drivers/net/smsc911x.h               |    2 +-
 drivers/net/tulip/de2104x.c          |    1 -
 drivers/net/usb/usbnet.c             |   11 ++++++
 drivers/usb/gadget/u_ether.c         |    1 -
 include/net/caif/caif_dev.h          |    4 +-
 include/net/caif/caif_spi.h          |    2 +
 include/net/caif/cfcnfg.h            |    8 ++--
 include/net/netlink.h                |    2 +-
 net/caif/caif_config_util.c          |   13 ++++++--
 net/caif/caif_dev.c                  |    2 +
 net/caif/caif_socket.c               |   45 +++++++++------------------
 net/caif/cfcnfg.c                    |   17 ++++------
 net/caif/cfctrl.c                    |    3 +-
 net/caif/cfdbgl.c                    |   14 ++++++++
 net/caif/cfrfml.c                    |    2 +-
 net/core/dev.c                       |    2 +-
 net/ipv4/fib_lookup.h                |    5 +--
 net/ipv4/inet_diag.c                 |   27 +++++++++------
 net/ipv4/netfilter/arp_tables.c      |    1 +
 net/ipv4/netfilter/ip_tables.c       |    1 +
 net/ipv4/netfilter/nf_nat_core.c     |   40 ++++++++++++------------
 net/ipv6/netfilter/ip6_tables.c      |    1 +
 net/ipv6/route.c                     |    2 +
 net/l2tp/l2tp_debugfs.c              |    2 +-
 net/netfilter/nf_conntrack_core.c    |    3 +-
 net/netfilter/nf_conntrack_proto.c   |    6 +++
 net/rds/loop.c                       |    4 ++
 net/rds/tcp.c                        |    6 +++
 net/sched/cls_cgroup.c               |    2 -
 net/sched/em_text.c                  |    3 +-
 net/x25/x25_facilities.c             |    8 ++--
 net/x25/x25_in.c                     |    2 +
 46 files changed, 246 insertions(+), 153 deletions(-)

^ permalink raw reply	[flat|nested] 1437+ messages in thread
* [GIT] Networking
@ 2010-11-12 22:38 David Miller
  0 siblings, 0 replies; 1437+ messages in thread
From: David Miller @ 2010-11-12 22:38 UTC (permalink / raw)
  To: torvalds; +Cc: akpm, netdev, linux-kernel


1) mac80211 fix for handling of a scan cancellation, from Brian Cavagnolo

2) Minor overflow in can-bcm, from Oliver Hartkopp

3) cxgb4vf bug fixes from Casey Leedom

4) X.25 facility parsing validation bug fixes from Dan Rosenberg

5) ATM solos bug fixes from David Woodhouse.

6) TCP does state changes on unlocked socket, oops.  Based upon
   a report by Alexey Kuznetsov.

7) Don't allow socket filters to read uninitialized memory.  Based
   upon a patch by Eric Dumazet.

8) TCP_MAXSEG, if set low enough, can result in a divide by zero or
   by a negative number (because we sometimes subtract certain TCP
   option sizes), bump minimum from 8 to 64.

9) MaxBookAir3,1(2) bluetooth support, from Edgar Hucek.

10) ip_mc_drop_socket() does wrong refcounting, fix from Eric Dumazet.

11) VLAN regression fixes from Hao Zheng.

12) Link state reporting fix in virtio-net from Jason Wang.

13) ucc_geth bug fixes from Joakim Tjernlund.

14) queue_map can be used uninitialized in pktgen, from Junchang Wang.

15) axnet_cs resume fix from Ken Kawasaki.

16) Don't lose state of ipv6 addresses which will be kept across an
    ifdown/ifup cycle, fix and report from Lorenzo Colitti.

17) af_packet recvmsg() header size check is borked in the GSO case,
    fix from Mariusz Kozlowski.

18) dst cache build fix, missing linux/cache.h include, from Paul Mundt.

19) Fix from Rafael J. Wysocki for device_set_wakeup_enable() being called
    in gianfar driver from unsleepable context.

20) Fragment overlap check in ipv6 and netfilter/ipv6 is buggered, from
    Shan Wei.

21) Fix message size calculation in rtnetlink link messages, from Thomas
    Graf.

22) ax25/packet ->getsockopt() info leak to userland fix from Vasiliy
    Kulikov

23) r8169 regression fixes from françois romieu

24) Packet scheduler basic classifier doesn't report stats, fix from
    Stephen Hemminger.

Please pull, thanks a lot!

The following changes since commit 5398a64c63a69a0ac33dbae458ea4aab0dc23f14:

  Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 (2010-11-08 10:55:29 -0800)

are available in the git repository at:

  master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git master

Ben Greear (2):
      docs: Add neigh/gc_thresh3 and route/max_size documentation.
      ipv6: Warn users if maximum number of routes is reached.

Brian Cavagnolo (1):
      mac80211: unset SDATA_STATE_OFFCHANNEL when cancelling a scan

Casey Leedom (6):
      cxgb4vf: don't implement trivial (and incorrect) ndo_select_queue()
      cxgb4vf: fix bug in Generic Receive Offload
      cxgb4vf: fix some errors in Gather List to skb conversion
      cxgb4vf: flesh out PCI Device ID Table ...
      cxgb4vf: Fail open if link_start() fails.
      cxgb4vf: add call to Firmware to reset VF State.

Christian Lamparter (1):
      carl9170: usbid table updates

Dan Rosenberg (1):
      x25: Prevent crashing when parsing bad X.25 facilities

Daniel Drake (1):
      libertas: terminate scan when stopping interface

David S. Miller (5):
      filter: make sure filters dont read uninitialized memory
      tcp: Increase TCP_MAXSEG socket option minimum.
      Merge branch 'master' of git://git.kernel.org/.../linville/wireless-2.6
      Merge git://git.kernel.org/.../kaber/nf-2.6
      tcp: Don't change unlocked socket state in tcp_v4_err().

David Woodhouse (2):
      solos: Add 'Firmware' attribute for Traverse overall firmware version
      solos: Refuse to upgrade firmware with older FPGA. It doesn't work.

Dmitry Torokhov (1):
      NET: pktgen - fix compile warning

Edgar (gimli) Hucek (1):
      Bluetooth: Add MacBookAir3,1(2) support

Eric Dumazet (3):
      inet: fix ip_mc_drop_socket()
      net/dst: dst_dev_event() called after other notifiers
      net: avoid limits overflow

Eric Paris (1):
      netfilter: NF_HOOK_COND has wrong conditional

Felix Fietkau (2):
      cfg80211: fix a crash in dev lookup on dump commands
      ath9k: check old power mode before clearing cycle counters

Frank Blaschka (1):
      qeth: fix race condition during device startup

Guillaume Chazarain (2):
      skge: Remove tx queue stopping in skge_devinit()
      net: Detect and ignore netif_stop_queue() calls before register_netdev()

Gustavo F. Padovan (1):
      Bluetooth: fix endianness conversion in L2CAP

Haitao Zhang (1):
      ath9k_htc: Add support for device ID 3346

Hao Zheng (3):
      vlan: Add function to retrieve EtherType from vlan packets.
      bnx2x: Look inside vlan when determining checksum proto.
      ixgbe: Look inside vlan when determining offload protocol.

Jason Wang (1):
      virtio-net: init link state correctly

Joakim Tjernlund (2):
      ucc_geth: Do not bring the whole IF down when TX failure.
      ucc_geth: Fix deadlock

Johan Hedberg (1):
      Bluetooth: Fix non-SSP auth request for HIGH security level sockets

Junchang Wang (1):
      pktgen: correct uninitialized queue_map

Ken Kawasaki (1):
      axnet_cs: fix resume problem for some Ax88790 chip

Kulikov Vasiliy (1):
      net: tipc: fix information leak to userland

Linus Torvalds (1):
      libipw: fix proc entry removal

Lorenzo Colitti (1):
      ipv6: addrconf: don't remove address state on ifdown if the address is being kept

Luiz Augusto von Dentz (1):
      Bluetooth: fix not setting security level when creating a rfcomm session

Mariusz Kozlowski (1):
      net: Fix header size check for GSO case in recvmsg (af_packet)

Matthew Garrett (1):
      Bluetooth: Enable USB autosuspend by default on btusb

Oliver Hartkopp (1):
      can-bcm: fix minor heap overflow

Paul Mundt (1):
      net dst: need linux/cache.h for ____cacheline_aligned_in_smp.

Pavel Emelyanov (1):
      rds: Fix rds message leak in rds_message_map_pages

Rafael J. Wysocki (1):
      gianfar: Do not call device_set_wakeup_enable() under a spinlock

Rajkumar Manoharan (3):
      ath9k: Avoid HW opmode overridden on monitor mode changes
      ath9k_htc: Fix probe failure if CONFIG_USB_DEBUG enabled
      ath9k_hw: Fix memory leak on ath9k_hw_rf_alloc_ext_banks failure

Randy Dunlap (1):
      Bluetooth: fix hidp kconfig dependency warning

Shan Wei (2):
      ipv6: fix overlap check for fragments
      netfilter: ipv6: fix overlap check for fragments

Thomas Graf (1):
      rtnetlink: Fix message size calculation for link messages

Ursula Braun (1):
      qeth: remove dev_queue_xmit invocation

Vasanthakumar Thiagarajan (1):
      ath9k_hw: Fix AR9280 surprise removal during frequent idle on/off

Vasiliy Kulikov (2):
      net: ax25: fix information leak to userland
      net: packet: fix information leak to userland

Vivek Natarajan (1):
      ath9k: Fix a DMA latency issue for Intel Pinetrail platforms.

Wey-Yi Guy (1):
      iwlwifi: dont use pci_dev before it being assign

françois romieu (2):
      r8169: revert "Handle rxfifo errors on 8168 chips"
      r8169: fix sleeping while holding spinlock.

stephen hemminger (1):
      classifier: report statistics for basic classifier

steven miao (1):
      Bluetooth: fix unaligned access to l2cap conf data

 Documentation/networking/ip-sysctl.txt       |    9 ++
 drivers/atm/solos-attrlist.c                 |    1 +
 drivers/atm/solos-pci.c                      |    8 ++
 drivers/bluetooth/btusb.c                    |    5 +
 drivers/net/bnx2x/bnx2x_cmn.c                |    2 +-
 drivers/net/cxgb4vf/cxgb4vf_main.c           |   42 ++++++---
 drivers/net/cxgb4vf/sge.c                    |  122 ++++++++++++++++----------
 drivers/net/cxgb4vf/t4vf_common.h            |    1 +
 drivers/net/cxgb4vf/t4vf_hw.c                |   19 ++++
 drivers/net/gianfar_ethtool.c                |    5 +-
 drivers/net/ixgbe/ixgbe_main.c               |   60 +++++++------
 drivers/net/pcmcia/axnet_cs.c                |   30 ++++--
 drivers/net/r8169.c                          |    9 +-
 drivers/net/skge.c                           |    1 -
 drivers/net/ucc_geth.c                       |   25 ++++--
 drivers/net/virtio_net.c                     |   12 ++-
 drivers/net/wireless/ath/ath9k/ar9002_hw.c   |    3 +
 drivers/net/wireless/ath/ath9k/ath9k.h       |    1 +
 drivers/net/wireless/ath/ath9k/hif_usb.c     |   31 +++----
 drivers/net/wireless/ath/ath9k/hw.c          |   15 +++-
 drivers/net/wireless/ath/ath9k/hw.h          |    1 +
 drivers/net/wireless/ath/ath9k/init.c        |    8 ++
 drivers/net/wireless/ath/ath9k/main.c        |   29 +++++--
 drivers/net/wireless/ath/ath9k/recv.c        |    4 +-
 drivers/net/wireless/ath/ath9k/reg.h         |    1 +
 drivers/net/wireless/ath/carl9170/usb.c      |    4 +-
 drivers/net/wireless/ipw2x00/libipw_module.c |    9 +-
 drivers/net/wireless/iwlwifi/iwl3945-base.c  |    3 +-
 drivers/net/wireless/libertas/cfg.c          |    5 +-
 drivers/net/wireless/libertas/dev.h          |    1 +
 drivers/net/wireless/libertas/main.c         |    7 ++
 drivers/s390/net/qeth_core.h                 |    9 --
 drivers/s390/net/qeth_core_main.c            |   55 ++----------
 include/linux/if_vlan.h                      |   25 +++++
 include/linux/netdevice.h                    |    5 +
 include/linux/netfilter.h                    |    2 +-
 include/net/dn.h                             |    2 +-
 include/net/dst_ops.h                        |    1 +
 include/net/sock.h                           |    4 +-
 include/net/tcp.h                            |    6 +-
 include/net/udp.h                            |    4 +-
 net/ax25/af_ax25.c                           |    2 +-
 net/bluetooth/hci_event.c                    |    6 ++
 net/bluetooth/hidp/Kconfig                   |    2 +-
 net/bluetooth/l2cap.c                        |    8 +-
 net/bluetooth/rfcomm/core.c                  |   13 ++-
 net/can/bcm.c                                |    2 +-
 net/core/dst.c                               |    1 +
 net/core/filter.c                            |   64 ++++++++------
 net/core/pktgen.c                            |    6 +-
 net/core/rtnetlink.c                         |    9 +-
 net/core/sock.c                              |   14 ++--
 net/decnet/af_decnet.c                       |    2 +-
 net/decnet/sysctl_net_decnet.c               |    4 +-
 net/ipv4/igmp.c                              |    4 +-
 net/ipv4/proc.c                              |    8 +-
 net/ipv4/sysctl_net_ipv4.c                   |    5 +-
 net/ipv4/tcp.c                               |    6 +-
 net/ipv4/tcp_input.c                         |   11 ++-
 net/ipv4/tcp_ipv4.c                          |    8 +-
 net/ipv4/udp.c                               |    4 +-
 net/ipv6/addrconf.c                          |   24 ++----
 net/ipv6/netfilter/nf_conntrack_reasm.c      |    2 +-
 net/ipv6/reassembly.c                        |    2 +-
 net/ipv6/route.c                             |    6 +-
 net/mac80211/iface.c                         |    6 +-
 net/packet/af_packet.c                       |    7 +-
 net/rds/message.c                            |    4 +-
 net/sched/cls_basic.c                        |    4 +
 net/sctp/protocol.c                          |    2 +-
 net/sctp/socket.c                            |    4 +-
 net/sctp/sysctl.c                            |    4 +-
 net/tipc/socket.c                            |    1 +
 net/wireless/nl80211.c                       |    4 +-
 net/x25/x25_facilities.c                     |   12 ++-
 75 files changed, 512 insertions(+), 335 deletions(-)

^ permalink raw reply	[flat|nested] 1437+ messages in thread
* [GIT] Networking
@ 2010-11-19 21:00 David Miller
  0 siblings, 0 replies; 1437+ messages in thread
From: David Miller @ 2010-11-19 21:00 UTC (permalink / raw)
  To: torvalds; +Cc: akpm, netdev, linux-kernel


Some small fixes:

1) If the number of RX queues is increased then decreased we get an
   OOPS in the kobject code because we do not clean up no longer used
   kobjects properly on the decrease.  Fix from John Fastabend.

2) IGMP handling race fix in bonding from Eric Dumazet.

3) Userland build fix, rtnetlink.h needs to hide some kernel internal
   includes in __KERNEL__, from Andy Whitcroft.

4) bnx2x returns postitive errors codes by accident, from Vasiliy Kulikov.

5) ICMP code needs to fill in flow source address properly, otherwise
   wrong IPSEC rule will be matched, fix from Ulrich Weber.

6) IPV6 interface properties mistakenly exposed as jiffies instead of
   msecs.  In some cases sysfs got it right, but netlink got it wrong.
   Fix from Thomas Graf.

7) SCTP checksums handled wrong in 8169 and 8139 chips, from Shan Wei.

8) Fix IP_VS kbuild deps, from Patrick McHardy.

9) Fix HT40 support in mac80211, from Luis R. Rodriguez and Mark Mentovai

10) iovec len overflow fix in rds from Dan Rosenberg.

11) IRDA should accept zero length writes, from Wolfram Sang.

Please pull, thanks a lot!

The following changes since commit 9457b24a0955bbdd2e89220a75de69fe09501bba:

  Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (2010-11-12 17:17:55 -0800)

are available in the git repository at:

  master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git master

Andy Whitcroft (1):
      net: rtnetlink.h -- only include linux/netdevice.h when used by the kernel

Arnd Hannemann (1):
      b43legacy: Fix compile on ARM architecture

Christian Lamparter (1):
      carl9170: fix usb anchor wait timeout

Dan Rosenberg (1):
      rds: Integer overflow in RDS cmsg handling

David S. Miller (1):
      Merge branch 'master' of git://git.kernel.org/.../linville/wireless-2.6

Eric Dumazet (1):
      bonding: fix a race in IGMP handling

Giuseppe Cavallaro (1):
      MAINTAINERS: Add stmmac maintainer

John Fastabend (1):
      net: zero kobject in rx_queue_release

Jussi Kivilinna (1):
      cfg80211: fix WIPHY_FLAG_IBSS_RSN bit

Ken Kawasaki (1):
      ipg.c: remove id [SUNDANCE, 0x1021]

Luis R. Rodriguez (1):
      cfg80211: fix extension channel checks to initiate communication

Mark Mentovai (1):
      cfg80211: fix can_beacon_sec_chan, reenable HT40

Namhyung Kim (1):
      3c59x: fix build failure on !CONFIG_PCI

Nicolas Kaiser (1):
      gianfar: fix signedness issue

Patrick McHardy (1):
      netfilter: fix IP_VS dependencies

Rajkumar Manoharan (4):
      ath9k_htc: Update usb device ID list
      ath9k_htc: Add new devices into AR7010
      ath9k_hw: Set proper eeprom offset for AR9287 HTC devices
      ath9k_htc: Avoid setting QoS control for non-QoS frames

Randy Dunlap (1):
      net: fix kernel-doc for sk_filter_rcu_release

Sarveshwar Bandi (1):
      be2net: Fix to avoid firmware update when interface is not open.

Shan Wei (2):
      r8169: fix checksum broken
      8139cp: fix checksum broken

Tetsuo Handa (1):
      net: Fix duplicate volatile warning.

Thomas Graf (2):
      ipv6: Expose IFLA_PROTINFO timer values in msecs instead of jiffies
      ipv6: Expose reachable and retrans timer values as msecs

Ulrich Weber (1):
      xfrm: update flowi saddr in icmp_send if unset

Vasiliy Kulikov (2):
      net: bnx2x: fix error value sign
      net: caif: spi: fix potential NULL dereference

Vivek Natarajan (1):
      ath9k: Remove pm_qos request after hw unregister.

Wolfram Sang (2):
      irda: irttp: allow zero byte packets
      net: irda: irttp: sync error paths of data- and udata-requests

 MAINTAINERS                                   |    7 +++
 drivers/net/3c59x.c                           |    6 ++-
 drivers/net/8139cp.c                          |   10 ++---
 drivers/net/benet/be_main.c                   |    6 +++
 drivers/net/bnx2x/bnx2x_main.c                |    2 +-
 drivers/net/bonding/bond_main.c               |    2 +
 drivers/net/caif/caif_spi.c                   |    4 +-
 drivers/net/gianfar.c                         |    7 +--
 drivers/net/ipg.c                             |    6 +--
 drivers/net/r8169.c                           |    3 +-
 drivers/net/wireless/ath/ath9k/eeprom_9287.c  |    2 +-
 drivers/net/wireless/ath/ath9k/hif_usb.c      |    9 ++++
 drivers/net/wireless/ath/ath9k/htc_drv_init.c |    2 +
 drivers/net/wireless/ath/ath9k/htc_drv_txrx.c |    2 +-
 drivers/net/wireless/ath/ath9k/init.c         |    3 +-
 drivers/net/wireless/ath/ath9k/reg.h          |    8 +++-
 drivers/net/wireless/ath/carl9170/usb.c       |    4 +-
 include/linux/rtnetlink.h                     |    2 +-
 include/net/cfg80211.h                        |    2 +-
 include/net/neighbour.h                       |    2 +-
 net/core/filter.c                             |    2 +-
 net/core/net-sysfs.c                          |   10 ++++-
 net/ipv4/icmp.c                               |    3 +
 net/ipv6/addrconf.c                           |   28 +++++++-----
 net/irda/irttp.c                              |   30 ++++++++++----
 net/netfilter/ipvs/Kconfig                    |    1 +
 net/rds/rdma.c                                |    2 +-
 net/wireless/chan.c                           |   54 +++++++++++++++++++++++++
 28 files changed, 164 insertions(+), 55 deletions(-)

^ permalink raw reply	[flat|nested] 1437+ messages in thread
* [GIT] Networking
@ 2010-11-22 20:10 David Miller
  0 siblings, 0 replies; 1437+ messages in thread
From: David Miller @ 2010-11-22 20:10 UTC (permalink / raw)
  To: torvalds; +Cc: akpm, netdev, linux-kernel


1) Fix screaming IRQ in e1000, from Anupam Chanda.

2) Fix module parameter bustage in qlge, from Sonny Rao.

3) Interface address leak in ipv6, fix from John Fastabend.

   This would have been merged sooner except that I erroneously
   put this into my net-next-2.6 tree, oops.

4) Support for more Marvell PHY variants, from David Daney.

5) Chip variant checking fix in atl1c from Ben Hutchings.

6) Baud rate correction fix in SH-irda driver, from Nicolas Kaiser.

Please pull, thanks a lot!

The following changes since commit b86db4744230c94e480de56f1b7f31117edbf193:

  Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 (2010-11-19 19:46:45 -0800)

are available in the git repository at:

  master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git master

Anupam Chanda (1):
      e1000: fix screaming IRQ

Ben Hutchings (1):
      atl1c: Fix hardware type check for enabling OTP CLK

David Daney (3):
      phylib: Use common page register definition for Marvell PHYs.
      phylib: Add support for Marvell 88E1149R devices.
      of/phylib: Use device tree properties to initialize Marvell PHYs.

Eric Dumazet (1):
      net: allow GFP_HIGHMEM in __vmalloc()

John Fastabend (1):
      ipv6: fix missing in6_ifa_put in addrconf

Nicolas Kaiser (1):
      SuperH IrDA: correct Baud rate error correction

Simon Horman (1):
      bonding: change list contact to netdev@vger.kernel.org

Sonny Rao (1):
      qlge: Fix incorrect usage of module parameters and netdev msg level

 MAINTAINERS                    |    2 +-
 drivers/net/atl1c/atl1c_hw.c   |    2 +-
 drivers/net/e1000/e1000_main.c |   12 ++-
 drivers/net/irda/sh_sir.c      |    2 +-
 drivers/net/phy/marvell.c      |  164 ++++++++++++++++++++++++++++++++++++---
 drivers/net/qlge/qlge_main.c   |    6 +-
 include/linux/marvell_phy.h    |    1 +
 net/ceph/buffer.c              |    2 +-
 net/core/request_sock.c        |    4 +-
 net/ipv4/fib_trie.c            |    2 +-
 net/ipv6/addrconf.c            |    6 +-
 net/xfrm/xfrm_hash.c           |    2 +-
 12 files changed, 173 insertions(+), 32 deletions(-)

^ permalink raw reply	[flat|nested] 1437+ messages in thread
* [GIT] Networking
@ 2010-11-29 19:15 David Miller
  0 siblings, 0 replies; 1437+ messages in thread
From: David Miller @ 2010-11-29 19:15 UTC (permalink / raw)
  To: torvalds; +Cc: akpm, netdev, linux-kernel


1) Two fixes for some exploitable cases in AF_UNIX file descriptor
   passing.  Both from Eric Dumazet.

2) DECnet uninitialized data to userspace fix from Dan Rosenberg.

3) Unit allocation passes incorrect error back to userspace, fix
   from Cyrill Gorcunov.

4) Inet port binding optimization maintains it's counters
   erroneously, fix from Nagendra Tomar.

5) Three econet CVE fixes from Phil Blundell.

6) ucc_geth halts in half-duplex due to over-aggressive fifo
   size setting, fix from Yang Li.

7) mcast/ucast Address handling fix in cxgb4vf from Casey Leedom.

8) tcp_adv_win_scale can cause undefined behavior if the
   abos() of it's value is >31 since it is used in shifts.
   Fix from Alexey Dobriyan

9) Regression in au1000_eth MAC enable register accesses, fix
   from Wolfgang Grandegger.

10) Struct initializer fix in pch_gbe from Toshiharu Okada.

11) Stack corruption bug in isdn icn driver from Steven Rostedt.

12) DCCP ACK tracking fix from Gerrit Renker.

13) HSO driver does not honor disable_net setting, from Filip Aben.

14) ath9k wireless timeout fix from Felix Fietkau.

Please pull, thanks a lot!

The following changes since commit 72083646528d4887b920deb71b37e09bc7d227bb:

  Un-inline get_pipe_info() helper function (2010-11-28 16:27:19 -0800)

are available in the git repository at:
  master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git master

Alexey Dobriyan (1):
      tcp: restrict net.ipv4.tcp_adv_win_scale (#20312)

Breno Leitao (1):
      ehea: Add some info messages and fix an issue

Casey Leedom (1):
      cxgb4vf: fix setting unicast/multicast addresses ...

Christian Lamparter (1):
      carl9170: fix virtual interface setup crash

Cyrill Gorcunov (1):
      net, ppp: Report correct error code if unit allocation failed

Dan Rosenberg (1):
      DECnet: don't leak uninitialized stack byte

Daniel Klaffenbach (1):
      ssb: b43-pci-bridge: Add new vendor for BCM4318

David S. Miller (3):
      Merge branch 'master' of git://git.kernel.org/.../linville/wireless-2.6
      tcp: Make TCP_MAXSEG minimum more correct.
      Merge branch 'vhost-net' of git://git.kernel.org/.../mst/vhost

Eric Dumazet (2):
      af_unix: limit unix_tot_inflight
      af_unix: limit recursion level

Felix Fietkau (1):
      ath9k: fix timeout on stopping rx dma

Filip Aben (1):
      hso: fix disable_net

Gerrit Renker (1):
      dccp: fix error in updating the GAR

Guennadi Liakhovetski (1):
      wireless: b43: fix error path in SDIO

Jiri Slaby (1):
      NET: wan/x25_asy, move lapb_unregister to x25_asy_close_tty

Michael S. Tsirkin (1):
      vhost/net: fix rcu check usage

Nagendra Tomar (1):
      inet: Fix __inet_inherit_port() to correctly increment bsockets and num_owners

Pavel Emelyanov (1):
      netns: Don't leak others' openreq-s in proc

Phil Blundell (3):
      econet: disallow NULL remote addr for sendmsg(), fixes CVE-2010-3849
      econet: fix CVE-2010-3850
      econet: fix CVE-2010-3848

Steven Rostedt (1):
      isdn: icn: Fix stack corruption bug.

Toshiharu Okada (2):
      pch_gbe dreiver: chang author
      pch_gbe driver: The wrong of initializer entry

Tracey Dent (1):
      Net: ceph: Makefile: Remove unnessary code

Wolfgang Grandegger (1):
      au1000_eth: fix invalid address accessing the MAC enable register

Yang Li (1):
      ucc_geth: fix ucc halt problem in half duplex mode

 Documentation/networking/ip-sysctl.txt   |    1 +
 drivers/isdn/icn/icn.c                   |    7 +-
 drivers/net/Kconfig                      |    6 +-
 drivers/net/au1000_eth.c                 |   10 ++--
 drivers/net/cxgb4vf/cxgb4vf_main.c       |   73 ++++++++++++++---------
 drivers/net/cxgb4vf/t4vf_hw.c            |   96 +++++++++++++++++++-----------
 drivers/net/ehea/ehea_main.c             |   18 ++++-
 drivers/net/pch_gbe/pch_gbe_main.c       |    6 +-
 drivers/net/pch_gbe/pch_gbe_param.c      |    8 +-
 drivers/net/ppp_generic.c                |   43 +++++++-------
 drivers/net/ucc_geth.h                   |    3 +-
 drivers/net/usb/hso.c                    |   10 ++-
 drivers/net/wan/x25_asy.c                |   11 ++--
 drivers/net/wireless/ath/ath9k/recv.c    |    2 +-
 drivers/net/wireless/ath/carl9170/main.c |    2 +-
 drivers/net/wireless/b43/sdio.c          |    1 +
 drivers/ssb/b43_pci_bridge.c             |    1 +
 drivers/vhost/net.c                      |    5 +-
 include/linux/pci_ids.h                  |    1 +
 include/net/af_unix.h                    |    2 +
 net/ceph/Makefile                        |   22 -------
 net/dccp/input.c                         |    3 +-
 net/decnet/af_decnet.c                   |    2 +
 net/econet/af_econet.c                   |   91 +++++++++++++---------------
 net/ipv4/inet_hashtables.c               |    3 +-
 net/ipv4/sysctl_net_ipv4.c               |    6 ++-
 net/ipv4/tcp.c                           |    2 +-
 net/ipv4/tcp_ipv4.c                      |    4 +-
 net/unix/af_unix.c                       |   37 ++++++++++--
 net/unix/garbage.c                       |    9 +++-
 30 files changed, 281 insertions(+), 204 deletions(-)

^ permalink raw reply	[flat|nested] 1437+ messages in thread
* [GIT] Networking
@ 2010-12-14 20:39 David Miller
  0 siblings, 0 replies; 1437+ messages in thread
From: David Miller @ 2010-12-14 20:39 UTC (permalink / raw)
  To: torvalds; +Cc: akpm, netdev, linux-kernel


A lot of small stuff has queued up while you were away.

1) Revert a pppoe change that causes SKBs to be accessed after
   being freed, from Andrej Ota.

2) SFC driver crash and list corruption fixes from Ben Hutchings.

3) EHEA driver needs to respect ethtool enable/disable LRO requests
   otherwise bridging and routing won't work properly, from
   Breno Leitao.

4) x25 device refcount leak fix from Apollon Oikonomopoulos.

5) Endian fixes in LSO code in bnx2x driver from Vladislav Zolotarov.

6) stmmac driver uses spinlock uninitialized, from Vlad Lungu.

7) enic driver passes wrong pointer to IRQ handler, from Vasanthy Kolluri.

8) TCP time-wait bucket message can spam logs, use event counter instead.
   From Tom Herbert.

9) IPSEC code leaks in error path of xfrm_state_migrate(), fix from
   Thomas Egerer.

10) Elide checksumming offload on GE0301 option HSO cards
    From Thomas Bogendoerfer.

11) Runtime PM fix in r8169 from Rafael J. Wysocki.

12) Netlink group improperly choosen during ipv6 net link advertisement.
    Fix frm Nicolas Dichtel.

13) Improper cleanup in econet's SIOCSIFADDR ioctl code.

14) benet driver loads mac addresses incorrectly due to improperly
    coded memcpy() call, fix from Joe Jin.

15) Several fixes from Eric Dumazet:

    a) sk_filter() hits RCU incorrectly
    b) llc leaks netdevices
    c) obscure sysctl settings can make tcp divide by zero
    d) Use ACCESS_ONCE() when reading sysctl_tcp_cookie_size
       multiple times
    e) Fix crash when skb_defer_rx_timestamp() encounters a packet
       lacking a link-level header.

16) ECONET aun_incoming() makes bogus unconditional deref of skb->dev,
    it should use dst->dev when 'dst' is non-NULL instead.

17) Blocking mechanism for bonding netpoll support via a cpumask is
    busted, use a counter instead.  From Neil Horman.

18) SCTP_SET_PEER_PRIMARY_ADDR erroneously does not accept ipv4-mapped	
    ipv6 addresses, fix from Wei Yongjun.

19) ATM layer creates sysfs device links with bogus parent relationships,
    fix from Dan Williams.

20) Fix deadlock in qlge, from Ron Mercer.

21) Several bluetooth fixes:
    a) Fix error propagation from sco_connect_ind(), sco_connect_cfm(), and
       sco_disconn_cfm().
    b) fix btusb log spam during autosuspend
    c) Add USB device ID for Atheros 3011

22) Fix bonding regression in MAC address assignment behavior, from
    David Strand.

23) IPV6 over IPV4 tunnel fix from David McCullough.  SIT driver was
    consuming all the packets and sending ICMP port unreachables out.

24) Various ath9k, mac80211, orinoco, libertas et al. fixes via John
    Linville and the wireless team.

25) Fix NULL deref during ixgbe shutdown, from Don Skidmore.

26) TCP receive window initialization boundary checks improperly
    coded, fix from Nandita Dukkipati.

27) IFB transmit queue can deadlock, fix from Changli Gao.

28) Modalias fixes in l2tp and connector.

29) IPv6 tunnel uses incorrect MTU when encap limit is enabled, fix from
    Anders Franzen.

30) VHOST dirty page logging traversal fix from Michael S. Tsirkin.

Please pull, thanks a lot!

The following changes since commit bcb38ceb225f5d5b2198a2755277cd441ed1e82b:

  Revert "debug_locks: set oops_in_progress if we will log messages." (2010-11-29 15:18:28 -0800)

are available in the git repository at:
  master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git master

Alexander V. Lukyanov (1):
      tulip: fix hang in dmfe driver on sending of big packet

Anders Franzen (1):
      Make the ip6_tunnel reflect the true mtu.

Andrej Ota (1):
      pppoe.c: Fix kernel panic caused by __pppoe_xmit

Apollon Oikonomopoulos (1):
      x25: decrement netdev reference counts on unload

Bala Shanmugam (1):
      Bluetooth: Add new PID for Atheros 3011

Ben Hutchings (2):
      sfc: Fix crash in legacy onterrupt handler during ring reallocation
      sfc: Fix NAPI list corruption during ring reallocation

Breno Leitao (1):
      ehea: Fixing LRO configuration

Casey Leedom (1):
      cxgb4vf: Ingress Queue Entry Size needs to be 64 bytes

Changli Gao (1):
      ifb: goto resched directly if error happens and dp->tq isn't empty

Christian Lamparter (2):
      carl9170: fix carl9170_tx_prepare typo
      mac80211: ignore non-bcast mcast deauth/disassoc franes

Dan Williams (1):
      atm: correct sysfs 'device' link creation and parent relationships

Daniel Drake (1):
      libertas: fix memory corruption in lbs_remove_card()

David Kilroy (4):
      orinoco: abort scan on interface down
      orinoco: initialise priv->hw before assigning the interrupt
      orinoco: clear countermeasure setting on commit
      orinoco: fix TKIP countermeasure behaviour

David McCullough (1):
      net/ipv6/sit.c: return unhandled skb to tunnel4_rcv

David S. Miller (5):
      Merge branch 'master' of git://git.kernel.org/.../linville/wireless-2.6
      Merge branch 'sfc-2.6.37' of git://git.kernel.org/.../bwh/sfc-2.6
      econet: Fix crash in aun_incoming().
      Merge branch 'master' of git://git.kernel.org/.../linville/wireless-2.6
      Merge branch 'vhost-net' of git://git.kernel.org/.../mst/vhost

David Strand (1):
      bonding: check for assigned mac before adopting the slaves mac address

Dimitris Michailidis (1):
      cxgb4: fix MAC address hash filter

Don Skidmore (1):
      ixgbe: fix possible NULL pointer deference in shutdown path

Eric Dumazet (5):
      filter: fix sk_filter rcu handling
      llc: fix a device refcount imbalance
      tcp: avoid a possible divide by zero
      tcp: protect sysctl_tcp_cookie_size reads
      net: fix skb_defer_rx_timestamp()

Felix Fietkau (3):
      ath9k_hw: fix endian issues with CTLs on AR9003
      ath9k_hw: fix more bitfield related endian issues
      ath9k: fix a DMA related race condition on reset

Gabor Juhos (1):
      ath9k: use per-device struct for pm_qos_* operations

Giuseppe CAVALLARO (1):
      phy: add the IC+ IP1001 driver

Gustavo F. Padovan (1):
      Bluetooth: Fix not returning proper error in SCO

Hauke Mehrtens (1):
      b44: fix workarround for wap54g10

Helmut Schaa (1):
      mac80211: Fix BUG in pskb_expand_head when transmitting shared skbs

Javier Cardona (3):
      ath5k: Fix beaconing in mesh mode
      ath5k: Prevent mesh interfaces from being counted as ad-hoc
      ath5k: Put the right tsf value in mesh beacons

Joe Jin (1):
      driver/net/benet: fix be_cmd_multicast_set() memcpy bug

Johannes Berg (1):
      ath9k/carl9170: advertise P2P

John W. Linville (2):
      Merge branch 'master' of git://git.kernel.org/.../padovan/bluetooth-2.6
      Revert "ath9k: Fix STA disconnect issue due to received MIC failed bcast frames"

Jouni Malinen (1):
      mac80211: Fix frame injection using non-AP vif

Kim Lilliestierna XX (1):
      CAIF: Fix U5500 compile error for shared memory driver

Krzysztof Halasa (1):
      WAN: Fix a TX IRQ causing BUG() in PC300 and PCI200SYN drivers.

Kyle McMartin (1):
      MAINTAINERS: remove me from tulip

Martin Lucina (1):
      net: Document the kernel_recvmsg() function

Matteo Croce (1):
      ath9k: fix bug in tx power

Michael S. Tsirkin (1):
      vhost: correctly set bits of dirty pages

Michal Marek (1):
      l2tp: Fix modalias of l2tp_ip

Nandita Dukkipati (1):
      tcp: Bug fix in initialization of receive window.

Neil Horman (1):
      net: Convert netpoll blocking api in bonding driver to be a counter

Nelson Elhage (1):
      econet: Do the correct cleanup after an unprivileged SIOCSIFADDR.

Nicolas Dichtel (1):
      ipv6: fix nl group when advertising a new link

Rafael J. Wysocki (1):
      r8169: Fix runtime power management

Rajkumar Manoharan (2):
      ath9k: Disable SWBA interrupt on remove_interface
      ath9k: fix beacon resource related race condition

Ron Mercer (1):
      qlge: Fix deadlock when cancelling worker.

Senthil Balasubramanian (3):
      mac80211: Fix STA disconnect due to MIC failure
      ath9k: Fix STA disconnect issue due to received MIC failed bcast frames
      ath9k: Fix STA disconnect issue due to received MIC failed bcast frames

Stefan Seyfried (1):
      Bluetooth: Fix log spamming in btusb due to autosuspend

Stephen Hemminger (1):
      connector: add module alias

Sujith Manoharan (1):
      ath9k_htc: Fix suspend/resume

Sven Neumann (1):
      libertas: fix invalid access

Thomas Bogendoerfer (1):
      hso: IP checksuming doesn't work on GE0301 option cards

Thomas Egerer (1):
      xfrm: Fix xfrm_state_migrate leak

Tom Herbert (1):
      tcp: Replace time wait bucket msg by counter

Vasanthakumar Thiagarajan (1):
      ath9k: Fix bug in reading input gpio state for ar9003

Vasanthy Kolluri (1):
      enic: Bug Fix: Pass napi reference to the isr that services receive queue

Vlad Lungu (1):
      stmmac: priv->lock can be used uninitialized

Vladislav Zolotarov (3):
      bnx2x: LSO code was broken on BE platforms
      bnx2x: Fixed a compilation warning
      bnx2x: Advance a version number to 1.60.01-0

Wei Yongjun (1):
      SCTP: Fix SCTP_SET_PEER_PRIMARY_ADDR to accpet v4mapped address

 MAINTAINERS                                    |    1 -
 drivers/atm/adummy.c                           |    2 +-
 drivers/atm/ambassador.c                       |    3 +-
 drivers/atm/atmtcp.c                           |    2 +-
 drivers/atm/eni.c                              |    2 +-
 drivers/atm/firestream.c                       |    2 +-
 drivers/atm/fore200e.c                         |   14 ++--
 drivers/atm/he.c                               |    2 +-
 drivers/atm/horizon.c                          |    3 +-
 drivers/atm/idt77252.c                         |    3 +-
 drivers/atm/iphase.c                           |    2 +-
 drivers/atm/lanai.c                            |    2 +-
 drivers/atm/nicstar.c                          |    3 +-
 drivers/atm/solos-pci.c                        |    8 +-
 drivers/atm/zatm.c                             |    2 +-
 drivers/bluetooth/ath3k.c                      |    4 +
 drivers/bluetooth/btusb.c                      |   12 +++-
 drivers/connector/connector.c                  |    1 +
 drivers/net/b44.c                              |   11 ++--
 drivers/net/benet/be_cmds.c                    |    2 +-
 drivers/net/bnx2x/bnx2x.h                      |    4 +-
 drivers/net/bnx2x/bnx2x_cmn.c                  |   42 ++++++++-----
 drivers/net/bnx2x/bnx2x_init_ops.h             |    4 +-
 drivers/net/bonding/bond_main.c                |   19 ++----
 drivers/net/bonding/bonding.h                  |   12 +---
 drivers/net/caif/caif_shm_u5500.c              |    2 +-
 drivers/net/caif/caif_shmcore.c                |    2 +-
 drivers/net/cxgb4/t4_hw.c                      |    2 +-
 drivers/net/cxgb4vf/cxgb4vf_main.c             |   15 ++++-
 drivers/net/ehea/ehea_ethtool.c                |    9 +++
 drivers/net/ehea/ehea_main.c                   |    7 ++-
 drivers/net/enic/enic_main.c                   |    3 +-
 drivers/net/ifb.c                              |    2 +
 drivers/net/ixgbe/ixgbe_main.c                 |    3 +
 drivers/net/phy/Kconfig                        |    2 +-
 drivers/net/phy/icplus.c                       |   59 +++++++++++++++++--
 drivers/net/pppoe.c                            |    2 +-
 drivers/net/qlge/qlge.h                        |    1 +
 drivers/net/qlge/qlge_main.c                   |    1 +
 drivers/net/qlge/qlge_mpi.c                    |   12 +---
 drivers/net/r8169.c                            |   26 +++++---
 drivers/net/sfc/efx.c                          |   43 +++++++++-----
 drivers/net/sfc/net_driver.h                   |    2 +
 drivers/net/sfc/nic.c                          |    6 ++
 drivers/net/stmmac/stmmac_main.c               |    4 +-
 drivers/net/tulip/dmfe.c                       |    6 +-
 drivers/net/usb/hso.c                          |    4 -
 drivers/net/wan/hd64572.c                      |    5 +-
 drivers/net/wireless/ath/ath5k/base.c          |   13 +++--
 drivers/net/wireless/ath/ath9k/ar9003_eeprom.c |   73 ++++++++++++-----------
 drivers/net/wireless/ath/ath9k/ar9003_eeprom.h |    9 +--
 drivers/net/wireless/ath/ath9k/ath9k.h         |    6 +-
 drivers/net/wireless/ath/ath9k/eeprom.c        |    6 +-
 drivers/net/wireless/ath/ath9k/eeprom.h        |   27 +++++----
 drivers/net/wireless/ath/ath9k/eeprom_def.c    |   23 +++++---
 drivers/net/wireless/ath/ath9k/hif_usb.c       |    7 ++
 drivers/net/wireless/ath/ath9k/htc.h           |    3 +
 drivers/net/wireless/ath/ath9k/htc_drv_init.c  |    6 ++
 drivers/net/wireless/ath/ath9k/htc_drv_main.c  |    4 +-
 drivers/net/wireless/ath/ath9k/hw.c            |    3 +-
 drivers/net/wireless/ath/ath9k/init.c          |    9 +--
 drivers/net/wireless/ath/ath9k/mac.c           |    3 +-
 drivers/net/wireless/ath/ath9k/main.c          |   28 +++++----
 drivers/net/wireless/ath/ath9k/recv.c          |    9 +++-
 drivers/net/wireless/ath/ath9k/reg.h           |    6 +-
 drivers/net/wireless/ath/ath9k/xmit.c          |   22 ++-----
 drivers/net/wireless/ath/carl9170/fw.c         |    3 +-
 drivers/net/wireless/ath/carl9170/main.c       |    3 +-
 drivers/net/wireless/ath/carl9170/tx.c         |    2 +-
 drivers/net/wireless/libertas/if_sdio.c        |    1 -
 drivers/net/wireless/libertas/if_spi.c         |    1 -
 drivers/net/wireless/libertas/main.c           |    2 -
 drivers/net/wireless/orinoco/main.c            |   18 ++++--
 drivers/net/wireless/orinoco/orinoco_cs.c      |   14 ++--
 drivers/net/wireless/orinoco/scan.c            |    8 +++
 drivers/net/wireless/orinoco/scan.h            |    1 +
 drivers/net/wireless/orinoco/spectrum_cs.c     |   14 ++--
 drivers/net/wireless/orinoco/wext.c            |    4 +-
 drivers/usb/atm/usbatm.c                       |   15 +----
 drivers/vhost/vhost.c                          |    3 +-
 include/linux/atmdev.h                         |    6 +-
 include/linux/snmp.h                           |    1 +
 include/net/sock.h                             |    4 +-
 net/atm/atm_sysfs.c                            |    3 +-
 net/atm/resources.c                            |    7 +-
 net/atm/resources.h                            |    2 +-
 net/bluetooth/sco.c                            |    6 +-
 net/core/filter.c                              |   19 ++----
 net/core/timestamping.c                        |    6 +-
 net/econet/af_econet.c                         |   12 +++-
 net/ipv4/proc.c                                |    1 +
 net/ipv4/tcp_minisocks.c                       |    2 +-
 net/ipv4/tcp_output.c                          |   42 ++++++++------
 net/ipv6/addrconf.c                            |    4 +-
 net/ipv6/ip6_tunnel.c                          |    7 ++
 net/ipv6/sit.c                                 |    3 +-
 net/l2tp/l2tp_ip.c                             |    6 ++-
 net/llc/af_llc.c                               |    5 +-
 net/mac80211/rx.c                              |    6 ++
 net/mac80211/tx.c                              |   28 ++++++++-
 net/sctp/socket.c                              |    8 +++
 net/socket.c                                   |   15 +++++
 net/x25/x25_link.c                             |    1 +
 net/xfrm/xfrm_state.c                          |    2 +-
 104 files changed, 569 insertions(+), 353 deletions(-)

^ permalink raw reply	[flat|nested] 1437+ messages in thread
* [GIT] Networking
@ 2010-12-26  4:33 David Miller
  2010-12-26  4:45 ` Anca Emanuel
  0 siblings, 1 reply; 1437+ messages in thread
From: David Miller @ 2010-12-26  4:33 UTC (permalink / raw)
  To: torvalds; +Cc: akpm, netdev, linux-kernel


1) Locally generated ipv6 ipsec tunnel packets need to be fragmented
   properly.  Fix from David Stevens.

2) Various cases of bonding over vlan aren't handled properly and can
   crash, fixes from Ben Hutchings.

3) Revert an optimization in the packet scheduler, wherein we tried to
   share an skb instead of fully cloning it, to fix some regressions.
   From Changli Gao.

4) tehuti firmware filename string was wrong, from Ben Hutchings.

5) Allot handling in sfq packet scheduler was incorrect, fix from
   Eric Dumazet.

6) Several drivers skb_reserve(skb, 2) but forget to incorporate
   that reserved space in their allocations, leading to corruption
   of memory past the end of the SKB data area later.  Fixed by
   Jarek Poplawski.

7) Packet checksumming fix in veth, from Michał Mirosław.

8) Fix hash list corruption in sk_prot_alloc(), from Octavian Purdila.

9) A few bluetooth fixes:
   a) Fix security level setting in RFCOMM, from Johan Hedberg.
   b) Missing NULL check in HCI ldisc, from Jun Nie.

10) Wireless fixes:
    a) Correct iwlagn eeprom layout assumptions, from Johannes Berg.
    b) Fix NULL deref in libertas channel handling, from Sven Neumann.
    c) mac80211 ibss merge NULL derer fix, from Tim Harvey.
    d) Add some USB IDs to p54usb driver, from Christian Lamparter.
    e) Fix workqueu issue during suspend in mac80211, from Herton Ronaldo Krzesinski.
    f) mac80211 mesh mis-handled skb clone failure, from Johannes Berg.

11) PMTU handling doesn't flush existing route correctly in ipv6, fix
    from Andrey Vagin.

12) benet drivers needs to use mutex instead of spinlock, fix from Ivan Vecera.

13) Don't use legacy PCI PM in atl1c driver, from Rafael J. Wysocki.

14) Bug in TCP's listening_get_next() can cause /proc/net/tcp listings
    to loop forever.  Fix from Eric Dumazet.

15) Fix underflow in irda IRLMP_ENUMDEVICES ioctl() handlng, fix from
    Dan Rosenberg.

16) Revert a 2.6.37 change for ipv4 subnet handling that causes
    regressions.

17) Don't accidently create ipv4 routes on downed devices, fix from
    Eric Dumazet.

Please pull, thanks a lot!    

The following changes since commit d3c7e1ab043abd7706db4fbccf327df9e62f7990:

  Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6 (2010-12-24 13:00:37 -0800)

are available in the git repository at:

  master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git master

Andreas Mohr (1):
      net: Add USB PID for new MOSCHIP USB ethernet controller MCS7832 variant

Andrey Vagin (1):
      ipv6: delete expired route in ip6_pmtu_deliver

Arnaud Ebalard (1):
      asix: add USB ID for Logitec LAN-GTJ U2A

Ben Hutchings (4):
      bonding/vlan: Remove redundant VLAN tag insertion logic
      bonding: Change active slave quietly when bond is down
      bonding/vlan: Fix mangled NAs on slaves without VLAN tag insertion
      tehuti: Firmware filename is tehuti/bdx.bin

Changli Gao (1):
      net_sched: always clone skbs

Christian Lamparter (1):
      p54usb: add 5 more USBIDs

Dan Carpenter (2):
      typhoon: memory corruption in typhoon_get_drvinfo()
      USB: mcs7830: return negative if auto negotiate fails

Dan Rosenberg (1):
      irda: prevent integer underflow in IRLMP_ENUMDEVICES

David S. Miller (4):
      Merge branch 'master' of git://git.kernel.org/.../linville/wireless-2.6
      net: Fix range checks in tcf_valid_offset().
      Merge branch 'master' of ssh://master.kernel.org/.../linville/wireless-2.6
      Revert "ipv4: Allow configuring subnets as local addresses"

David Stevens (2):
      bridge: fix IPv6 queries for bridge multicast snooping
      ipv6: Fragment locally generated tunnel-mode IPSec6 packets as needed.

Dmitry V. Levin (1):
      netlink: fix gcc -Wconversion compilation warning

Don Fry (1):
      MAINTAINERS: email address change

Eduardo Costa (1):
      p54usb: New USB ID for Gemtek WUBI-100GW

Eric Dumazet (3):
      net_sched: sch_sfq: fix allot handling
      tcp: fix listening_get_next()
      ipv4: dont create routes on down devices

Herton Ronaldo Krzesinski (1):
      mac80211: avoid calling ieee80211_work_work unconditionally

Hillf Danton (1):
      bonding: Fix slave selection bug.

Ivan Vecera (1):
      be2net: use mutex instead of spin lock for mbox_lock

Jarek Poplawski (2):
      sundance: Fix oopses with corrupted skb_shared_info
      epic100: hamachi: yellowfin: Fix skb allocation size

Johan Hedberg (1):
      Bluetooth: Fix initial RFCOMM DLC security level

Johannes Berg (2):
      iwlagn: rename enhanced txpower fields
      mac80211: fix mesh forwarding

Johannes Stezenbach (1):
      mac80211/rt2x00: add ieee80211_tx_status_ni()

John W. Linville (1):
      Merge branch 'master' of git://git.kernel.org/.../padovan/bluetooth-2.6

Jun Nie (1):
      Bluetooth: add NULL pointer check in HCI

Ken Kawasaki (1):
      axnet_cs: move id (0x1bf, 0x2328) to axnet_cs

Meelis Roos (1):
      hostap: remove netif_stop_queue from init

Michał Mirosław (1):
      net/veth: Fix packet checksumming

Octavian Purdila (1):
      net: fix nulls list corruptions in sk_prot_alloc

Rafael J. Wysocki (1):
      atl1c: Do not use legacy PCI power management

Sven Neumann (1):
      libertas: fix potential NULL-pointer dereference

Tim Harvey (1):
      mac80211: Fix NULL-pointer deference on ibss merge when not ready

Wei Yongjun (1):
      sctp: fix the return value of getting the sctp partial delivery point

Wey-Yi Guy (1):
      iwlagn: implement layout-agnostic EEPROM reading

stephen hemminger (1):
      ipv6: don't flush routes when setting loopback down

 MAINTAINERS                                   |    2 +-
 drivers/bluetooth/hci_ldisc.c                 |    6 +-
 drivers/net/atl1c/atl1c_main.c                |   39 ++++-------
 drivers/net/benet/be.h                        |    2 +-
 drivers/net/benet/be_cmds.c                   |   75 +++++++++++++---------
 drivers/net/benet/be_main.c                   |    2 +-
 drivers/net/bonding/bond_ipv6.c               |    7 ++-
 drivers/net/bonding/bond_main.c               |   42 +++---------
 drivers/net/bonding/bonding.h                 |    4 +-
 drivers/net/epic100.c                         |    4 +-
 drivers/net/hamachi.c                         |    4 +-
 drivers/net/pcmcia/axnet_cs.c                 |    1 +
 drivers/net/pcmcia/pcnet_cs.c                 |    1 -
 drivers/net/sundance.c                        |    4 +-
 drivers/net/tehuti.c                          |    4 +-
 drivers/net/typhoon.c                         |    1 -
 drivers/net/usb/asix.c                        |    4 +
 drivers/net/usb/mcs7830.c                     |   14 +++-
 drivers/net/veth.c                            |    4 +-
 drivers/net/wireless/hostap/hostap_main.c     |    1 -
 drivers/net/wireless/iwlwifi/iwl-1000.c       |    2 +
 drivers/net/wireless/iwlwifi/iwl-6000.c       |   12 ++++
 drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c |   88 ++++++++++++++++++++++++-
 drivers/net/wireless/iwlwifi/iwl-agn-lib.c    |    6 ++
 drivers/net/wireless/iwlwifi/iwl-core.h       |    1 +
 drivers/net/wireless/iwlwifi/iwl-eeprom.h     |   25 ++++++-
 drivers/net/wireless/libertas/cfg.c           |    2 +-
 drivers/net/wireless/p54/p54usb.c             |    6 ++
 drivers/net/wireless/rt2x00/rt2800pci.c       |    1 +
 drivers/net/wireless/rt2x00/rt2x00.h          |    1 +
 drivers/net/wireless/rt2x00/rt2x00dev.c       |    9 ++-
 drivers/net/yellowfin.c                       |    4 +-
 include/linux/netlink.h                       |    2 +-
 include/net/flow.h                            |    1 -
 include/net/ip6_route.h                       |   10 +++
 include/net/mac80211.h                        |   28 +++++++-
 include/net/pkt_cls.h                         |    4 +-
 include/net/sch_generic.h                     |    6 +--
 include/net/sock.h                            |    3 +
 net/bluetooth/rfcomm/core.c                   |    1 +
 net/bridge/br_multicast.c                     |    2 +-
 net/core/fib_rules.c                          |    3 +-
 net/core/sock.c                               |   47 ++++++++++----
 net/ipv4/fib_frontend.c                       |   10 ++-
 net/ipv4/route.c                              |    7 +-
 net/ipv4/tcp_ipv4.c                           |    4 +-
 net/ipv4/udp.c                                |    1 +
 net/ipv4/udplite.c                            |    1 +
 net/ipv6/addrconf.c                           |    4 +-
 net/ipv6/ip6_output.c                         |   12 +---
 net/ipv6/route.c                              |    7 ++-
 net/ipv6/udp.c                                |    1 +
 net/ipv6/udplite.c                            |    1 +
 net/ipv6/xfrm6_output.c                       |   16 ++++-
 net/irda/af_irda.c                            |   18 +++--
 net/mac80211/ibss.c                           |    4 +
 net/mac80211/rx.c                             |    5 +-
 net/mac80211/work.c                           |    5 +-
 net/sched/sch_sfq.c                           |   20 ++----
 net/sctp/socket.c                             |    2 +-
 60 files changed, 413 insertions(+), 190 deletions(-)

^ permalink raw reply	[flat|nested] 1437+ messages in thread
* [GIT] Networking
@ 2011-01-04 19:56 David Miller
  0 siblings, 0 replies; 1437+ messages in thread
From: David Miller @ 2011-01-04 19:56 UTC (permalink / raw)
  To: torvalds; +Cc: akpm, netdev, linux-kernel


Some stragglers, the most important bit is the bridging multicast
crash cure.

1) MIPS build of starfire fails on some 64-bit platforms, fix from Ben
   Hutchings.

2) VLAN flags of ehea inadvertantly changed when modifying other
   feature flags.  Fix from Breno Leitao.

3) Don't expose kernel addresses in CAN proc files, from Dan
   Rosenberg.

4) skfp driver probe checks wrong return value for error, from Dan
   Carpenter.

5) Bridging netfilter expects SKB mac header to be initialized
   properly, a simplification made to the STP code inadvertantly broke
   that.  Fix from Florian Westphal.

6) tg3_read_vpd() checks return value incorrectly, fix from David
   Sterba.

7) Bridging code doesn't handle non-linear SKBs properly when parsing
   through ipv6 extension headers to get at the IGMP message bits.
   Fix from Tomas Winkler.

8) There's a rather pervasive CISCO ppp implementation bug regarding a
   corner case of compression and protocol IDs, add a sysctl to work
   around this so people can at least function while waiting for
   various CISCO kit to get updated.  From Stephen Hemminger.

9) Memory leaks in ISDN gigaset and broadcom CNIC drivers, from Jesper
   Juhl.

10) Changing ring parameters causes oops in atl1, fix from J. K. Cliburn.

11) In ipv4 we ignore preferred source address setting for local routes,
    fix from Joel Sing.

12) Device leak in atmtcp.c, fix from Julia Lawall.

Please pull, thanks a lot.

The following changes since commit 989d873fc5b6a96695b97738dea8d9f02a60f8ab:

  Merge master.kernel.org:/home/rmk/linux-2.6-arm (2011-01-03 16:37:01 -0800)

are available in the git repository at:

  master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git master

Ben Hutchings (1):
      starfire: Fix dma_addr_t size test for MIPS

Breno Leitao (1):
      ehea: Avoid changing vlan flags

Dan Carpenter (1):
      skfp: testing the wrong variable in skfp_driver_init()

Dan Rosenberg (1):
      CAN: Use inode instead of kernel address for /proc file

Dan Williams (1):
      ueagle-atm: fix PHY signal initialization race

David Sterba (1):
      tg3: fix return value check in tg3_read_vpd()

Florian Westphal (1):
      bridge: stp: ensure mac header is set

J. K. Cliburn (1):
      atl1: fix oops when changing tx/rx ring params

Jesper Juhl (2):
      ISDN, Gigaset: Fix memory leak in do_disconnect_req()
      Broadcom CNIC core network driver: fix mem leak on allocation failures in cnic_alloc_uio_rings()

Joel Sing (1):
      ipv4/route.c: respect prefsrc for local routes

Julia Lawall (1):
      drivers/atm/atmtcp.c: add missing atm_dev_put

Tomas Winkler (1):
      bridge: fix br_multicast_ipv6_rcv for paged skbs

stephen hemminger (1):
      ppp: allow disabling multilink protocol ID compression

 drivers/atm/atmtcp.c            |    5 ++++-
 drivers/isdn/gigaset/capi.c     |    1 +
 drivers/net/atlx/atl1.c         |   10 ++++++++++
 drivers/net/cnic.c              |   10 ++++++++--
 drivers/net/ehea/ehea_ethtool.c |    7 +++++++
 drivers/net/ppp_generic.c       |    9 +++++++--
 drivers/net/skfp/skfddi.c       |    2 +-
 drivers/net/starfire.c          |    2 +-
 drivers/net/tg3.c               |    2 +-
 drivers/usb/atm/ueagle-atm.c    |   22 +++++++++++++++++++---
 net/bridge/br_multicast.c       |   28 ++++++++++++++++++----------
 net/bridge/br_stp_bpdu.c        |    2 ++
 net/can/bcm.c                   |    4 ++--
 net/ipv4/route.c                |    8 ++++++--
 14 files changed, 87 insertions(+), 25 deletions(-)

^ permalink raw reply	[flat|nested] 1437+ messages in thread
* [GIT] Networking
@ 2011-01-06 20:20 David Miller
  2011-01-07 18:46 ` Linus Torvalds
  0 siblings, 1 reply; 1437+ messages in thread
From: David Miller @ 2011-01-06 20:20 UTC (permalink / raw)
  To: torvalds; +Cc: akpm, netdev, linux-kernel


Things of note:

1) Lots of cleanups and unused code removal in TIPC from Allan Stephens
   and Paul Gortmaker.

2) DCBX data center bridging support from Shmulik Ravid.

3) Addition of batman-adv meshing protocol, from Sven Eckelmann.

4) Several optimizations to the socket filter code from Eric Dumazet
   and Tetsuo Handa:
   a) remove redundancies in revalidation code
   b) implement skb ancillary data accesses more directly
   c) validate memory accesses at filter install time instead
      of at run-time
   d) use reciprocal divide

5) Use keyed wakeups in AF_UNIX, this was just an oversight when
   the initial keyed wakeup changes went in.  From Eric Dumazet.

6) Several netdevice access RCU conversions and elimination of
   dev_base_lock usage, from Eric Dumazet.

7) VLAN and macvlan TX paths are now lockless, from Eric Dumazet.

8) New SKF_AD_RXHASH and SKF_AD_CPU socket filter opcodes, also from Eric.

9) AF_PACKET no longer uses high-order memory allocations, which many
   people have complained about in the past, from Neil Horman.

10) Fix keying of GRE tunnels for IPSEC, from Timo Teräs.

11) Add Transmit Packet Steering, from Tom Herbert with several follow-up
    improvements wrt. NUMA memory allocation et al. from Eric Dumazet.

12) BLK removals in X25 protocol, from Andrew Hendry.

13) The inetpeer cache and TCP time-wait recycling now both work with
    ipv6.

14) Infrastructure changes to allow the eventual COW'ing of route
    metrics.

Plus the usual spattering of wireless, bluetooth, and wired driver
updates.

Please pull, thanks a lot!

The following changes since commit 3c0eee3fe6a3a1c745379547c7e7c904aa64f6d5:

  Linux 2.6.37 (2011-01-04 16:50:19 -0800)

are available in the git repository at:
  master.kernel.org:/pub/scm/linux/kernel/git/davem/net-next-2.6.git master

Adam Edvardsson (1):
      ethoc: enable interrupts after napi_complete

Akinobu Mita (1):
      airo: use simple_write_to_buffer

Alan Cox (1):
      hso: Fix unused variable warning

Alexander Duyck (30):
      ixgbe: remove unnecessary re-init of adapter on Rx-csum change
      ixgbe: move GSO segments and byte count processing into ixgbe_tx_map
      ixgbe: cleanup ixgbe_alloc_rx_buffers
      ixgbe: drop ring->head, make ring->tail a pointer instead of offset
      ixgbe: move device pointer into the ring structure
      ixgbe: combine some stats into a union to allow for Tx/Rx stats overlap
      ixgbe: add a netdev pointer to the ring structure
      ixgbe: move ixgbe_clear_interrupt_scheme to before pci_save_state
      ixgbe: remove residual code left over from earlier combining of TXDCTL
      ixgbe: move adapter into pci_dev driver data instead of netdev
      ixgbe: move CPU variable from ring into q_vector, add ring->q_vector
      ixgbe: add a state flags to ring
      ixgbe: cleanup race conditions in link setup
      ixgbe: Disable RSC when ITR setting is too high to allow RSC
      ixgbe: reorder Tx cleanup so that if adapter will reset we don't rearm
      ixgbe: change vector numbering so that queues end up on correct CPUs
      ixgbe: cleanup ixgbe_clean_rx_irq
      ixgbe: cleanup ATR filter setup function
      ixgbe: cleanup use of ixgbe_rsc_count and RSC_CB
      ixgbe: change mac_type if statements to switch statements
      ixgbe: cleanup ixgbe_set_tx_csum ethtool flags configuration
      ixgbe: add WOL support for backplane adapters
      ixgbe: Cleanup DCB logic, whitespace, and comments in ixgbe_ethtool.c
      ixgbe: cleanup unnecessary return value in ixgbe_cache_ring_rss
      ixgbe: cleanup unclear references to reg_idx
      ixgbe: simplify math and improve stack use of ixgbe_set_itr functions
      ixgbe: cleanup ixgbe_map_rings_to_vectors
      ixgbe: populate the ring->q_vector pointer during ring mapping
      ixgbe: Resolve null function pointer accesses on 82598 w/ multi-speed fiber
      igbvf: force link checking when mailbox timeout has occurred

Alexey Orishko (2):
      usbnet: changes for upcoming cdc_ncm driver
      USB CDC NCM host driver

Allan Stephens (30):
      tipc: Remove obsolete native API files and exports
      tipc: Remove obsolete inclusions of header files
      tipc: Delete unused configuration service structure definition
      tipc: Eliminate useless return value when disabling a bearer
      tipc: Delete useless function prototypes
      tipc: Remove support for TIPC mode change callback
      tipc: Remove unused domain argument from multicast send routine
      tipc: Eliminate useless initialization when creating subscriber
      tipc: Eliminate an unused symbolic constant in link code
      tipc: Eliminate obsolete native API forwarding routines
      tipc: Delete tipc_ownidentity()
      tipc: Remove prototype code for supporting multiple zones
      tipc: Remove prototype code for supporting slave nodes
      tipc: Remove prototype code for supporting inter-cluster routing
      tipc: Remove prototype code for supporting multiple clusters
      tipc: Eliminate use of user registry by configuration service
      tipc: Eliminate use of user registry by topology service
      tipc: Remove user registry subsystem
      tipc: Remove internal linked list of node objects
      tipc: rename dbg.[ch] to log.[ch]
      tipc: remove calls to dbg() and msg_dbg()
      tipc: remove dump() and tipc_dump_dbg()
      tipc: Prune down link-specific debugging code
      tipc: Finish streamlining of debugging code
      tipc: remove redundant #includes
      tipc: remove pointless check for NULL prior to kfree
      tipc: cleanup various cosmetic whitespace issues
      tipc: split variable assignments out of conditional expressions
      tipc: remove zeroing assignments to static global variables
      tipc: remove extraneous braces from single statements

Amit Kumar Salecha (2):
      qlcnic: validate eswitch config values for PF
      netxen: update module description

Amitkumar Karwar (1):
      cfg80211: add some element IDs in enum ieee80211_eid

Anderson Lizardo (1):
      Bluetooth: Fix error handling for l2cap_init()

Andreas Herrmann (1):
      bitops: Provide generic sign_extend32 function

Andrei Emeltchenko (8):
      Bluetooth: Check sk is not owned before freeing l2cap_conn
      Bluetooth: timer check sk is not owned before freeing
      Bluetooth: do not use assignment in if condition
      Bluetooth: clean up sco code
      Bluetooth: clean up rfcomm code
      Bluetooth: clean up l2cap code
      Bluetooth: clean up hci code
      Bluetooth: clean up legal text

Andy Shevchenko (2):
      wireless: ray_cs: use '%pm' format option to print MAC
      atm: lanai: use kernel's '%pM' format option to print MAC

Anirban Chakraborty (2):
      qlcnic: Bumped up driver version to 5.0.12
      qlcnic: Updated driver version to 5.0.13

Anisse Astier (1):
      rtl8192ce: Fix typo in Kconfig description

Arce, Abraham (1):
      ks8851: suspend resume support

Arik Nemtsov (2):
      mac80211: support hardware TX fragmentation offload
      wl1271: add support for HW TX fragmentation

Axel Lin (2):
      net: ixp4xx_eth: Return proper error for eth_init_one
      net: r6040: Return proper error for r6040_init_one

Ben Greear (6):
      ath5k: Print stats as unsigned ints.
      ath5k: Cleanup opmode setting logic.
      ath9k: Move debugfs under ieee80211/[phyname]/ath9k/
      ath9k: Make DMA warning in ath_stoprecv WARN_ON_ONCE.
      ath9k: Check for NULL sta in ath_tx_start
      mac80211: Show max number of probe tries in debug message.

Ben Hutchings (29):
      sfc: Reduce log level for MCDI error response in efx_mcdi_rpc()
      sfc: Fix condition for no-op in set_phy_flash_cfg()
      sfc: Distinguish critical and non-critical over-temperature conditions
      sfc: Read-to-clear LM87 alarm/interrupt status at start of day
      sfc: Clear RXIN_SEL when soft-resetting QT2025C
      sfc: Remove broken automatic fallback for invalid Falcon chip/board config
      sfc: Expose Falcon BootROM config through MTD, not ethtool
      sfc: Remove unnecessary inclusion of various private header files
      sfc: Move SPI state to struct falcon_nic_data
      sfc: Move mdio_lock to struct falcon_nic_data
      sfc: Move Falcon global event handling to falcon.c
      sfc: Move xmac_poll_required into struct falcon_nic_data
      sfc: Update kernel-doc to match earlier move of Toeplitz hash key
      sfc: Use current MAC address, not NVRAM MAC address, for WoL filter
      sfc: Store MAC address from NVRAM in net_device::perm_addr
      sfc: Reorder struct efx_nic to separate fields by volatility
      sfc: Use ACCESS_ONCE when copying efx_tx_queue::read_count
      sfc: Expand/correct comments on collector behaviour and function usage
      sfc: Remove redundant memory barriers between MMIOs
      sfc: Add compile-time checks for correctness of paged register writes
      sfc: Remove locking from implementation of efx_writeo_paged()
      sfc: Use TX push whenever adding descriptors to an empty queue
      sfc: Log start and end of ethtool self-test at INFO level
      sfc: Remove filter table IDs from filter functions
      sfc: Generalise filter spec initialisation
      sfc: Remove unused field and comment on a previously removed field
      sfc: Remove ancient support for nesting of TX stop
      ethtool: Report link-down while interface is down
      netdev: Use default implementation of ethtool_ops::get_link where possible

Bing Zhao (1):
      ieee80211: add Parameter Set Count bitmask

Blaise Gassend (1):
      mac80211_hwsim: Incorporate txpower into rssi

Bob Copeland (2):
      ath5k: fix cycle counter inconsistent locking
      cfg80211: fix transposition of words in printk

Breno Leitao (2):
      cxgb3: Removing unused return variable
      ehea: Fixing some message level

Brian Cavagnolo (6):
      mwl8k: revert unnecessary modification of tx descriptor
      mwl8k: factor out firmware loading and hw init code
      mwl8k: choose proper firmware image as directed by user
      mwl8k: add API version checking for AP firmware
      mwl8k: make initial firmware load asynchronous
      mwl8k: use const struct fw pointers throughout

Brian Prodoehl (1):
      ath9k: fix spur mitigation no-spur case for AR9002

Bruce Allan (17):
      e1000e: 82571 SerDes link handle null code word from partner
      e1000e: 82574 intermittently fails to initialize with manageability f/w
      e1000e: 82571-based mezzanine card can fail ethtool link test
      e1000e: 82574/82583 performance improvement
      e1000e: 82577/8 must acquire h/w semaphore before workaround
      e1000e: 82571 Serdes can fail to get link
      e1000e: 82577/8/9 mis-configured OEM bits during S0->Sx
      e1000e: 82579 PHY incorrectly identified during init
      e1000e: support new PBA format from EEPROM
      e1000e: prevent null ptr dereference in e1000_tx_queue()
      e1000e: minor error message corrections
      e1000e: static analysis tools complain of a possible null ptr p dereference
      e1000e: increment the driver version
      e1000e: checkpatch error - macro panethesis
      e1000e: checkpatch error - trailing statements
      e1000e: checkpatch error - open braces
      e1000e: checkpatch warnings - braces

Bruno Randolf (25):
      ath5k: Optimize descriptor alignment
      ath5k: Add channel time to survey data
      cfg80211: Add nl80211 antenna configuration
      mac80211: Add antenna configuration
      ath5k: Add support for antenna configuration
      lib: Add generic exponentially weighted moving average (EWMA) function
      ath5k: Use generic EWMA library
      nl80211/mac80211: Report signal average
      cfg80211: Add documentation for antenna ops
      cfg80211: Add documentation for antenna ops
      ath5k: Use EWMA factor of 1024 instead of 1000
      lib: Improve EWMA efficiency by using bitshifts
      nl80211/mac80211: Report signal average
      ath5k: Use capabilities information for the number of TX queues
      cfg80211: Add antenna availability information
      ath5k: Fix survey
      cfg80211: Separate available antennas for RX and TX
      nl80211: Export available antennas
      ath5k: Set available antenna information for cfg80211
      ath5k: Simplify powertable recalculation
      ath5k: Separate powertable setup and writing
      ath5k: Track current TX power separately from max TX power
      ath5k: Remove ATH5K_INI_RFGAIN defines, use band instead
      ath5k: Use helper function to get eeprom mode from channel
      ath5k: Move mac80211 functions into new file

Carolyn Wyborny (1):
      igb: Add new function to read part number from EEPROM in string format

Casey Leedom (4):
      cxgb4vf: minor comment/symbolic name cleanup.
      cxgb4vf: add ethtool statistics for GRO.
      cxgb4vf: fix up "Section Mismatch" compiler warning.
      cxgb4vf: Advertise NETIF_F_TSO_ECN.

Changli Gao (18):
      net: use the macros defined for the members of flowi
      net: move definitions of BPF_S_* to net/core/filter.c
      net: don't reallocate skb->head unless the current one hasn't the needed extra size or is shared
      af_packet: use vmalloc_to_page() instead for the addresss returned by vmalloc()
      af_packet: remove pgv.flags
      net: arp: use assignment
      net: init ingress queue
      af_packet: eliminate pgv_to_page on some arches
      af_packet: fix freeing pg_vec twice on error path
      ifb: remove the useless debug stats
      ifb: remove unused macro TX_TIMEOUT
      ifb: use the lockless variants of skb_queue
      af_packet: use swap() instead of the open coded macro XC()
      net: use NUMA_NO_NODE instead of the magic number -1
      net: increase skb->users instead of skb_clone()
      netfilter: fix the race when initializing nf_ct_expect_hash_rnd
      net: bridge: check the length of skb after nf_bridge_maybe_copy_header()
      net: remove the duplicate #ifdef __KERNEL__

Chaoming Li (1):
      rtlwifi: Fix large packet issue

Christian Lamparter (14):
      carl9170: import hw/fw header updates
      carl9170: initialize HW aMPDU parameters properly
      carl9170: fix spurious restart due to high latency
      carl9170: stop stale uplink BA sessions
      carl9170: configurable beacon rates
      carl9170: tx path review
      carl9170: use generic sign_extend32
      carl9170: fix init-self regression
      carl9170: add missing return-value check
      carl9170: reduce channel change delay
      carl9170: fix usb pm suspend->resume woes
      mac80211: ignore PSM bit of reordered frames
      mac80211: serialize rx path workers
      Revert "mac80211: temporarily disable reorder release timer"

Dan Carpenter (11):
      isdn: return -EFAULT if copy_from_user() fails
      vmxnet3: locking problems in xmit
      wl1251: wl12xx_get_platform_data() returns an ERR_PTR
      bnx2x: remove bogus check
      stmmac: unwind properly in stmmac_dvr_probe()
      ath9k: unlock on error path in ath9k_change_interface()
      vxge: remove duplicated part of check
      USB: cdc_ether: remove unneeded check
      ath5k: ath5k_eeprom_mode_from_channel() returns signed
      dcb: unlock on error in dcbnl_ieee_get()
      dcb: use after free in dcb_flushapp()

Daniel Drake (1):
      libertas: don't block usb8388 suspend if no wakeup conditions are set

David Kilroy (1):
      orinoco: allow IW_AUTH_MFP to pass through

David S. Miller (57):
      Merge branch 'master' of master.kernel.org:/.../davem/net-2.6
      Merge branch 'dccp' of git://eden-feed.erg.abdn.ac.uk/net-next-2.6
      ipv4: Make rt->fl.iif tests lest obscure.
      Merge branch 'master' of master.kernel.org:/.../davem/net-2.6
      ipv4: Fix build with multicast disabled.
      vlan: Fix build warning in vlandev_seq_show()
      Merge branch 'dccp' of git://eden-feed.erg.abdn.ac.uk/net-next-2.6
      net: Export netif_get_vlan_features().
      Merge branch 'master' of git://git.kernel.org/.../linville/wireless-next-2.6
      Merge branch 'master' of master.kernel.org:/.../jkirsher/net-next-2.6
      atm: fore200e: Fix build warning.
      Merge branch 'master' of master.kernel.org:/.../davem/net-2.6
      Merge branch 'for-davem' of git://git.kernel.org/.../linville/wireless-next-2.6
      inetpeer: Abstract out the tree root accesses.
      inetpeer: Introduce inet_peer_address_t.
      inetpeer: Make inet_getpeer() take an inet_peer_adress_t pointer.
      inetpeer: Abstract address comparisons.
      inetpeer: Add v6 peers tree, abstract root properly.
      inetpeer: Add inet_getpeer_v6()
      ipv6: Add infrastructure to bind inet_peer objects to routes.
      inet: Turn ->remember_stamp into ->get_peer in connection AF ops.
      inetpeer: Kill use of inet_peer_address_t typedef.
      inetpeer: Fix incorrect comment about inetpeer struct size.
      timewait_sock: Create and use getpeer op.
      ipv6: Add rt6_get_peer() helper.
      ipv6: Create inet6_csk_route_req().
      tcp: Add timewait recycling bits to ipv6 connect code.
      tcp: Implement ipv6 ->get_peer() and ->tw_get_peer().
      Revert "ehea: Use the standard logging functions"
      Merge branch 'dccp' of git://eden-feed.erg.abdn.ac.uk/net-next-2.6
      Merge branch 'master' of master.kernel.org:/.../davem/net-2.6
      can: slcan: Add missing linux/sched.h include.
      net: Abstract away all dst_entry metrics accesses.
      Merge branch 'for-davem' of git://git.kernel.org/.../linville/wireless-next-2.6
      Merge branch 'for-davem' of git://git.kernel.org/.../bwh/sfc-next-2.6
      Merge branch 'dccp' of git://eden-feed.erg.abdn.ac.uk/net-next-2.6
      ipv6: Fix 'release_it' logic in tcp_v6_get_peer()
      isdn: Fix printed out copy_from_user() return value after previous change.
      ipv6: Use ip6_dst_hoplimit() instead of direct dst_metric() calls.
      net: Abstract RTAX_HOPLIMIT metric accesses behind helper.
      ipv6: Demark default hoplimit as zero.
      ipv4: Don't pre-seed hoplimit metric.
      net: Abstract default ADVMSS behind an accessor.
      Merge branch 'for-davem' of git://git.kernel.org/.../linville/wireless-next-2.6
      Merge branch 'vhost-net-next' of git://git.kernel.org/.../mst/vhost
      net: Abstract default MTU metric calculation behind an accessor.
      Merge branch 'master' of master.kernel.org:/.../davem/net-2.6
      ipv4: Flush per-ns routing cache more sanely.
      Merge branch 'master' of master.kernel.org:/.../davem/net-2.6
      Merge branch 'for-davem' of git://git.kernel.org/.../bwh/sfc-next-2.6
      Merge branch '20101221_static_const' of git://repo.or.cz/linux-2.6/trivial-mods
      Merge branch 'for-davem' of ssh://master.kernel.org/.../linville/wireless-next-2.6
      Merge branch 'master' of master.kernel.org:/.../jkirsher/net-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
      af_unix: Avoid socket->sk NULL OOPS in stream connect security hooks.
      Merge branch 'for-davem' of git://git.kernel.org/.../linville/wireless-next-2.6

David Shwatrz (1):
      Fix a typo in datagram.c and sctp/socket.c.

Dean Nelson (1):
      e1000: fix return value not set on error

Deepak Saxena (1):
      libertas: EHS_REMOVE_WAKEUP is not always supported

Denis Kirjanov (2):
      sundance: Wrap up acceess to ASICCtrl high word with a macro
      sundance: Program station address into HW

Dimitris Michailidis (11):
      cxgb4: enable PCIe relaxed ordering
      cxgb4: do not read the clock frequency from VPD
      cxgb4: set the number of queues before device registration
      cxgb4: distinguish between 1-lane KR/KX and 4-lane KR/KX/KX4 ports
      cxgb4: print port information after registering each netdev
      cxgb4: allocate more space for MSI-X interrupt names
      cxgb4: correct formatting of MSI-X interrupt names
      cxgb4: remove the name field from the adapter structure
      cxgb4: remove a bitmap
      cxgb4: extend VPD parsing
      cxgb4: NUMA-aware Tx queue allocations

Dmitry Kravkov (1):
      bnx2x: Add Nic partitioning mode (57712 devices)

Don Skidmore (13):
      ixgbe: make silicon specific functions generic
      ixgbe: add MAC and PHY support for x540
      ixgbe: add support for x540 MAC
      ixgbe: update version number for ixgbe
      ixgbe: fix link behavior for SFP+ when driver is brought down
      ixgbe: add WOL support for SFP+ subdevice
      ixgbe: add support for 82599 FCoE SKU
      ixgbe: add support for new format of PBA numbers
      ixgbe: fix for link failure on SFP+ DA cables
      ixgbe: fix enum type mismatch on disable laser
      ixgbe: fix X540 phy id to correct value
      ixgbe: fix X540 to use it's own info struct
      ixgbe: cleanup string function calls to use bound checking versions.

Dongdong Deng (1):
      e1000e: add netpoll support for MSI/MSI-X IRQ modes

Eddie Wai (2):
      bnx2: Fix reset bug on 5709
      cnic: Call cm_connect_complete() immediately on error

Einar Lueck (2):
      qeth: support ipv6 query arp cache for HiperSockets
      qeth: support VIPA add/del in offline mode

Eliad Peller (10):
      mac80211: refactor debugfs function generation code
      wl1271: set wl->vif only if add_interface succeeded.
      wl1271: refactor debugfs function generation code
      wl1271: handle HW watchdog interrupt
      wl1271: add recover testmode command
      wl1271: use debugfs_remove_recursive
      wl1271: move wl12xx debugfs directory to under wiphy's debugfs
      mac80211: fix dynamic-ps/pm_qos magic numbers
      wl12xx: add auto-arp support
      wl12xx: allow runtime changing of debug_level

Emil Tantilov (2):
      ixgb: Don't check for vlan group on transmit
      ixgbe: fix ntuple support

Eric Dumazet (65):
      aoe: remove dev_base_lock use from aoecmd_cfg_pkts()
      bonding: remove dev_base_lock use
      decnet: RCU conversion and get rid of dev_base_lock
      af_unix: use keyed wakeups
      af_unix: fix unix_dgram_poll() behavior for EPOLLOUT event
      af_unix: optimize unix_dgram_poll()
      drivers/net: normalize TX_TIMEOUT
      neigh: reorder struct neighbour
      net: get rid of rtable->idev
      igmp: RCU conversion of in_dev->mc_list
      net: net_families __rcu annotations
      bridge: add RCU annotation to bridge multicast table
      bridge: add proper RCU annotation to should_route_hook
      bridge: add RCU annotations to bridge port lookup
      macvlan: lockless tx path
      vlan: lockless transmit path
      vlan: remove ndo_select_queue() logic
      udp: use atomic_inc_not_zero_hint
      net: reorder struct sock fields
      mpc52xx: cleanup locking
      ixgbe: delay rx_ring freeing
      ixgbe: refactor ixgbe_alloc_queues()
      bonding: IGMP handling cleanup
      igmp: refine skb allocations
      filter: optimize sk_run_filter
      filter: cleanup codes[] init
      filter: use reciprocal divide
      packet: use vzalloc()
      pktgen: allow faster module unload
      bnx2x: Disable local BHes to prevent a dead-lock situation
      ipv6: mcast: RCU conversion
      scm: lower SCM_MAX_FD
      infiniband: remove dev_base_lock use
      drivers/net: use vzalloc()
      net: add netif_tx_queue_frozen_or_stopped
      xps: NUMA allocations for per cpu data
      xps: add __rcu annotations
      net sched: use xps information for qdisc NUMA affinity
      filter: add SKF_AD_RXHASH and SKF_AD_CPU
      __in_dev_get_rtnl() can use rtnl_dereference()
      net: kill an RCU warning in inet_fill_link_af()
      filter: add a security check at install time
      net: RCU conversion of dev_getbyhwaddr() and arp_ioctl()
      filter: constify sk_run_filter()
      net: call dev_queue_xmit_nit() after skb_dst_drop()
      net: optimize INET input path further
      filter: use size of fetched data in __load_pointer()
      net: add limits to ip_default_ttl
      net: change ip_default_ttl documentation
      tcp: relax tcp_paws_check()
      ifb: fix a lockdep splat
      ifb: use netif_receive_skb() instead of netif_rx()
      net_sched: sch_sfq: add backlog info in sfq_dump_class_stats()
      net_sched: sch_sfq: better struct layouts
      net: timestamp cloned packet in dev_queue_xmit_nit
      filter: optimize accesses to ancillary data
      sfq: fix sfq class stats handling
      sch_sfq: allow big packets and be fair
      sfq: fix slot_dequeue_head()
      tg3: fix warnings
      sch_red: report backlog information
      ifb: add performance flags
      net_sched: pfifo_head_drop problem
      net: add POLLPRI to sock_def_readable()
      ipv4: IP defragmentation must be ECN aware

Eric Paris (5):
      netfilter: allow hooks to pass error code back up the stack
      network: tcp_connect should return certain errors up the stack
      SELinux: return -ECONNREFUSED from ip_postroute to signal fatal error
      SELinux: Only return netlink error when we know the return is fatal
      SELinux: indicate fatal error in compat netfilter code

Felix Fietkau (85):
      ath9k_hw: optimize interrupt mask changes
      ath9k_hw: small optimization in ar9002_hw_get_isr
      ath9k_hw: optimize tx status descriptor processing
      ath9k: optimize/fix ANI RSSI processing
      ath9k: remove a redundant call to ath9k_hw_gettsf32
      ath9k_hw: make ath9k_hw_gettsf32 static
      ath9k_hw: optimize all descriptor access functions
      ath9k_hw: initialize regulatory->max_power_level in set_txpower for AR9003
      ath9k_hw: extend ath9k_hw_set_txpowerlimit to test channel txpower
      ath9k: initialize per-channel tx power limits instead of hardcoding them
      ath9k_hw: fix potential spurious tx error bit interpretation
      mac80211: minstrel_ht - reduce the overhead of rate sampling
      ath9k: rework tx queue selection and fix queue stopping/waking
      ath9k: remove the unnecessary private xretry tx flag
      ath9k: handle tx underrun in the driver instead of rate control
      ath9k: remove the tx info padding byte abuse
      ath9k: clean up tx buffer setup
      ath9k_hw: add a private op for configuring radar pulse detection
      cfg80211: add support for setting the ad-hoc multicast rate
      mac80211: add support for setting the ad-hoc multicast rate
      ath9k_hw: set default values for radar pulse detection
      ath9k: fix PA predistortion training frame setup
      ath9k: remove bfs_seqno from struct ath_buf_state
      ath9k: remove bfs_tidno from struct ath_buf_state
      ath9k: remove bfs_keytype from struct ath_buf_state
      ath9k: remove bfs_paprd_timestamp from struct ath_buf_state
      ath9k: remove bfs_keyix from struct ath_buf_state
      ath9k: remove bfs_al from struct ath_buf_state
      ath9k: remove bfs_nframes from struct ath_buf_state
      ath9k: remove bfs_frmlen from struct ath_buf_state
      ath9k: remove bf_tx_aborted from struct ath_buf
      ath9k: clean up code duplication around ath_tx_start
      ath9k: block new AMPDU sessions if SC_OP_TXAGGR is not set
      ath9k: more tx setup cleanups
      ath9k: store frame information used by aggregation inside the skb tx info
      ath9k_hw: add support for reading EEPROM data from the internal OTP ROM
      ath9k: add support for reading eeprom from platform data on PCI devices
      ath9k_hw: support reading calibration data from flash on AR9003
      ath9k: fix recursive locking in the tx flush path
      ath9k_hw: fix A-MPDU key search issues on AR9003
      ath9k_htc: fix eeprom access
      mac80211: restart beacon miss timer on system resume from suspend
      mac80211: calculate beacon loss time accurately
      mac80211: probe the AP when resuming
      cfg80211/mac80211: improve ad-hoc multicast rate handling
      mac80211: use nullfunc instead of probe request for connection monitoring
      mac80211: reduce the number of retries for nullfunc probing
      ath9k_hw: remove ath9k_hw_stoppcurecv
      ath9k: fix software retry counter tracking
      ath5k: Use Generic DMA for later support of AHB bus.
      ath5k: Introduce ath5k_init_softc function as in ath9k
      ath5k: Move PCI bus functions to separate file.
      ath5k: Use generic eeprom read from common ath_bus_opts struct.
      ath5k: Check if pci pdev struct is initialized in common functions.
      ath5k: Add a function to read chipset's MAC revision
      ath5k: Add initial registers values for radio RF2317 chip.
      ath5k: Add AHB bus support.
      ath5k: Fix reset and interrupts for AHB type of devices.
      mac80211: remove a redundant check
      mac80211: speed up AP probing using nullfunc frames
      mac80211: fix a compiler warning
      ath9k: fix sequence number assigment for non-AMPDU QoS data frames
      ath9k_hw: only use the PCIe disable register write sequence for AR5416
      ath9k_hw: clean up duplicate and unnused eeprom related defines
      ath9k_hw: merge ath9k_hw_get_gain_boundaries_pdadcs between eeprom_def.c and eeprom_4k.c
      ath9k_hw: merge the ar9287 version of ath9k_hw_get_gain_boundaries_pdadcs
      ath9k_hw: remove antenna configuration eeprom ops and variables
      ath9k_hw: clean up SREV version checks
      ath9k_hw: remove ah->beacon_interval
      ath9k_hw: remove ah->txpower_indexoffset
      ath9k_hw: initialize ah->slottime
      ath9k_hw: fix the slot time setting for long distance links
      ath9k: fix PA predistortion thermal measurement handling
      ath9k_hw: fix the PA predistortion rate mask
      ath9k_hw: fix PA predistortion training power selection
      ath9k_hw: update AR9003 initvals for improved radar detection
      ath9k_hw: update AR9003 initvals to improve carrier leak calibration/correction
      ath9k: fix queue depth check for forming new aggregates
      ath9k_hw: remove baseband rfsilent support
      mac80211: fix initialization of skb->cb in ieee80211_subif_start_xmit
      mac80211: skip unnecessary pskb_expand_head calls
      mac80211: fix potentially redundant skb data copying
      ath9k_hw: fix PA predistortion HT40 mask
      ath9k: do not limit the chainmask to 1 for legacy mode
      ath9k_hw: fix dma descriptor rx error bit parsing

Ferenc Wagner (2):
      netconsole: don't announce stopping if nothing happened
      netconsole: clarify stopping message

Francois-Xavier Le Bail (1):
      net: typos in comments in include/linux/igmp.h

Frank Blaschka (2):
      qeth: l3 fix len in tso hdr
      qeth: l3 add vlan hdr in passthru frames

Gasparakis, Joseph (1):
      igb: Some fine tuning

Gerrit Renker (10):
      dccp ccid-2: Ack Vector interface clean-up
      dccp ccid-2: Separate internals of Ack Vectors from option-parsing code
      dccp ccid-2: Implementation of circular Ack Vector buffer with overflow handling
      dccp ccid-2: Algorithm to update buffer state
      dccp ccid-2: Update code for the Ack Vector input/registration routine
      dccp ccid-2: Consolidate Ack-Vector processing within main DCCP module
      dccp ccid-2: Schedule Sync as out-of-band mechanism
      dccp ccid-2: Remove old infrastructure
      dccp ccid-2: Separate option parsing from CCID processing
      dccp ccid-2: whitespace fix-up

Gertjan van Wingerde (9):
      rt2x00: Add initial support for RT3370/RT3390 devices.
      rt2x00: Clean up Kconfig for RT2800 devices.
      rt2x00: Remove RT30XX Kconfig variables.
      rt2x00: Remove unneccessary internal Kconfig symbols.
      rt2x00: Use ioremap for SoC devices instead of KSEG1ADDR.
      rt2x00: Ensure TX-ed frames are returned in the original state.
      rt2x00: Remove intf->bssid field.
      rt2x00: remove intf->mac field.
      rt2x00: Fix pointer errors.

Gery Kahn (2):
      wl1271: ref_clock cosmetic changes
      wl1271: cleanup unused code of calibration structures

Giuseppe CAVALLARO (4):
      stmmac: tidy-up stmmac_priv structure
      stmmac: add init/exit callback in plat_stmmacenet_data struct
      stmmac: convert to dev_pm_ops.
      stmmac: update the driver version

Giuseppe Cavallaro (2):
      stmmac: update the driver documentation
      stmmac: fix stmmac_resume removing not yet used shutdown flag

Grazvydas Ignotas (3):
      wl1251: add power callback to wl1251_if_operations
      wl1251: add runtime PM support for SDIO
      wl1251: use wl12xx_platform_data to pass data

Greg Rose (11):
      ixgbevf: Update Version String and Copyright Notice
      ixgbevf: Fix Oops
      igbvf: Update version and Copyright
      Remove extra struct page member from the buffer info structure
      igb: Fix overwrite of the VF's flags
      igb: Warn on attempt to override administratively set MAC/VLAN
      igb: Add Anti-spoofing feature support
      ixgbe: Warn on VF attempt to override Administratively set MAC/VLAN
      ixgbe: Add SR-IOV feature support to X540
      ixgbe: Add anti-spoofing feature support
      ixgbevf: Add X540 VF device support to the ixgbevf driver

Grumbach, Emmanuel (1):
      iwlagn: Enable PCI L1 ACTIVE state after uCode has been loaded

Gustavo F. Padovan (5):
      Merge git://git.kernel.org/.../padovan/bluetooth-2.6 into test
      Bluetooth: Get rid of __l2cap_get_sock_by_psm()
      Bluetooth: Get rid of __rfcomm_get_sock_by_channel()
      Bluetooth: Don't accept ConfigReq if we aren't in the BT_CONFIG state
      Bluetooth: Improve handling of HCI control channel in bind

Guy Eilam (1):
      wl1271: fixed problem with WPS IEs in probe requests

Hauke Mehrtens (9):
      carl9170: fix typos
      ssb: Add sysfs attributes to ssb devices
      wl1251: remove unnecessary import
      wl12xx: remove unnecessary import
      ssb: Use pci_is_pcie()
      rt2x00: Use pci_is_pcie()
      ath5k: Use pci_is_pcie()
      ath9k: Use pci_is_pcie()
      rtlwifi: Use pci_pcie_cap()

Helmut Schaa (17):
      rt2x00: Add TXOP_CTRL_CFG register definition
      rt2x00: Sync Tx and RX ring sizes with legacy drivers
      rt2x00: Wait up to one second on rt2800 for WPDMA to be ready
      rt2x00: Reduce tx descriptor size
      rt2x00: Optimize rt2x00debug_dump_frame when frame dumping is not active
      rt2x00: Fix hw crypto in AP mode for some devices
      mac80211: Disable hw crypto for GTKs on AP VLAN interfaces
      mac80211: Minor optimization in ieee80211_rx_h_data
      mac80211: Update last_tx_rate only for data frames
      cfg80211: Add new BSS attribute ht_opmode
      mac80211: Apply ht_opmode changes in ieee80211_change_bss
      rt2x00: Implement get_survey callback for rt2800
      rt2x00: Don't frequently reset beacon interval in AdHoc mode
      rt2x00: Remove superfluous assignment of mpdu_density
      rt2x00: Simplify intf->delayed_flags locking
      rt2x00: Remove unused interface spinlock
      rt2x00: Fix comment about removed spinlock

Henry Ptasinski (1):
      include/linux/if_ether.h: Add #define ETH_P_LINK_CTL for HPNA and wlan local tunnel

Herbert Xu (1):
      bridge: Use consistent NF_DROP returns in nf_pre_routing

Herton Ronaldo Krzesinski (9):
      rtl8187: remove redundant initialization of ARFR
      rtl8187: remove setting of beacon/atim registers from initialization
      rtl8187: fix wrong register initialization in 8187B
      rtl8187: avoid redundant write to register FF72 (RFSW_CTRL)
      rtl8187: move pll reset at start out of ANAPARAM write
      rtl8187: don't set RTL818X_CONFIG3_GNT_SELECT flag on 8187B
      rtl8187: consolidate anaparam on/off write sequences
      rtl8187: remove uneeded setting of anaparam write
      rtl8187: restore anaparam registers after reset with 8187B

Holger Eitzenberger (1):
      e1000e: fix double initialization in blink path

Huang Weiyi (1):
      libertas: remove duplicated #include

Ido Yariv (4):
      wl1271: TX aggregation optimization
      wl1271: Fix TX starvation
      wl1271: Allocate TX descriptors more efficiently
      wl1271: Fix TX queue low watermark handling

Ismael Luceno (1):
      rt2x00: Fix panic on frame padding for rt2800 usb devices

Ivo van Doorn (17):
      rt2x00: Rename rt2x00queue_timeout
      rt2x00: Remove failsave from rt2x00usb_watchdog_tx_dma
      rt2x00: Implement flush callback
      rt2x00: Fix MCU_SLEEP arguments
      rt2x00: Fix crash on USB unplug
      rt2x00: Rename queue->lock to queue->index_lock
      rt2x00: Fix rt2x00queue_kick_tx_queue arguments
      rt2x00: Remove rt2x00lib_toggle_rx
      rt2x00: Add watchdog functions for HW queue
      rt2x00: Increase REGISTER_BUSY_COUNT
      rt2x00: Introduce 3 queue commands in drivers (start, kick, stop).
      rt2x00: Reorganize queue callback functions
      rt2x00: Protect queue control with mutex
      rt2x00: Add "flush" queue command
      rt2x00: Cleanup RX index counting
      rt2x00: Introduce extra queue entry sanity flag
      rt2x00: Fix WMM Queue naming

Jan Engelhardt (2):
      netlink: let nlmsg and nla functions take pointer-to-const args
      netns: let net_generic take pointer-to-const args

Jan Glauber (1):
      qeth: buffer count imbalance

Jason Wang (1):
      vhost: fix typos in comment

Javier Cardona (6):
      nl80211/mac80211: define and allow configuring mesh element TTL
      mac80211: Fix compilation error when mesh is disabled
      mac80211: Rename mesh_params to mesh_config to prepare for mesh_setup
      mac80211: Let userspace enable and configure vendor specific path selection.
      mac80211: Send mesh non-HWMP path selection frames to userspace
      mac80211: Remove unused third address from mesh address extension header.

Jeff Kirsher (9):
      Documentation/networking/e1000.txt: Update documentation
      Documentation/networking/e1000e.txt: Update documentation
      Documentation/networking/igb.txt: update documentation
      Documentation/networking/igbvf.txt: Update documentation
      Documentation/networking/ixgbe.txt: Update ixgbe documentation
      Documentation/networking/ixgbevf.txt: Update documentation
      MAINTAINERS: Update Intel Wired LAN info
      Intel Wired LAN drivers: Use static const
      Documentation/networking: Update Intel Wired LAN docs

Jeremy Eder (1):
      clarify documentation for net.ipv4.igmp_max_memberships

Jesper Juhl (1):
      mac80211: Remove redundant checks for NULL before calls to crypto_free_cipher()

Jesse Gross (3):
      offloading: Make scatter/gather more tolerant of vlans.
      offloading: Support multiple vlan tags in GSO.
      offloading: Force software GSO for multiple vlan tags.

Jiri Kosina (1):
      tcp: cleanup of cwnd initialization in tcp_init_metrics()

Jiri Pirko (1):
      net/ipv6/udp.c: fix typo in flush_stack()

Joe Perches (74):
      drivers/net/can: Update WARN uses
      drivers/net/usb: Update WARN uses
      net/core/dev.c: Update WARN uses
      net/ipv4/tcp.c: Update WARN uses
      drivers/isdn: Remove unnecessary semicolons
      drivers/net/bnx2x: Remove unnecessary semicolons
      drivers/net/e1000e: Remove unnecessary semicolons
      drivers/net/ixgbe: Remove unnecessary semicolons
      drivers/net/cnic.c: Remove unnecessary semicolons
      include/linux/if_macvlan.h: Remove unnecessary semicolons
      include/net/caif/cfctrl.h: Remove unnecessary semicolons
      net/ipv6/mcast.c: Remove unnecessary semicolons
      drivers/isdn/mISDN: Use printf extension %pV
      drivers/net/wireless/ath/debug.c: Use printf extension %pV
      drivers/net/wireless/b43/main.c: Use printf extension %pV
      drivers/net/wireless/b43legacy/main.c: Use printf extension %pV
      drivers/isdn/i4l: Remove unnecessary casts of netdev_priv
      drivers/net/bonding: Remove unnecessary casts of netdev_priv
      drivers/net/pcmcia: Remove unnecessary casts of netdev_priv
      drivers/net/qla3xxx.c: Remove unnecessary casts of netdev_priv
      drivers/net/qlge: Remove unnecessary casts of netdev_priv
      drivers/net/usb: Remove unnecessary casts of netdev_priv
      drivers/net/vxge: Remove unnecessary casts of netdev_priv
      drivers/net: Remove unnecessary casts of netdev_priv
      net/atm: Remove unnecessary casts of netdev_priv
      drivers/isdn/hisax: Add printf format/argument verification and fix fallout
      drivers/net/s2io.c: Remove unnecessary casts of pci_get_drvdata
      drivers/net/vxge/vxge-main.c: Remove unnecessary casts of pci_get_drvdata
      drivers/net/can/sja1000: Use printf extension %pR for struct resource
      ar9170: Use const
      ath5k: Use static const
      ath9k: Use static const
      carl9170: Use static const
      atmel: Use static const
      b43: Use static const
      iwlwifi: Use static const
      libertas: Use static const
      ray_cs: Use static const
      rndis_wlan: Use static const
      rt2x00: Use static const
      zd1211rw: Use const
      net/wireless: Use pr_<level> and netdev_<level>
      netxen: remove unnecessary [kv][mcz]alloc casts
      qlcnic: remove unnecessary [kv][mcz]alloc casts
      vxge: remove unnecessary [kv][mcz]alloc casts
      zd1211rw: document need for kmalloc cast
      drivers/s390/net: Remove unnecessary semicolons
      forcedeth: Change reg_delay arguments and use
      forcedeth: convert dprintk(KERN_DEBUG to netdev_dbg
      forcedeth: Use print_hex_dump
      forcedeth: Convert remaining dprintk to netdev_dbg
      forcedeth: Use pr_fmt and pr_<level>
      forcedeth: Convert pr_<level> to netdev_<level>
      forcedeth: Add function init_realtek_8211b
      forcedeth: Separate vendor specific initializations into functions
      forcedeth: Convert dev_printk(<level> to dev_<level>(
      forcedeth: Remove netdev_dbg uses
      forcedeth: Use netdev_dbg for printk(KERN_DEBUG
      ath9k: hif_usb: Reduce indent 1 column
      wireless: Remove unnecessary casts of usb_get_intfdata
      MAINTAINERS: Add ATH GENERIC UTILITIES
      ehea: Use the standard logging functions
      ath: Add and use ath_printk and ath_<level>
      ath: Convert ath_print(.., ATH_DBG_FATAL to ath_err
      ath: Convert ath_print to ath_dbg
      ath: Fix ath_dbg access beyond array bound
      ehea: Use the standard logging functions
      cxgb4: add const to static arrays
      pktgen: Remove unnecessary prefix from pr_<level>
      tg3: Use DEFINE_PCI_DEVICE_TABLE
      drivers/net/*.c: Use static const
      usb: Use static const, consolidate code
      tulip: Use DEFINE_PCI_DEVICE_TABLE and static const
      drivers/net/*/: Use static const

Joel A Fernandes (1):
      mac80211: Fix mesh portal communication with other mesh nodes.

Johan Hedberg (12):
      Bluetooth: Simplify remote features callback function logic
      Bluetooth: Create a unified authentication request function
      Bluetooth: Automate remote name requests
      Bluetooth: Add Bluetooth Management interface definitions
      Bluetooth: Add initial Bluetooth Management interface callbacks
      Bluetooth: Make hci_send_to_sock usable for management control sockets
      Bluetooth: Add error handling for managment command handlers
      Bluetooth: Add read_version management command
      Bluetooth: Add read_index_list management command
      Bluetooth: Add read_info management command
      Bluetooth: Add management events for controller addition & removal
      Bluetooth: Fix __hci_request synchronization for hci_open_dev

Johannes Berg (63):
      iwlwifi: make mac80211 ops a device config
      iwlagn: don't resend RXON timing
      iwlagn: new RXON processing for modern devices
      iwlwifi: fix IBSS beaconing
      iwlwifi: implement switching iftype while up
      iwlagn: fix non-5000+ build
      iwlagn: fix needed chains calculation
      iwlagn: fix RXON issues
      iwlagn: re-enable calibration
      iwlagn: fix RXON HT
      iwlagn: fix some naming regarding FIFOs
      iwlagn: remove unused variable swq_id
      iwlagn: remove a bogus AGG_OFF check
      iwlwifi: pass txq to wake/stop queue
      iwlwifi: always build swq_id as virtual queue ID
      iwlagn: fix PAN queues
      iwlagn: avoid crash if vif is not assigned
      iwlagn: reprogram AP STA after assoc
      iwlagn: fix PAN slot timing wrt. DTIM
      mac80211: defines for AC numbers
      mac80211: fix powersaving clients races
      iwlwifi: fix modular 3945 only build
      cfg80211: allow using CQM event to notify packet loss
      mac80211: implement packet loss notification
      iwlagn: remove powersave warning
      iwlagn: fix station powersave accounting for aggregation
      iwlagn: advertise reliable TX status
      iwlwifi: use mac80211 AC defines
      nl80211/cfg80211: extend mgmt-tx API for off-channel
      mac80211: implement off-channel mgmt TX
      mac80211: fix RX aggregation locking
      cfg80211: include CQM packet loss docs
      mac80211: document workqueue
      mac80211: publish docs for _ni functions
      mac80211: publish some misc docs
      mac80211: publish some rate control docs
      mac80211: document aggregation
      mac80211: publish interface iteration docs
      mac80211: document station handling
      mac80211: publish SMPS docs
      mac80211: move mesh filter adjusting
      cfg80211: require add_virtual_intf to return new dev
      nl80211: refactor mesh parameter parsing
      cfg80211/mac80211: add mesh join/leave commands
      mac80211: clean up RX key checks
      cfg80211/nl80211: separate unicast/multicast default TX keys
      mac80211: support separate default keys
      mac80211: support IBSS RSN with SW crypto
      iwlagn: fix debug variable access
      iwlagn: rename enhanced txpower fields
      iwlagn: implement layout-agnostic EEPROM reading
      iwlagn: remove old EEPROM TX power reading
      nl80211: advertise maximum remain-on-channel duration
      mac80211: make LED trigger names available early
      mac80211: add throughput based LED blink trigger
      mac80211: selective throughput LED trigger active
      mac80211: cleanup select_queue
      iwlagn: fix FH error
      mac80211: add missing synchronize_rcu
      mac80211: fix some key comments and code
      mac80211: implement hardware offload for remain-on-channel
      mac80211: implement off-channel TX using hw r-o-c offload
      mac80211: remove stray extern

Johannes Stezenbach (6):
      mac80211/rt2x00: add ieee80211_tx_status_ni()
      rt2x00: fix hang when unplugging USB device in use
      rt2x00: trivial: add missing \n on warnings
      rt2x00: remove stray semicolon
      rt2x00: simplify txstatus_fifo handling
      rt2x00: allow txstatus_fifo w/o txstatus_tasklet

John Fastabend (13):
      8021q: set hard_header_len when VLAN offload features are toggled
      net: remove check for headroom in vlan_dev_create
      net: consolidate 8021q tagging
      ipv6: fix missing in6_ifa_put in addrconf
      ixgbe: DCB set PFC high and low water marks per data sheet specs
      ixgbe: DCB: credit max only needs to be gt TSO size for 82598
      ixgbe: rework Tx hang detection to fix reoccurring false Tx hangs
      net: zero kobject in rx_queue_release
      net: add priority field to pktgen
      8021q: vlan device is lockless do not transfer real_num_{tx|rx}_queues
      dcbnl: add support for ieee8021Qaz attributes
      dcbnl: add appliction tlv handlers
      net_dcb: add application notifiers

John W. Linville (32):
      b43: remove extraneous code in free_ringmemory
      rt2x00pci: do not use GFP_DMA
      iwlwifi: Convert to new PCI PM framework
      iwmc3200wifi: clarify potentially undefined operation in iwm_scan_ssids
      rndis_wlan: avoid uninitialized var warning in rndis_wlan_craft_connected_bss
      Merge branch 'wireless-next-2.6' of git://git.kernel.org/.../iwlwifi/iwlwifi-2.6
      Revert "nl80211/mac80211: Report signal average"
      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
      Merge branch 'master' of git://git.kernel.org/.../padovan/bluetooth-next-2.6
      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
      Merge branch 'wireless-next-2.6' of git://git.kernel.org/.../iwlwifi/iwlwifi-2.6
      ath5k: remove MODULE_VERSION
      Merge branch 'master' of git://git.kernel.org/.../linville/wireless-2.6
      ath: fix build break with ATH_DBG_WARN_ON_ONCE
      Merge branch 'master' of git://git.kernel.org/.../linville/wireless-next-2.6 into for-davem
      Merge branch 'master' of git://git.kernel.org/.../linville/wireless-2.6
      Merge branch 'wireless-next-2.6' of git://git.kernel.org/.../iwlwifi/iwlwifi-2.6
      rtlwifi: convert to __packed notation
      Merge branch 'wl12xx-next' of git://git.kernel.org/.../luca/wl12xx
      rtl8192ce: drop 'rtl8192c-' prefix from files
      rtlwifi: use alloc_workqueue
      rtl818x: move rtl8180 and rtl8187 to separate subdirectories
      Merge branch 'master' of git://git.kernel.org/.../linville/wireless-next-2.6 into for-davem
      Merge branch 'master' of master.kernel.org:/.../padovan/bluetooth-next-2.6
      Merge branch 'wireless-next-2.6' of git://git.kernel.org/.../iwlwifi/iwlwifi-2.6
      Merge branch 'master' of git://git.kernel.org/.../linville/wireless-2.6
      ath9k: qualify global modparam_nohwcrypt variable
      ath5k: qualify global modparam_nohwcrypt variable
      ath9k: correct MODULE_PARM_DESC parameters for force_new_ani
      Merge branch 'master' of git://git.kernel.org/.../linville/wireless-next-2.6 into for-davem

Jon Mason (26):
      vxge: enable rxhash
      vxge: Wait for Rx to become idle before reseting or closing
      vxge: cleanup debug printing and asserts
      vxge: serialize access to steering control register
      vxge: add support for ethtool firmware flashing
      vxge: add receive hardware timestamping
      vxge: Handle errors in vxge_hw_vpath_fw_api
      vxge: Titan1A detection
      vxge: correct multi-function detection
      vxge: update Kconfig
      vxge: sparse and other clean-ups
      vxge: update driver version
      vxge: remove unnecessary printks
      vxge: use strcpy for strings
      vxge: update driver version
      vxge: code cleanup and reorganization
      vxge: fix crash of VF when unloading PF
      vxge: use pci_request_region()
      vxge: transmit timeout deadlock
      vxge: hotplug stall
      vxge: independent interrupt moderation
      vxge: update driver version
      s2io: rx_ring_sz bounds checking
      s2io: make strings at tables const
      s2io: Update Driver Version
      s2io: Using static const generally increases object text and decreases data size. It also generally decreases overall object size.

Jonas Bonn (7):
      ethoc: Add device tree configuration
      ethoc: remove unused spinlock
      ethoc: Double check pending RX packet
      ethoc: rework interrupt handling
      ethoc: rework mdio read/write
      ethoc: fix function return type
      ethoc: remove division from loops

Jouni Malinen (1):
      nl80211: Add notification for dropped Deauth/Disassoc

Jozsef Kadlecsik (2):
      ipv6: Prepare the tree for un-inlined jhash.
      The new jhash implementation

Julia Lawall (1):
      drivers/vhost/vhost.c: delete double assignment

Julian Stecklina (1):
      igbvf: Remove some dead code in igbvf

Junchang Wang (1):
      pktgen: adding prefetchw() call

Jussi Kivilinna (9):
      rndis_wlan: workaround device not returning bss for currently connected AP
      rndis_wlan: workaround poor scanning with BCM4320a
      rndis_wlan: scanning, workaround device returning incorrect bssid-list item count.
      rndis_wlan: do not set default_key if not WEP key
      rndis_wlan: turn radio off before interface is bring up
      rndis_wlan: constify rndis_config_ops
      rndis_wlan: remove unused variable from priv structure
      rndis_wlan: add support for set_cqm_rssi_config
      rndis_wlan: add support for set_power_mgmt

Juuso Oikarinen (11):
      wl1271: Fix RX path stall
      wl1271: Fix scan failure detection
      wl1271: Check interface state in op_* functions
      mac80211: Add function to get probe request template for current AP
      wl1271: Prevent ad-hoc and active scanning on 11a DFS frequencies
      Revert "wl1271: Change supported channel order for a more optimal scan"
      wl12xx: Unset bssid filter, ssid and bssid from firmware on disassoc
      wl12xx: Fix kernel crash related to hw recovery and interface shutdown
      wl1271: Fix setting of the hardware connection monitoring probe-req template
      wl12xx: Remove 11j channels from the supported channels list.
      wl12xx: Change TX queue to be per AC

Lalith Suresh (1):
      rt2x00: Fix comments in rt73usb.h and rt61pci.h

Larry Finger (8):
      ssb: Clear RETRY_TIMEOUT in PCI Configuration for normal devices
      rtl8192ce: Add new driver
      rtl8192ce: Fix build on powerpc
      rtl8192ce: Update MAINTAINERS
      rtlwifi: Switch locking from semaphores to mutexes
      MAINTAINERS: Fix typo in rtl8192ce entry
      rtlwifi: Fix use of mutex in interrupt code
      rtlwifi: rtl8192ce: Fix driver problem when radio switch off at module load

Luciano Coelho (6):
      wl1271: exit ELP mode when setting enabled rates in tx
      wl12xx: disable 11a channels when regulatory changes if 11a is not supported
      wl12xx: fix illegal memset if debugfs is not enabled
      wl12xx: disable 11a channels when wl->enable_11a is known
      wl12xx_sdio_test: rename files to match current style
      mac80211: check for CONFIG_MAC80211_LEDS in the tpt_led_trigger declaration

Luis R. Rodriguez (29):
      ath9k: fix sparse complaint on aphy for debugfs
      ath: make ath_hw_keysetmac() static
      ath: make ath_hw_set_keycache_entry() static
      ath5k: make ath5k_update_bssid_mask_and_opmode() static
      cfg80211: pass the reg hint initiator to helpers
      cfg80211: fix allowing country IEs for WIPHY_FLAG_STRICT_REGULATORY
      cfg80211: fix disabling channels based on hints
      cfg80211: add debug prints for when we ignore regulatory hints
      cfg80211: add debug print when disabling a channel on a custom regd
      cfg80211: add debug print when processing a channel
      cfg80211: prefix REG_DBG_PRINT() with cfg80211
      ath: add a ATH_DBG_WARN()
      ath9k: add a debug warning when we cannot stop RX
      ath9k: simplify hw reset locking
      ath9k: move the PCU lock to the sc structure
      ath9k: content DMA start / stop through the PCU lock
      cfg80211: put core regulatory request into queue
      cfg80211: move reg_work and reg_todo above
      cfg80211: move mutex locking to reg_process_pending_hints()
      cfg80211: Fix regulatory bug with multiple cards and delays
      ath9k: avoid aggregation for VO traffic
      mac80211: avoid aggregation for VO traffic
      ath9k: skip ATH9K_INT_TIM_TIMER when we are idle
      ath9k_hw: warn if we cannot change the power to the chip
      ath9k: Fix power save count imbalance on ath_radio_enable()
      ath9k: fix assumptions for idle calls on suspend/resume
      cfg80211: fix null pointer dereference with a custom regulatory request
      ath: fix NULL pointer dereference on reg_notifier()
      ath9k: fix aphy / wiphy idle mismatch

Manuel Lauss (1):
      net: au1000_eth: remove unused global variable.

Mark Einon (14):
      rt2x00: checkpatch.pl error fixes for rt2400pci.h
      rt2x00: checkpatch.pl error fixes for rt2500pci.h
      rt2x00: checkpatch.pl error fixes for rt2500usb.c
      rt2x00: checkpatch.pl error fixes for rt2800.h
      rt2x00: checkpatch.pl error fixes for rt2800lib.c
      rt2x00: checkpatch.pl error fixes for rt2800pci.h
      rt2x00: checkpatch.pl error fixes for rt2800usb.c
      rt2x00: checkpatch.pl error fixes for rt2800usb.h
      rt2x00: checkpatch.pl error fixes for rt2x00config.c
      rt2x00: checkpatch.pl error fixes for rt2x00dev.c
      rt2x00: checkpatch.pl error fixes for rt2x00lib.h
      rt2x00: checkpatch.pl error fixes for rt2x00link.c
      rt2x00: checkpatch.pl error fixes for rt2x00queue.c
      rt2x00: checkpatch.pl error fixes for rt73usb.c

Martin Willi (3):
      xfrm: Add Traffic Flow Confidentiality padding XFRM attribute
      xfrm: Traffic Flow Confidentiality for IPv4 ESP
      xfrm: Traffic Flow Confidentiality for IPv6 ESP

Matt Carlson (16):
      tg3: Apply 10Mbps fix to all 57765 revisions
      tg3: Assign correct tx margin for 5719
      tg3: Always turn on APE features in mac_mode reg
      tg3: Fix 5719 internal FIFO overflow problem
      tg3: Reorg tg3_napi members
      tg3: Enable mult rd DMA engine on 5719
      tg3: Reenable TSS for 5719
      tg3: use dma_alloc_coherent() instead of pci_alloc_consistent()
      tg3: Enable phy APD for 5717 and later asic revs
      tg3: Remove tg3_config_info definition
      tg3: Raise the jumbo frame BD flag threshold
      tg3: Move EEE definitions into mdio.h
      tg3: Fix 57765 EEE support
      tg3: Minor EEE code tweaks
      tg3: Relax EEE thresholds
      tg3: Update version to 3.116

Michael Chan (14):
      bnx2: Remove config access to non-standard registers
      cnic: Fix iSCSI TCP port endian order.
      cnic: Prevent "scheduling while atomic" when calling ->cnic_init()
      cnic: Improve ->iscsi_nl_msg_send()
      cnic: Use proper client and connection IDs on iSCSI ring
      cnic: Support NIC Partition mode
      cnic: Check device state before reading the kcq pointer in IRQ
      cnic: Add kcq2 support on 57712
      cnic: Add FCoE support on 57712
      bnx2: Free IRQ before freeing status block memory
      bnx2: Update firmware and version
      cnic: Do not allow iSCSI and FCoE on bnx2x multi-function mode
      cnic: Do not call bnx2i when bnx2i is calling cnic_unregister_driver()
      cnic: Fix the type field in SPQ messages

Michael S. Tsirkin (9):
      vhost: put mm after thread stop
      vhost-net: batch use/unuse mm
      vhost: copy_to_user -> __copy_to_user
      vhost: get/put_user -> __get/__put_user
      vhost: remove unused include
      vhost: correctly set bits of dirty pages
      vhost: better variable name in logging
      vhost test module
      tools/virtio: virtio_test tool

Michal Simek (2):
      trivial: Fix typo fault in netdevice.h
      ll_temac: Fix section mismatch from the temac_of_probe

Michał Mirosław (4):
      net: Fix too optimistic NETIF_F_HW_CSUM features
      net: Introduce skb_checksum_start_offset()
      net: Use skb_checksum_start_offset()
      net: Fix drivers advertising HW_CSUM feature to use csum_start

Milton Miller (1):
      mac80211: fix mesh forwarding when ratelimited too

Mohammed Shafi Shajakhan (15):
      ath9k: Remove the median function in rate control
      ath9k: Properly assign boolean types
      ath9k_htc: Use macro for caldata array size
      ath9k: Add support for Adaptive Power Management
      ath9k: Properly use unlikely check macro
      ath9k: Parse DTIM period from mac80211
      ath9k: Remove dead code in recv.c
      ath9k: clean up hardware code for beacon handling
      ath9k: Make PM-QOS value as user configurable
      ath9k: Add comments for making pm-qos as modparam
      ath9k: Properly initialize channel table for 2GHz
      ath9k: Reset keycache on resume
      ath9k: Few clean ups in beacon config parameters
      Revert "ath9k: Parse DTIM period from mac80211"
      ath9k : few rate control clean ups

Namhyung Kim (1):
      isdn/hisax: fix compiler warning on hisax_pci_tbl

Nandita Dukkipati (1):
      TCP: increase default initial receive window.

Neil Horman (1):
      packet: Enhance AF_PACKET implementation to not require high order contiguous memory allocation (v4)     MIME-Version: 1.0     Content-Type: text/plain; charset=UTF-8     Content-Transfer-Encoding: 8bit

Nick Kossifidis (35):
      ath5k: Reset cleanup and generic cleanup
      ath5k: Add new function to stop rx/tx DMA
      ath5k: Stop PCU on reset
      ath5k: Use new dma_stop function on base.c
      ath5k: Debug DMA timeouts
      ath5k: Use DCU early termination correctly
      ath5k: Check RXE when setting RXDP
      ath5k: Use new function to stop beacon queue
      ath5k: Add new field on ath5k_hw to track bandwidth modes
      ath5k: Put core clock initialization on a new function
      ath5k: Small cleanup on tweak_initvals
      ath5k: Increase PHY settling parameters for turo mode
      ath5k: Move tx retries setting outside reset_tx_queue
      ath5k: Extend get_default_sifs/slot_time
      ath5k: Extend rate_duration
      ath5k: Set all IFS intervals, not just slot time
      ath5k: Use turbo flag on DCU
      ath5k: Always set IFS intervals on reset
      ath5k: Tweak power detector delays on RF5111/RF5112
      ath5k: Update spur mitigation filter for turbo/half/quarter
      ath5k: Update PLL programming for turbo/half/quarter
      ath5k: Skip powertable setting when we are on the same channel
      ath5k: Support synth-only channel change for AR2413/AR5413
      ath5k: No need to save/restore staid flags on reset
      ath5k: Tweak phy activate to rx start delay based on bwmode
      ath5k: Skip tx power setting on AR5210 for now
      ath5k: Use correct clock when setting ofdm timings
      ath5k: Cleanup turbo channel flags
      ath5k: Clean up turbo mode initvals/rfregs
      ath5k: Set turbo bit on rf bank 2
      ath5k: Always write tx powertable on hw
      ath5k: Always free tx buffers before reset
      ath5k: Disable ANI during reset
      ath5k: Fix reporting of RX dma stop failure
      ath5k: Include tx ack reporting on hw flags

Nicolas Kaiser (1):
      wireless/wl1271: remove redundant if-statement v2

Nishant Sarmukadam (2):
      mwl8k: force AP mode to use non-AMPDU frames
      mwl8k: rf_tx_power cmd not supported by AP firmware APIv1

Octavian Purdila (1):
      net: factorize sync-rcu call in unregister_netdevice_many

Oliver Hartkopp (1):
      can: add slcan driver for serial/USB-serial CAN adapters

Pablo Neira Ayuso (1):
      netfilter: fix export secctx error handling

Paul Gortmaker (4):
      tipc: recode getsockopt error handling for better readability
      tipc: update log.h re-include protection to reflect new name
      net/Space: delete orphaned externs from deleted drivers
      netdev: Update status of 8390 based drivers in MAINTAINERS

Paul Mundt (1):
      net: sh_eth: Move off of deprecated I/O routines.

Philippe De Muyter (2):
      net: Kconfig whitespace cleanup
      net: more Kconfig whitespace cleanup

RA-Jay Hung (5):
      rt2x00: Fix rt2800 USB TX Path DMA issue
      rt2x00: Fix header_length in rt2x00lib_txdone
      rt2x00: Modify rt2x00queue_remove_l2pad to make skb->data two-byte alignment
      rt2x00: Add rt2800 EEPROM definition
      rt2x00: Add RF chip definition

Rafael J. Wysocki (3):
      ath9k: Convert to new PCI PM framework
      tg3: Do not use legacy PCI power management
      sky2: Do not use legacy PCI power management

Rafał Miłecki (47):
      b43: N-PHY: define channel table struct for rev3+ devices
      b43: N-PHY: define registers names for 2056 radio
      b43: N-PHY: define registers names for 2056 radio
      b43: N-PHY: fix 2055 radio init
      b43: define known SPROM boardflags2 bits
      b43: N-PHY: determine usage of radio regulatory workaround correctly
      b43: N-PHY: improve 2055 radio initialization
      b43legacy: rfkill: use status register based on core revision (not PHY's)
      ssb: workarounds: be verbose about hacking SPROM revision, don't duplicate code
      ssb: return -ENOMEM on alloc fail (instead of CRC check's result)
      ssb: drop BCM4328 hack for SPROM revision
      b43: N-PHY: add 2056 radio channels tables
      b43: rfkill: use HI enabled bit for all devices
      b43: N-PHY: fix values for PHY regs in channel tables of 2055 radio
      b43: N-PHY: minor fixes to match specs
      b43: N-PHY: fix some typos, conditions, set gain_boost
      b43: N-PHY: init BPHY when needed
      b43: N-PHY: fix BPHY init
      b43: N-PHY: rev2: save and restore PHY regs on RSSI poll
      b43: N-PHY: little cleanups
      ssb: extract indexes for power tables
      b43: N-PHY: swap values for radio registers 0x3b and 0x3c
      b43: N-PHY: implement very basic TX power control management
      b43: N-PHY: initialize perical variable, add missing call to CCA reset
      b43: N-PHY: fix RSSI calibration
      b43: N-PHY: fix RSSI selection
      b43: N-PHY: use defines for RSSI types
      b43: N-PHY: fix code path on PHY init
      b43: N-PHY: update init tables
      b43: N-PHY: reorder and optimize tables initialization
      b43: N-PHY: implement own maskset
      b43: flush PHY writes when needed
      b43: N-PHY: silence warnings
      b43: set TMS to work with current band width for N-PHY
      b43: fix split of N-PHY devices into supported and not (based on PHY rev)
      b43: rename config option for N-PHY, drop BROKEN
      b43: N-PHY: use correct bit for controlling MAC and PHY
      b43: N-PHY: one more fix for order of tables initialization
      b43: N-PHY: use designed function and macro for writing tables
      b43: rename TMS defines, drop useless condition from core reset
      b43: use correct firmware for newer cores
      b43: N-PHY: implement radio 2056 init steps
      b43: N-PHY: add init tables for 2056 radio
      b43: N-PHY: avoid PHY hangs for rev 3 and 4
      b43: N-PHY: use correct channel tables for rev4+
      b43: N-PHY: update 2056 radio on channel switch on rev3+
      b43: N-PHY: enable support for PHYs rev 3 and higher

Rajesh Borundia (5):
      qlcnic: Fix for kdump
      qlcnic: avoid using reset_devices as it may become obsolete.
      netxen: avoid using reset_devices as it may become obsolete
      qlcnic: fix ocm window register offset calculation
      qlcnic: reset pci function unconditionally during probe

Rajkumar Manoharan (10):
      ath9k_htc: Handle monitor mode properly for HTC devices
      ath: Add a driver_info bitmask field
      ath9k_htc: Add driver_info in usb device list
      ath9k_hw: Fix eeprom offset for AR9287 devices (PCI/USB)
      ath9k_htc: Identify devices using driver_info
      Revert "ath9k_htc: Handle monitor mode properly for HTC devices"
      ath9k: Add change_interface callback
      ath: Missed to clear key4 of micentry
      ath9k: Fix warnings on card removal
      ath9k: fix beacon restart on channel change

Rasesh Mody (10):
      bna: TxRx and datapath fix
      bna: Port enable disable sync and txq priority fix
      bna: Fix ethtool register dump and reordered an API
      bna: Enable pure priority tagged packet reception and rxf uninit cleanup fix
      bna: Fix for TX queue
      bna: IOC uninit check and misc cleanup
      bna: Removed unused code
      bna: Restore VLAN filter table
      bna: IOC failure auto recovery fix
      bna: Update the driver version to 2.3.2.3

Richard Mortimer (1):
      cassini: Use local-mac-address prom property for Cassini MAC address

Roger Luethi (1):
      via-rhine: hardware VLAN support

Roger Quadros (2):
      wl1271: Add wl1271_load_firmware() and export some functions
      wl1271_sdio_test: Add module for sdio RX/TX testing

Ron Mercer (2):
      qlge: Add firmware info to ethtool get regs.
      qlge: Version change to v1.00.00.27

Roopa Prabhu (4):
      enic: Add ndo_set_rx_mode support for enic vnics
      enic: Add ndo_set_vf_mac support for enic dynamic devices
      enic: Use VF mac set by IFLA_VF_MAC in port profile provisioning data
      enic: Move enic port profile handling code to a new 802.1Qbh provisioning info type

Sachin Sant (1):
      qeth lcs: convert mc rwlock to RCU

Sathya Perla (4):
      be2net: adding support for Lancer family of CNAs
      be2net: Fix be_dev_family_check() return value check
      be2net: FW init cmd fix for lancer
      be2net: Handle out of buffer completions for lancer

Scott J. Goldman (1):
      vmxnet3: fix compilation when RSS is disabled

Sedat Dilek (5):
      ath5k: Fix modinfo does not list alias -> pci-id lines
      iwlwifi: Fix error: struct iwl_lq_sta has no member named dbg_fixed_rate
      ksz884x: Fix section mismatch derived from pcidev_init()
      smsc-ircc2: Fix section mismatch derived from smsc_ircc_pnp_probe()
      depca: Fix section mismatch derived from depca_isa_probe()

Senthil Balasubramanian (7):
      ath9k_hw: Fix a reset failure on AR9382 (2x2).
      ath9k_hw: Add new member into the eeprom structure.
      ath9k_hw: Initialize 2GHz CTL properly.
      ath9k_hw: Fix paprd training frame failure.
      ath9k_hw: add eeprom templates for ar9003 family chipsets
      ath9k_hw: Fix low throughput issue with AR93xx
      ath9k: spin_lock_bh is not required within tasklet context.

Shahar Levi (4):
      wl1271: 11n Support, Add Definitions
      wl1271: 11n Support, ACX Commands
      wl1271: 11n Support, functionality and configuration ability
      wl1271: Change wl12xx Files Names

Shan Wei (10):
      sctp: kill unused macro definition
      ipv6: kill two unused macro definition
      sctp: kill unused macros in head file
      net: snmp: fix the wrong ICMP_MIB_MAX value
      tcp: use TCP_BASE_MSS to set basic mss value
      ipv6: use ND_REACHABLE_TIME and ND_RETRANS_TIMER instead of magic number
      net: kill unused macros from head file
      dccp: remove unused macros
      wireless:mac80211: kill unuse macro MESH_CFG_CMP_LEN in mesh.h
      net: kill unused macros

Shanyu Zhao (6):
      iwlwifi: seperate disconnected antenna function
      iwlwifi: disable disconnected antenna for advanced bt coex
      iwlagn: update QoS before commit associated RXON
      iwlagn: check change before commit RXON cmd
      iwlwifi: clear dbg_fixed_rate during init
      iwlagn: check ready in iwlagn_bss_info_changed()

Shmulik Ravid (5):
      dcbnl: adding DCBX engine capability
      dcbnl: adding DCBX feature flags get-set
      bnx2x: adding dcbnl support
      dcbnl: cleanup
      dcbnl: more informed return values for new dcbnl routines

Shreyas Bhatewara (1):
      net-next: Add multiqueue support to vmxnet3 driver

Sony Chacko (1):
      qlcnic: lro off message log from set rx checsum

Sridhar Samudrala (1):
      macvlan: Introduce 'passthru' mode to takeover the underlying device

Sritej Velaga (2):
      qlcnic: Add description for CN1000Q adapter
      qlcnic: LICENSE file for qlcnic

Stanislaw Gruszka (15):
      iwlwifi: warn when send tx power settings during scan
      iwlwifi: send tx_power_cmd synchronously
      iwlwifi: fix set_tx_power vs scan
      iwlwifi: avoid commit rxon during scan in iwlagn_configure_filter
      iwlwifi: avoid commit rxon during scan in iwlagn_bt_traffic_change_work
      iwlwifi: defer update power mode while scan
      iwlwifi: avoid commit rxon during scan in iwl_set_no_assoc
      iwl3945: remove unused len_org variable
      iwlagn: simplify iwlagn_tx_skb
      iwlwifi: kill elapsed_jiffies
      iwlagn: fix microcode error on 4965
      iwl3945: prevent too frequent firmware resets
      iwlwifi: jiffies based tx queues watchdog
      iwlagn: enable only rfkill interrupt when device is down
      iwlagn: fix scan tx antenna setting on 5Ghz band

Stephen Hemminger (1):
      rfkill: remove dead code

Steve Hodgson (2):
      sfc: Fix event based MCDI completion and MC REBOOT/CMDDONE ordering issue
      sfc: When waking a stopped tx_queue, only lock that tx_queue

Sucheta Chakraborty (4):
      qlcnic: Allow minimum bandwidth of zero
      qlcnic: Disable loopback support
      qlcnic: fix LED test when interface is down.
      netxen: enable LRO based on NETIF_F_LRO

Sujith Manoharan (15):
      ath9k_htc: Remove unused structures
      ath9k_htc: Cleanup device identification
      ath9k_htc: Add support for handling TX power configuration
      ath9k_htc: Fix panic on FW download failure
      ath9k: Use power save wrappers for TSF get/set
      ath9k_htc: Add Ubiquiti wifistation ext to supported devices
      mac80211: Add timeout to BA session start API
      ath9k_htc: Remove PCI specific configuration
      ath9k_htc: Fix warning on device removal
      ath9k_htc: Handle pending URBs properly
      ath9k_htc: Move work cancellation outside of mutex
      ath9k_htc: Handle FATAL events
      ath9k_htc: Fix fast channel change
      ath9k_htc: Move LED/RFKILL code to htc_drv_gpio.c
      ath9k_htc: Fix packet injection

Sven Eckelmann (2):
      net: Add batman-adv meshing protocol
      batman-adv: Return hna count on local buffer fill

Sven Neumann (1):
      cfg80211: update information elements in cached BSS struct

Szymon Janc (5):
      forcedeth: fix multiple code style issues
      forcedeth: remove unnecessary checks before kfree
      forcedeth: include <linux/io.h> and <linux/uaccess.h> instead of <asm/io.h> and <asm/uaccess.h> as suggested by checkpatch
      forcedeth: do not use assignment in if conditions
      forcedeth: use usleep_range not msleep for small sleeps

Taku Izumi (3):
      bonding: add the debugfs facility to the bonding driver
      bonding: migrate some macros from bond_alb.c to bond_alb.h
      bonding: add the debugfs interface to see RLB hash table

Teemu Paasikivi (1):
      wl1271: Fix warning about unsupported RX rate

Tejun Heo (11):
      drivers/net: remove unnecessary flush_scheduled_work() calls
      drivers/net: don't use flush_scheduled_work()
      ehea: kill unused ehea_rereg_mr_task
      ehea: don't use flush_scheduled_work()
      iseries_veth: don't use flush_scheduled_work()
      igb[v],ixgbe: don't use flush_scheduled_work()
      sungem: update gp->reset_task flushing
      i2400m: drop i2400m_schedule_work()
      hostap: don't use flush_scheduled_work()
      vxge: add missing flush of reset_task
      bnx2: remove cancel_work_sync() from remove_one

Tetsuo Handa (1):
      filter: Optimize instruction revalidation code.

Thadeu Lima de Souza Cascardo (1):
      rtl8187b: do not do per packet TX AGC

Thiago Farina (1):
      net/9p/protocol.c: Remove duplicated macros.

Thomas Graf (5):
      rtnetlink: Link address family API
      inet: Define IPV4_DEVCONF_MAX
      ipv4: AF_INET link address family
      ipv6: AF_INET6 link address family
      rtnl: make link af-specific updates atomic

Tim Harvey (1):
      mac80211 default tx_last_beacon false (congestion)

Timo Teräs (2):
      xfrm: use gre key as flow upper protocol info
      xfrm: fix gre key endianess

Tobias Klauser (6):
      net: am79c961a: Omit private ndo_get_stats function
      net: emaclite: Omit private ndo_get_stats function
      net: cris/eth_v10: Use net_device_stats from struct net_device_stats
      bridge: Fix return values of br_multicast_add_group/br_multicast_new_group
      stmmac: Remove redundant unlikely()
      inet6: Remove redundant unlikely()

Tom Herbert (5):
      net: Move TX queue allocation to alloc_netdev_mq
      net: Simplify RX queue allocation
      xps: Improvements in TX queue selection
      xps: Transmit Packet Steering
      xps: Add CONFIG_XPS

Tomas Winkler (1):
      net/bridge: fix trivial sparse errors

Tomasz Grobelny (2):
      dccp: Policy-based packet dequeueing infrastructure
      dccp qpolicy: Parameter checking of cmsg qpolicy parameters

Tomoya (27):
      can: EG20T PCH: add prefix to macro
      can: EG20T PCH: use BIT(X)
      can: EG20T PCH: Separate Interface Register(IF1/IF2)
      can: EG20T PCH: Change Message Object Index
      can: EG20T PCH: Enumerate LEC macros
      can: EG20T PCH: Delete unnecessary spin_lock
      pch_can: Add flow control processing
      pch_can: Divide poll function
      pch_can: Fix endianness issue
      pch_can: Improve rx processing
      pch_can: Fix warnings
      pch_can: Rename function/macro name
      pch_can: Change functions type
      pch_can: Reduce register access
      pch_can: Change Copyright and module description
      pch_can: Replace netdev_dbg instead of dev_dbg partly
      pch_can: Fix coding rule violation
      pch_can: Delete unnecessary/redundant code
      pch_can: Fix bit timing calculation issue
      pch_can: Fix miss-setting status issue
      pch_can: Comment optimization
      pch_can: Move MSI processing to probe/remove processing
      pch_can: Fix incorrect return processing
      pch_can: Optimize "if" condition in rx/tx processing
      pch_can: Add setting TEC/REC statistics processing
      pch_can: Replace netif_rx to netif_receive_skb
      pch_can: Fix array miss-pointing issue

Tracey Dent (18):
      Net: bluetooth: Makefile: Remove deprecated kbuild goal definitions
      Net: caif: Makefile: Remove deprecated items
      Net: can: Makefile: Remove deprecated kbuild goal definitions
      Net: ceph: Makefile: remove deprecated kbuild goal definitions
      Net: dns_resolver: Makefile: Remove deprecated kbuild goal definitions
      Net: econet: Makefile: Remove deprecated kbuild goal definitions
      Net: ipv4: netfilter: Makefile: Remove deprecated kbuild goal definitions
      Net: ipv6: netfiliter: Makefile: Remove deprecated kbuild goal definitions
      Net: irda: ircomm: Makefile: Remove deprecated kbuild goal defintions
      Net: irda: irlan: Makefile: Remove deprecated kbuild goal definitions
      Net: irda: irnet: Makefile: Remove deprecated kbuild goal definitions
      Net: lapb: Makefile: Remove deprecated kbuild goal definitions
      Net: phonet: Makefile: Remove deprecated kbuild goal definitions
      Net: rds: Makefile: Remove deprecated items
      Net: rxrpc: Makefile: Remove deprecated kbuild goal definitions
      Net: sunrpc: auth_gss: Makefile: Remove deprecated kbuild goal definitions
      Net: wanrouter: Makefile: Remove deprecated kbuild goal definitions
      Net: bluetooth: Makefile: Remove deprecated kbuild goal definitions

Ursula Braun (1):
      qeth: enable interface setup if LAN is offline

Uwe Kleine-König (1):
      net: add some KERN_CONT markers to continuation lines

Vasanthakumar Thiagarajan (41):
      ath9k_hw: Fix XPABIAS level configuration for AR9003
      ath9k_hw: Enable strong signal detection for AR9003
      ath9k_hw: Improve power control accuracy for AR9003
      ath9k_hw: Add helper function for interpolation
      ath9k: Fix bug in delimiter padding computation
      ath9k: Reintroduce modparam to enable btcoex
      ath9k: Remove code which enables btcoex based on subsys id
      ath9k_hw: Define hw version macros for AR9485
      ath9k_hw: Add initvals.h for AR9485
      ath9k_hw: Enable hw initialization for AR9485
      ath9k_hw: Initialize mode registers for AR9485
      ath9k_hw: Initialize tx/rx gain table from initvals.h for AR9485
      ath9k_hw: Eeeprom changes for AR9485
      ath9k_hw: Disable LDPC for AR9485
      ath9k: Disable TX STBC for AR9485
      ath9k: Enable extended synch for AR9485 to fix L0s recovery issue
      ath9k_hw: Find the maximum number of chains that hw supports
      ath9k: Configure pll control for AR9485
      ath9k_hw: Find chansel of AR_PHY_65NM_CH0_SYNTH7 for AR9485
      ath9k_hw: Add a helper function to get spur channel pointer from cal data for AR9003 family
      ath9k: Read spur channel information from eeprom for AR9485
      ath9k_hw: Configure xpa bias level for AR9485
      ath9k_hw: Read and configure antenna diversity control for AR9485
      ath9k_hw: Configure internal regulator for AR9485
      ath9k_hw: Read and configure turnning caps to regulate freq accuracy
      ath9k_hw: Configure power control only for the supported chains
      ath9k_hw: Program appropriate chianmask for AR9485 before starting AGC/IQ cal
      ath9k_hw: Define IQcal correction coefficient registers using index
      ath9k_hw: Add IQ cal changes for AR9485
      ath9k_hw: Program appropriate register for temperature compensation cal for AR9485
      ath9k_hw: Setup paprd only for supported chains
      ath9k_hw: Disable MRC CCK for AR9485
      ath9k: Add device id of AR9485 to pci table
      ath9k_hw: Remove delay during regwrite of analog shift registers
      ath9k_hw: Remove unnecessary Rx IQ cal register configuration in ar9003_hw_tx_iq_cal()
      ath9k_hw: Move get_streams() to hw.h
      ath9k_hw: Tx IQ cal changes for AR9003
      ath9k_hw: Add a helper to get paprd scale factor
      ath9k_hw: Disable PAPRD for rates with low Tx power
      ath9k_hw: Configure appropriate Tx power when PAPRD fails
      ath9k_hw: Fix bug in eeprom data length validation for AR9485

Vasanthy Kolluri (1):
      enic: Fix build warnings

Vasiliy Kulikov (4):
      net: ipv4: tcp_probe: cleanup snprintf() use
      Bluetooth: bnep: fix information leak to userland
      Bluetooth: cmtp: fix information leak to userland
      Bluetooth: hidp: fix information leak to userland

Vladislav Zolotarov (15):
      bnx2x: Do interrupt mode initialization and NAPIs adding before register_netdev()
      bnx2x: Use helpers instead of direct access to the shinfo(skb) fields
      bnx2x: LSO code was broken on BE platforms
      bnx2x: Use dma_alloc_coherent() semantics for ILT memory allocation
      bnx2x: Fixed a compilation warning
      bnx2x: Update version number and a date.
      bnx2x: Take the distribution range definition out of skb_tx_hash()
      bnx2x: add FCoE ring
      bnx2x: add a select queue callback
      bnx2x: add DCB support
      bnx2x: Add DCB/PFC support - link layer
      bnx2x: add FW 6.2.5 files
      bnx2x: replace FW to 6.2.5
      bnx2x: remove old FW files
      bnx2x: update version to 1.62.00-2

Wey-Yi Guy (46):
      iwlagn: turn dynamic smps on while BT is on
      iwlwifi: add new devices to Kconfig
      iwlagn: use 6000g2b uCode for 130 series devices
      iwlagn: update PCI ID for 6000g2b series devices
      iwlagn: update PCI ID for 6000g2a series devices
      iwlagn: update PCI ID for 100 series devices
      iwlwifi: Legacy isr only used by legacy devices
      iwlwifi: put all the isr related function under ops
      iwlwifi: legacy tx_cmd_protection function
      iwlwifi: resending QoS command when HT changes
      iwlagn: enable shadow register
      iwlagn: used frame count info in compressed ba packet
      iwlagn: set dynamic aggregation threshold for BT
      iwlagn: support dynamic aggregation for BT coex
      iwlagn: change default ACK/CTS MASK setting for WiFi/BT coex
      iwlwifi: change default led mode for different devices
      iwlagn: use SKU information in the EEPROM
      iwlwifi: set STATUS_READY before commit_rxon
      iwlagn: name change for BT config flag
      iwlwifi: add more power management flags
      iwlwifi: consider BT for power management
      iwlwifi: power management checking for shadow register
      iwlwifi: advance power management support
      iwlwifi: remove unused define
      iwlwifi: use antenna information in EEPROM
      iwlagn: Offical name for 6050g2 device
      iwlagn: Offical name for 6000g2a device
      iwlagn: Offical name for 6000g2b device
      iwlagn: Offical name for 100/130 device
      iwlagn: use different kill mask when SCO active
      iwlagn: minor change in bt coex normal LUT
      iwlagn: fix race condition when reprogram sta
      iwlagn: remove structure name reference to gen2
      iwlwifi: check for STATUS_EXIT_PENDING when send RXON command
      iwlagn: name change for bt_ch_announce module parameter
      iwlagn: change led compensation for 6005 and 6030 devices
      iwlagn: rx antenna diversity
      iwlwifi: add new EEPROM debug log type
      iwlwifi: use IWL_DEBUG_EEPROM for EEPROM related info
      iwlagn: More detail tx power logging
      iwlwifi: do not reload fw if WiMAX own the RF
      iwlwifi: keep track of bt coex enable/disable stage
      iwlagn: code clean up to remove duplicate code
      iwlagn: fix witespace damage
      iwlwifi: remove extra string
      iwlwifi: remove reference to Gen2

Williams, Mitch A (1):
      igbvf: add support for i350 VF device

Winkler, Tomas (1):
      iwlwlifi: update rx write pointer w/o request mac access in the CAM mode

Wolfgang Kufner (2):
      rt2x00: Pad beacon to multiple of 32 bits.
      rt2x00: Fix firmware loading regression on x86_64.

Yi Zou (3):
      ixgbe: avoid doing FCoE DDP when adapter is DOWN or RESETTING
      ixgbe: invalidate FCoE DDP context when no error status is available
      ixgbe: make sure FCoE DDP user buffers are really released by the HW

amit salecha (1):
      netxen: update driver version 4.0.75

andrew hendry (9):
      X25: pushdown bkl in ioctls
      X25: remove bkl in timestamp ioctls
      X25: remove bkl in inq and outq ioctls
      X25: remove bkl in routing ioctls
      X25 remove bkl in subscription ioctls
      X25 remove bkl in facility ioctls
      X25 remove bkl from calluserdata ioctls
      X25 remove bkl from causediag ioctls
      X25 remove bkl in call user data length ioctl

françois romieu (8):
      r8169: remove the firmware of RTL8111D.
      r8169: identify different registers.
      r8169: use device dependent methods to access the MII registers.
      r8169: 8168DP specific MII registers access methods.
      r8169: phy power ops
      r8169: magic.
      r8169: rtl_csi_access_enable rename.
      r8169: more 8168dp support.

maximilian attems (2):
      zd1211rw: add 2 missing usb id's
      zd1201: Add missing id

roel kluin (1):
      libertas: down_interruptible() can return -EINTR, not EINTR

stephen hemminger (10):
      netdev: add rcu annotations to receive handler hook
      bridge: fix RCU races with bridge port
      gre: minor cleanups
      gre: add module alias for gre0 tunnel device
      ipip: add module alias for tunl0 tunnel device
      sfc: convert references to LRO to GRO
      ipv6: fib6_ifdown cleanup
      ipv6: remove duplicate neigh_ifdown
      skge: Do not use legacy PCI power management
      sky2: implement 64 bit stats

 .../ABI/testing/sysfs-class-net-batman-adv         |   14 +
 Documentation/ABI/testing/sysfs-class-net-mesh     |   69 +
 Documentation/DocBook/80211.tmpl                   |   70 +-
 Documentation/networking/LICENSE.qlcnic            |  327 +
 Documentation/networking/batman-adv.txt            |  240 +
 Documentation/networking/dccp.txt                  |   20 +
 Documentation/networking/e100.txt                  |   19 +-
 Documentation/networking/e1000.txt                 |   16 +-
 Documentation/networking/e1000e.txt                |   52 +-
 Documentation/networking/igb.txt                   |   35 +-
 Documentation/networking/igbvf.txt                 |    6 +-
 Documentation/networking/ip-sysctl.txt             |   28 +-
 Documentation/networking/ixgb.txt                  |   10 +-
 Documentation/networking/ixgbe.txt                 |  213 +-
 Documentation/networking/ixgbevf.txt               |    4 -
 Documentation/networking/stmmac.txt                |   48 +-
 MAINTAINERS                                        |   34 +-
 arch/arm/mach-omap2/board-omap3pandora.c           |   32 +-
 arch/s390/include/asm/qeth.h                       |   51 +-
 drivers/atm/fore200e.c                             |    2 +-
 drivers/atm/lanai.c                                |    7 +-
 drivers/block/aoe/aoecmd.c                         |    6 +-
 drivers/infiniband/core/addr.c                     |   14 +-
 drivers/infiniband/hw/mlx4/main.c                  |    6 +-
 drivers/isdn/hardware/mISDN/mISDNinfineon.c        |    4 +-
 drivers/isdn/hardware/mISDN/mISDNisar.c            |    2 +-
 drivers/isdn/hisax/avm_pci.c                       |    2 +-
 drivers/isdn/hisax/callc.c                         |    4 +-
 drivers/isdn/hisax/config.c                        |    2 +-
 drivers/isdn/hisax/hfc_2bds0.c                     |    4 +-
 drivers/isdn/hisax/hfc_2bs0.c                      |    2 +-
 drivers/isdn/hisax/hfc_pci.c                       |    4 +-
 drivers/isdn/hisax/hfc_sx.c                        |    6 +-
 drivers/isdn/hisax/hisax.h                         |    2 +
 drivers/isdn/hisax/ipacx.c                         |    2 +-
 drivers/isdn/hisax/isar.c                          |   15 +-
 drivers/isdn/hisax/isdnl1.h                        |    1 +
 drivers/isdn/hisax/isdnl3.c                        |    2 +-
 drivers/isdn/hisax/netjet.c                        |   10 +-
 drivers/isdn/hisax/st5481_d.c                      |    6 +-
 drivers/isdn/i4l/isdn_concap.c                     |    2 +-
 drivers/isdn/i4l/isdn_net.c                        |   20 +-
 drivers/isdn/i4l/isdn_ppp.c                        |   26 +-
 drivers/isdn/mISDN/layer1.c                        |   10 +-
 drivers/isdn/mISDN/layer2.c                        |   12 +-
 drivers/isdn/mISDN/tei.c                           |   23 +-
 drivers/net/3c501.c                                |    4 +-
 drivers/net/3c503.c                                |    4 +-
 drivers/net/3c507.c                                |    6 +-
 drivers/net/3c515.c                                |    2 +-
 drivers/net/3c527.c                                |    6 +-
 drivers/net/8139too.c                              |    3 +-
 drivers/net/82596.c                                |    2 +-
 drivers/net/Kconfig                                |  256 +-
 drivers/net/Space.c                                |    5 -
 drivers/net/arm/am79c961a.c                        |    9 -
 drivers/net/arm/ixp4xx_eth.c                       |    4 +-
 drivers/net/arm/w90p910_ether.c                    |    2 +-
 drivers/net/at1700.c                               |    8 +-
 drivers/net/atarilance.c                           |    2 +-
 drivers/net/atl1c/atl1c_main.c                     |    2 +-
 drivers/net/atl1e/atl1e_main.c                     |    2 +-
 drivers/net/atlx/atl1.c                            |    2 +-
 drivers/net/atlx/atl2.c                            |    4 +-
 drivers/net/au1000_eth.c                           |    2 -
 drivers/net/ax88796.c                              |    8 +-
 drivers/net/bcm63xx_enet.c                         |    2 +-
 drivers/net/benet/be.h                             |   39 +-
 drivers/net/benet/be_cmds.c                        |   69 +-
 drivers/net/benet/be_cmds.h                        |   42 +-
 drivers/net/benet/be_ethtool.c                     |    4 +-
 drivers/net/benet/be_hw.h                          |   39 +-
 drivers/net/benet/be_main.c                        |  252 +-
 drivers/net/bna/bfa_defs.h                         |   22 +-
 drivers/net/bna/bfa_defs_mfg_comm.h                |   22 -
 drivers/net/bna/bfa_ioc.c                          | 1237 ++-
 drivers/net/bna/bfa_ioc.h                          |   49 +-
 drivers/net/bna/bfa_ioc_ct.c                       |  102 +-
 drivers/net/bna/bfi_ctreg.h                        |   41 +-
 drivers/net/bna/bna.h                              |    6 +-
 drivers/net/bna/bna_ctrl.c                         |  377 +-
 drivers/net/bna/bna_txrx.c                         |   44 +-
 drivers/net/bna/bna_types.h                        |   11 +-
 drivers/net/bna/bnad.c                             |  427 +-
 drivers/net/bna/bnad.h                             |   31 +-
 drivers/net/bna/bnad_ethtool.c                     |    8 +-
 drivers/net/bnx2.c                                 |  121 +-
 drivers/net/bnx2.h                                 |    2 +
 drivers/net/bnx2x/Makefile                         |    2 +-
 drivers/net/bnx2x/bnx2x.h                          |  165 +-
 drivers/net/bnx2x/bnx2x_cmn.c                      |  155 +-
 drivers/net/bnx2x/bnx2x_cmn.h                      |   73 +-
 drivers/net/bnx2x/bnx2x_dcb.c                      | 2118 +++
 drivers/net/bnx2x/bnx2x_dcb.h                      |  196 +
 drivers/net/bnx2x/bnx2x_ethtool.c                  |  357 +-
 drivers/net/bnx2x/bnx2x_hsi.h                      |  327 +-
 drivers/net/bnx2x/bnx2x_link.c                     |  666 +-
 drivers/net/bnx2x/bnx2x_link.h                     |   56 +
 drivers/net/bnx2x/bnx2x_main.c                     |  700 +-
 drivers/net/bnx2x/bnx2x_reg.h                      |   52 +
 drivers/net/bnx2x/bnx2x_stats.c                    |   13 +-
 drivers/net/bnx2x/bnx2x_stats.h                    |    2 -
 drivers/net/bonding/Makefile                       |    2 +-
 drivers/net/bonding/bond_3ad.c                     |    3 +-
 drivers/net/bonding/bond_alb.c                     |   36 -
 drivers/net/bonding/bond_alb.h                     |   38 +
 drivers/net/bonding/bond_debugfs.c                 |  146 +
 drivers/net/bonding/bond_main.c                    |   28 +-
 drivers/net/bonding/bonding.h                      |   11 +-
 drivers/net/can/Kconfig                            |   21 +
 drivers/net/can/Makefile                           |    1 +
 drivers/net/can/janz-ican3.c                       |    9 -
 drivers/net/can/mscan/mscan.c                      |    2 +-
 drivers/net/can/pch_can.c                          | 1350 +-
 drivers/net/can/sja1000/plx_pci.c                  |    2 +-
 drivers/net/can/sja1000/sja1000_of_platform.c      |    8 +-
 drivers/net/can/slcan.c                            |  756 +
 drivers/net/cassini.c                              |   22 +-
 drivers/net/cassini.h                              |    3 +
 drivers/net/chelsio/sge.c                          |   10 +-
 drivers/net/cnic.c                                 |  772 +-
 drivers/net/cnic.h                                 |   27 +-
 drivers/net/cnic_defs.h                            | 2103 +++-
 drivers/net/cnic_if.h                              |   26 +-
 drivers/net/cris/eth_v10.c                         |   34 +-
 drivers/net/cxgb3/ael1002.c                        |   24 +-
 drivers/net/cxgb3/cxgb3_main.c                     |    6 +-
 drivers/net/cxgb3/cxgb3_offload.c                  |    6 +-
 drivers/net/cxgb3/t3_hw.c                          |    2 +-
 drivers/net/cxgb4/cxgb4.h                          |    4 +-
 drivers/net/cxgb4/cxgb4_main.c                     |  140 +-
 drivers/net/cxgb4/sge.c                            |   22 +-
 drivers/net/cxgb4/t4_hw.c                          |   93 +-
 drivers/net/cxgb4/t4fw_api.h                       |    1 +
 drivers/net/cxgb4vf/adapter.h                      |    2 +-
 drivers/net/cxgb4vf/cxgb4vf_main.c                 |   32 +-
 drivers/net/cxgb4vf/sge.c                          |    9 +-
 drivers/net/cxgb4vf/t4vf_hw.c                      |    7 +-
 drivers/net/depca.c                                |    2 +-
 drivers/net/dm9000.c                               |    2 +-
 drivers/net/e1000/e1000_hw.c                       |   20 +-
 drivers/net/e1000/e1000_main.c                     |   18 +-
 drivers/net/e1000/e1000_param.c                    |   13 +-
 drivers/net/e1000e/82571.c                         |  189 +-
 drivers/net/e1000e/defines.h                       |    9 +-
 drivers/net/e1000e/e1000.h                         |    4 +-
 drivers/net/e1000e/es2lan.c                        |    8 +-
 drivers/net/e1000e/ethtool.c                       |  147 +-
 drivers/net/e1000e/ich8lan.c                       |   23 +-
 drivers/net/e1000e/lib.c                           |  141 +-
 drivers/net/e1000e/netdev.c                        |  107 +-
 drivers/net/e1000e/param.c                         |    2 +-
 drivers/net/e1000e/phy.c                           |   50 +-
 drivers/net/e2100.c                                |    2 +-
 drivers/net/eepro.c                                |   11 +-
 drivers/net/eexpress.c                             |    2 +-
 drivers/net/ehea/ehea.h                            |   15 -
 drivers/net/ehea/ehea_ethtool.c                    |   18 +-
 drivers/net/ehea/ehea_main.c                       |  433 +-
 drivers/net/ehea/ehea_phyp.c                       |   40 +-
 drivers/net/ehea/ehea_qmr.c                        |   89 +-
 drivers/net/enic/enic.h                            |    6 +-
 drivers/net/enic/enic_main.c                       |  247 +-
 drivers/net/enic/enic_res.h                        |    1 +
 drivers/net/enic/vnic_vic.h                        |   31 +-
 drivers/net/ethoc.c                                |  160 +-
 drivers/net/fec_mpc52xx.c                          |   19 +-
 drivers/net/forcedeth.c                            | 1134 +-
 drivers/net/gianfar.c                              |   10 +-
 drivers/net/hp.c                                   |    6 +-
 drivers/net/ibm_newemac/core.c                     |    2 +-
 drivers/net/ibmveth.c                              |    7 +-
 drivers/net/ifb.c                                  |   46 +-
 drivers/net/igb/e1000_82575.c                      |   37 +-
 drivers/net/igb/e1000_82575.h                      |    5 +
 drivers/net/igb/e1000_defines.h                    |    7 +
 drivers/net/igb/e1000_hw.h                         |    6 +-
 drivers/net/igb/e1000_nvm.c                        |   93 +-
 drivers/net/igb/e1000_nvm.h                        |    2 +
 drivers/net/igb/e1000_phy.c                        |   11 +-
 drivers/net/igb/e1000_regs.h                       |    1 +
 drivers/net/igb/igb.h                              |    1 +
 drivers/net/igb/igb_main.c                         |  100 +-
 drivers/net/igbvf/Makefile                         |    2 +-
 drivers/net/igbvf/defines.h                        |    2 +-
 drivers/net/igbvf/ethtool.c                        |    9 +-
 drivers/net/igbvf/igbvf.h                          |    4 +-
 drivers/net/igbvf/mbx.c                            |    2 +-
 drivers/net/igbvf/mbx.h                            |    2 +-
 drivers/net/igbvf/netdev.c                         |   33 +-
 drivers/net/igbvf/regs.h                           |    2 +-
 drivers/net/igbvf/vf.c                             |    6 +-
 drivers/net/igbvf/vf.h                             |    4 +-
 drivers/net/irda/act200l-sir.c                     |    2 +-
 drivers/net/irda/donauboe.c                        |    4 +-
 drivers/net/irda/mcs7780.c                         |    2 +-
 drivers/net/irda/smsc-ircc2.c                      |    2 +-
 drivers/net/iseries_veth.c                         |   27 +-
 drivers/net/ixgb/ixgb_main.c                       |   61 +-
 drivers/net/ixgb/ixgb_param.c                      |   21 +-
 drivers/net/ixgbe/Makefile                         |    2 +-
 drivers/net/ixgbe/ixgbe.h                          |  122 +-
 drivers/net/ixgbe/ixgbe_82598.c                    |   58 +-
 drivers/net/ixgbe/ixgbe_82599.c                    |  138 +-
 drivers/net/ixgbe/ixgbe_common.c                   |  256 +-
 drivers/net/ixgbe/ixgbe_common.h                   |   10 +-
 drivers/net/ixgbe/ixgbe_dcb.c                      |   17 +-
 drivers/net/ixgbe/ixgbe_dcb.h                      |    3 +-
 drivers/net/ixgbe/ixgbe_dcb_82598.c                |   12 +-
 drivers/net/ixgbe/ixgbe_dcb_82599.c                |   12 +-
 drivers/net/ixgbe/ixgbe_dcb_nl.c                   |   55 +-
 drivers/net/ixgbe/ixgbe_ethtool.c                  |  297 +-
 drivers/net/ixgbe/ixgbe_fcoe.c                     |   15 +-
 drivers/net/ixgbe/ixgbe_main.c                     | 2085 ++--
 drivers/net/ixgbe/ixgbe_mbx.c                      |   42 +-
 drivers/net/ixgbe/ixgbe_mbx.h                      |    2 +-
 drivers/net/ixgbe/ixgbe_phy.c                      |   52 +
 drivers/net/ixgbe/ixgbe_phy.h                      |    5 +
 drivers/net/ixgbe/ixgbe_sriov.c                    |   57 +-
 drivers/net/ixgbe/ixgbe_type.h                     |   45 +-
 drivers/net/ixgbe/ixgbe_x540.c                     |  724 +
 drivers/net/ixgbevf/Makefile                       |    2 +-
 drivers/net/ixgbevf/defines.h                      |    3 +-
 drivers/net/ixgbevf/ethtool.c                      |   18 +-
 drivers/net/ixgbevf/ixgbevf.h                      |    6 +-
 drivers/net/ixgbevf/ixgbevf_main.c                 |   27 +-
 drivers/net/ixgbevf/mbx.c                          |    2 +-
 drivers/net/ixgbevf/mbx.h                          |    2 +-
 drivers/net/ixgbevf/regs.h                         |    2 +-
 drivers/net/ixgbevf/vf.c                           |    8 +-
 drivers/net/ixgbevf/vf.h                           |    3 +-
 drivers/net/jme.c                                  |   20 +-
 drivers/net/ks8851.c                               |   33 +
 drivers/net/ksz884x.c                              |   22 +-
 drivers/net/lance.c                                |    2 +-
 drivers/net/lib82596.c                             |    2 +-
 drivers/net/lib8390.c                              |   24 +-
 drivers/net/ll_temac_main.c                        |    4 +-
 drivers/net/macvlan.c                              |  113 +-
 drivers/net/macvtap.c                              |    3 +-
 drivers/net/mv643xx_eth.c                          |    9 +-
 drivers/net/myri10ge/myri10ge.c                    |    4 +-
 drivers/net/ne-h8300.c                             |   12 +-
 drivers/net/netconsole.c                           |    8 +-
 drivers/net/netxen/netxen_nic.h                    |    5 +-
 drivers/net/netxen/netxen_nic_ethtool.c            |   26 +-
 drivers/net/netxen/netxen_nic_hw.c                 |   21 +-
 drivers/net/netxen/netxen_nic_init.c               |    7 +-
 drivers/net/netxen/netxen_nic_main.c               |   12 +-
 drivers/net/ni52.c                                 |    4 +-
 drivers/net/ni65.c                                 |    4 +-
 drivers/net/niu.c                                  |    4 +-
 drivers/net/pch_gbe/pch_gbe_ethtool.c              |   19 +-
 drivers/net/pch_gbe/pch_gbe_main.c                 |   12 +-
 drivers/net/pcmcia/axnet_cs.c                      |   18 +-
 drivers/net/pcmcia/nmclan_cs.c                     |    2 +-
 drivers/net/phy/phy.c                              |    4 +-
 drivers/net/ppp_generic.c                          |   12 +-
 drivers/net/pptp.c                                 |    5 +-
 drivers/net/pxa168_eth.c                           |    9 +-
 drivers/net/qla3xxx.c                              |    8 +-
 drivers/net/qlcnic/qlcnic.h                        |   43 +-
 drivers/net/qlcnic/qlcnic_ctx.c                    |   28 +-
 drivers/net/qlcnic/qlcnic_ethtool.c                |  157 +-
 drivers/net/qlcnic/qlcnic_hdr.h                    |   27 +-
 drivers/net/qlcnic/qlcnic_hw.c                     |   91 +-
 drivers/net/qlcnic/qlcnic_init.c                   |  123 +-
 drivers/net/qlcnic/qlcnic_main.c                   |   89 +-
 drivers/net/qlge/qlge.h                            |    4 +-
 drivers/net/qlge/qlge_dbg.c                        |   21 +-
 drivers/net/qlge/qlge_ethtool.c                    |   19 +-
 drivers/net/qlge/qlge_main.c                       |   21 +-
 drivers/net/qlge/qlge_mpi.c                        |    2 +-
 drivers/net/r6040.c                                |    2 +
 drivers/net/r8169.c                                | 1636 +--
 drivers/net/s2io.c                                 |   79 +-
 drivers/net/s2io.h                                 |    9 +-
 drivers/net/sc92031.c                              |    3 +-
 drivers/net/sfc/efx.c                              |   38 +-
 drivers/net/sfc/efx.h                              |    7 +-
 drivers/net/sfc/ethtool.c                          |  168 +-
 drivers/net/sfc/falcon.c                           |  183 +-
 drivers/net/sfc/falcon_boards.c                    |  120 +-
 drivers/net/sfc/falcon_xmac.c                      |   14 +-
 drivers/net/sfc/filter.c                           |  255 +-
 drivers/net/sfc/filter.h                           |  149 +-
 drivers/net/sfc/io.h                               |  153 +-
 drivers/net/sfc/mcdi.c                             |    3 +-
 drivers/net/sfc/mcdi_phy.c                         |    1 -
 drivers/net/sfc/mdio_10g.c                         |    1 -
 drivers/net/sfc/mtd.c                              |   98 +-
 drivers/net/sfc/net_driver.h                       |   87 +-
 drivers/net/sfc/nic.c                              |   90 +-
 drivers/net/sfc/nic.h                              |   12 +-
 drivers/net/sfc/qt202x_phy.c                       |    6 +
 drivers/net/sfc/rx.c                               |   30 +-
 drivers/net/sfc/siena.c                            |   10 +-
 drivers/net/sfc/spi.h                              |    5 +
 drivers/net/sfc/tenxpress.c                        |    2 -
 drivers/net/sfc/tx.c                               |  122 +-
 drivers/net/sh_eth.c                               |  245 +-
 drivers/net/sh_eth.h                               |    1 -
 drivers/net/sis190.c                               |    3 +-
 drivers/net/skfp/smt.c                             |    4 +-
 drivers/net/skge.c                                 |   54 +-
 drivers/net/sky2.c                                 |  157 +-
 drivers/net/sky2.h                                 |   42 +
 drivers/net/smc-ultra.c                            |    8 +-
 drivers/net/stmmac/stmmac.h                        |   40 +-
 drivers/net/stmmac/stmmac_ethtool.c                |   16 +-
 drivers/net/stmmac/stmmac_main.c                   |  267 +-
 drivers/net/stmmac/stmmac_mdio.c                   |    8 +-
 drivers/net/sundance.c                             |   23 +-
 drivers/net/sungem.c                               |   14 +-
 drivers/net/sunhme.c                               |    2 +-
 drivers/net/sunlance.c                             |   10 +-
 drivers/net/tg3.c                                  |  422 +-
 drivers/net/tg3.h                                  |   42 +-
 drivers/net/tokenring/ibmtr.c                      |    5 +-
 drivers/net/tulip/de2104x.c                        |   18 +-
 drivers/net/tulip/tulip_core.c                     |   15 +-
 drivers/net/tun.c                                  |    2 +-
 drivers/net/usb/Kconfig                            |   19 +
 drivers/net/usb/Makefile                           |    1 +
 drivers/net/usb/cdc_ether.c                        |    4 +-
 drivers/net/usb/cdc_ncm.c                          | 1213 ++
 drivers/net/usb/hso.c                              |   40 +-
 drivers/net/usb/ipheth.c                           |    2 +-
 drivers/net/usb/pegasus.c                          |    4 +-
 drivers/net/usb/sierra_net.c                       |    5 +-
 drivers/net/usb/smsc95xx.c                         |    7 +-
 drivers/net/usb/usbnet.c                           |   48 +-
 drivers/net/via-rhine.c                            |  326 +-
 drivers/net/virtio_net.c                           |    2 +-
 drivers/net/vmxnet3/vmxnet3_drv.c                  |  965 +-
 drivers/net/vmxnet3/vmxnet3_ethtool.c              |  174 +-
 drivers/net/vmxnet3/vmxnet3_int.h                  |   73 +-
 drivers/net/vxge/vxge-config.c                     | 4360 +++---
 drivers/net/vxge/vxge-config.h                     |  169 +-
 drivers/net/vxge/vxge-ethtool.c                    |  112 +-
 drivers/net/vxge/vxge-main.c                       | 1172 +-
 drivers/net/vxge/vxge-main.h                       |   86 +-
 drivers/net/vxge/vxge-reg.h                        |   33 +-
 drivers/net/vxge/vxge-traffic.c                    | 1453 +-
 drivers/net/vxge/vxge-traffic.h                    |   49 +-
 drivers/net/vxge/vxge-version.h                    |   33 +-
 drivers/net/wan/dscc4.c                            |    6 +-
 drivers/net/wd.c                                   |    2 +-
 drivers/net/wimax/i2400m/driver.c                  |   96 +-
 drivers/net/wimax/i2400m/i2400m.h                  |   19 +-
 drivers/net/wimax/i2400m/sdio.c                    |    1 -
 drivers/net/wimax/i2400m/usb.c                     |    1 -
 drivers/net/wireless/Kconfig                       |    1 +
 drivers/net/wireless/Makefile                      |    1 +
 drivers/net/wireless/airo.c                        |   20 +-
 drivers/net/wireless/ath/ar9170/cmd.c              |    2 +-
 drivers/net/wireless/ath/ar9170/usb.c              |    6 +-
 drivers/net/wireless/ath/ath.h                     |  111 +
 drivers/net/wireless/ath/ath5k/Kconfig             |   18 +-
 drivers/net/wireless/ath/ath5k/Makefile            |    3 +
 drivers/net/wireless/ath/ath5k/ahb.c               |  219 +
 drivers/net/wireless/ath/ath5k/ani.c               |   40 +-
 drivers/net/wireless/ath/ath5k/ath5k.h             |  292 +-
 drivers/net/wireless/ath/ath5k/attach.c            |   28 +-
 drivers/net/wireless/ath/ath5k/base.c              | 1569 +--
 drivers/net/wireless/ath/ath5k/base.h              |    7 +-
 drivers/net/wireless/ath/ath5k/caps.c              |    6 -
 drivers/net/wireless/ath/ath5k/debug.c             |   34 +-
 drivers/net/wireless/ath/ath5k/debug.h             |    2 +
 drivers/net/wireless/ath/ath5k/desc.c              |   24 +-
 drivers/net/wireless/ath/ath5k/desc.h              |   18 +-
 drivers/net/wireless/ath/ath5k/dma.c               |  180 +-
 drivers/net/wireless/ath/ath5k/eeprom.c            |  139 +-
 drivers/net/wireless/ath/ath5k/eeprom.h            |    4 +-
 drivers/net/wireless/ath/ath5k/initvals.c          |  409 +-
 drivers/net/wireless/ath/ath5k/led.c               |   11 +-
 drivers/net/wireless/ath/ath5k/mac80211-ops.c      |  774 +
 drivers/net/wireless/ath/ath5k/pci.c               |  327 +
 drivers/net/wireless/ath/ath5k/pcu.c               |  571 +-
 drivers/net/wireless/ath/ath5k/phy.c               |  754 +-
 drivers/net/wireless/ath/ath5k/qcu.c               |  696 +-
 drivers/net/wireless/ath/ath5k/reg.h               |   31 +-
 drivers/net/wireless/ath/ath5k/reset.c             | 1221 +-
 drivers/net/wireless/ath/ath5k/rfbuffer.h          | 1169 +-
 drivers/net/wireless/ath/ath5k/sysfs.c             |    4 +-
 drivers/net/wireless/ath/ath9k/ahb.c               |    7 +-
 drivers/net/wireless/ath/ath9k/ani.c               |  107 +-
 drivers/net/wireless/ath/ath9k/ar5008_phy.c        |  305 +-
 drivers/net/wireless/ath/ath9k/ar9002_calib.c      |  220 +-
 drivers/net/wireless/ath/ath9k/ar9002_hw.c         |   27 +-
 drivers/net/wireless/ath/ath9k/ar9002_mac.c        |  144 +-
 drivers/net/wireless/ath/ath9k/ar9002_phy.c        |   25 +-
 .../net/wireless/ath/ath9k/ar9003_2p2_initvals.h   |  104 +-
 drivers/net/wireless/ath/ath9k/ar9003_calib.c      |  605 +-
 drivers/net/wireless/ath/ath9k/ar9003_eeprom.c     | 3252 ++++-
 drivers/net/wireless/ath/ath9k/ar9003_eeprom.h     |   73 +-
 drivers/net/wireless/ath/ath9k/ar9003_hw.c         |  289 +-
 drivers/net/wireless/ath/ath9k/ar9003_mac.c        |  123 +-
 drivers/net/wireless/ath/ath9k/ar9003_mac.h        |    6 +-
 drivers/net/wireless/ath/ath9k/ar9003_paprd.c      |  166 +-
 drivers/net/wireless/ath/ath9k/ar9003_phy.c        |  344 +-
 drivers/net/wireless/ath/ath9k/ar9003_phy.h        |   78 +-
 drivers/net/wireless/ath/ath9k/ar9485_initvals.h   |  943 ++
 drivers/net/wireless/ath/ath9k/ath9k.h             |   68 +-
 drivers/net/wireless/ath/ath9k/beacon.c            |  132 +-
 drivers/net/wireless/ath/ath9k/btcoex.c            |   23 -
 drivers/net/wireless/ath/ath9k/btcoex.h            |    1 -
 drivers/net/wireless/ath/ath9k/calib.c             |   59 +-
 drivers/net/wireless/ath/ath9k/common.c            |   19 +-
 drivers/net/wireless/ath/ath9k/common.h            |   15 +-
 drivers/net/wireless/ath/ath9k/debug.c             |   83 +-
 drivers/net/wireless/ath/ath9k/debug.h             |   21 +-
 drivers/net/wireless/ath/ath9k/eeprom.c            |  219 +-
 drivers/net/wireless/ath/ath9k/eeprom.h            |   63 +-
 drivers/net/wireless/ath/ath9k/eeprom_4k.c         |  302 +-
 drivers/net/wireless/ath/ath9k/eeprom_9287.c       |  295 +-
 drivers/net/wireless/ath/ath9k/eeprom_def.c        |  353 +-
 drivers/net/wireless/ath/ath9k/gpio.c              |   30 +-
 drivers/net/wireless/ath/ath9k/hif_usb.c           |  229 +-
 drivers/net/wireless/ath/ath9k/hif_usb.h           |    3 +
 drivers/net/wireless/ath/ath9k/htc.h               |   35 +-
 drivers/net/wireless/ath/ath9k/htc_drv_beacon.c    |   24 +-
 drivers/net/wireless/ath/ath9k/htc_drv_gpio.c      |  342 +-
 drivers/net/wireless/ath/ath9k/htc_drv_init.c      |  114 +-
 drivers/net/wireless/ath/ath9k/htc_drv_main.c      |  652 +-
 drivers/net/wireless/ath/ath9k/htc_drv_txrx.c      |   44 +-
 drivers/net/wireless/ath/ath9k/htc_hst.c           |    5 +-
 drivers/net/wireless/ath/ath9k/htc_hst.h           |   22 +-
 drivers/net/wireless/ath/ath9k/hw-ops.h            |    5 -
 drivers/net/wireless/ath/ath9k/hw.c                |  298 +-
 drivers/net/wireless/ath/ath9k/hw.h                |   81 +-
 drivers/net/wireless/ath/ath9k/init.c              |  169 +-
 drivers/net/wireless/ath/ath9k/mac.c               |  210 +-
 drivers/net/wireless/ath/ath9k/mac.h               |   14 +-
 drivers/net/wireless/ath/ath9k/main.c              |  597 +-
 drivers/net/wireless/ath/ath9k/pci.c               |  110 +-
 drivers/net/wireless/ath/ath9k/phy.h               |    1 +
 drivers/net/wireless/ath/ath9k/rc.c                |   96 +-
 drivers/net/wireless/ath/ath9k/rc.h                |    9 -
 drivers/net/wireless/ath/ath9k/recv.c              |  111 +-
 drivers/net/wireless/ath/ath9k/reg.h               |   30 +-
 drivers/net/wireless/ath/ath9k/virtual.c           |   16 +-
 drivers/net/wireless/ath/ath9k/wmi.c               |   32 +-
 drivers/net/wireless/ath/ath9k/wmi.h               |    3 +-
 drivers/net/wireless/ath/ath9k/xmit.c              |  836 +-
 drivers/net/wireless/ath/carl9170/carl9170.h       |    5 +-
 drivers/net/wireless/ath/carl9170/cmd.c            |    2 +-
 drivers/net/wireless/ath/carl9170/fwcmd.h          |   13 +-
 drivers/net/wireless/ath/carl9170/hw.h             |    7 +-
 drivers/net/wireless/ath/carl9170/mac.c            |   56 +-
 drivers/net/wireless/ath/carl9170/main.c           |   19 +-
 drivers/net/wireless/ath/carl9170/phy.c            |   27 +-
 drivers/net/wireless/ath/carl9170/phy.h            |   24 +-
 drivers/net/wireless/ath/carl9170/tx.c             |   80 +-
 drivers/net/wireless/ath/carl9170/usb.c            |   58 +-
 drivers/net/wireless/ath/carl9170/version.h        |    6 +-
 drivers/net/wireless/ath/debug.c                   |   15 -
 drivers/net/wireless/ath/debug.h                   |   90 -
 drivers/net/wireless/ath/key.c                     |   39 +-
 drivers/net/wireless/ath/main.c                    |   20 +
 drivers/net/wireless/ath/regd.c                    |    8 +
 drivers/net/wireless/atmel.c                       |    6 +-
 drivers/net/wireless/b43/Kconfig                   |   13 +-
 drivers/net/wireless/b43/Makefile                  |    8 +-
 drivers/net/wireless/b43/b43.h                     |   21 +-
 drivers/net/wireless/b43/dma.c                     |    5 -
 drivers/net/wireless/b43/main.c                    |   68 +-
 drivers/net/wireless/b43/phy_common.c              |   22 +-
 drivers/net/wireless/b43/phy_common.h              |    8 +
 drivers/net/wireless/b43/phy_n.c                   |  594 +-
 drivers/net/wireless/b43/phy_n.h                   |    2 +-
 drivers/net/wireless/b43/radio_2055.c              |  502 +-
 drivers/net/wireless/b43/radio_2056.c              | 9062 ++++++++++++-
 drivers/net/wireless/b43/radio_2056.h              | 1084 ++-
 drivers/net/wireless/b43/rfkill.c                  |   19 +-
 drivers/net/wireless/b43/tables_nphy.c             |  228 +-
 drivers/net/wireless/b43legacy/main.c              |   47 +-
 drivers/net/wireless/b43legacy/rfkill.c            |    2 +-
 drivers/net/wireless/hostap/hostap_ap.c            |    3 +
 drivers/net/wireless/hostap/hostap_hw.c            |    8 +-
 drivers/net/wireless/iwlwifi/Kconfig               |    3 +
 drivers/net/wireless/iwlwifi/Makefile              |   11 +-
 drivers/net/wireless/iwlwifi/iwl-1000.c            |   99 +-
 drivers/net/wireless/iwlwifi/iwl-3945.c            |   35 +-
 drivers/net/wireless/iwlwifi/iwl-3945.h            |    8 +-
 drivers/net/wireless/iwlwifi/iwl-4965.c            |  369 +-
 drivers/net/wireless/iwlwifi/iwl-5000.c            |  140 +-
 drivers/net/wireless/iwlwifi/iwl-6000.c            |  477 +-
 drivers/net/wireless/iwlwifi/iwl-agn-calib.c       |  230 +-
 drivers/net/wireless/iwlwifi/iwl-agn-debugfs.c     |    3 +
 drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c      |  345 +-
 drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c        |    5 +-
 drivers/net/wireless/iwlwifi/iwl-agn-lib.c         |  130 +-
 drivers/net/wireless/iwlwifi/iwl-agn-rs.c          |   38 +-
 drivers/net/wireless/iwlwifi/iwl-agn-rxon.c        |  642 +
 drivers/net/wireless/iwlwifi/iwl-agn-sta.c         |   32 +-
 drivers/net/wireless/iwlwifi/iwl-agn-tx.c          |  160 +-
 drivers/net/wireless/iwlwifi/iwl-agn-ucode.c       |   69 +-
 drivers/net/wireless/iwlwifi/iwl-agn.c             |  614 +-
 drivers/net/wireless/iwlwifi/iwl-agn.h             |   61 +-
 drivers/net/wireless/iwlwifi/iwl-commands.h        |   26 +-
 drivers/net/wireless/iwlwifi/iwl-core.c            |  971 +-
 drivers/net/wireless/iwlwifi/iwl-core.h            |   97 +-
 drivers/net/wireless/iwlwifi/iwl-csr.h             |    2 +
 drivers/net/wireless/iwlwifi/iwl-debug.h           |    2 +
 drivers/net/wireless/iwlwifi/iwl-debugfs.c         |   40 +-
 drivers/net/wireless/iwlwifi/iwl-dev.h             |   23 +-
 drivers/net/wireless/iwlwifi/iwl-eeprom.c          |   25 +-
 drivers/net/wireless/iwlwifi/iwl-eeprom.h          |   66 +-
 drivers/net/wireless/iwlwifi/iwl-helpers.h         |   51 +-
 drivers/net/wireless/iwlwifi/iwl-led.c             |   12 +-
 drivers/net/wireless/iwlwifi/iwl-led.h             |    6 +-
 drivers/net/wireless/iwlwifi/iwl-legacy.c          |  662 +
 drivers/net/wireless/iwlwifi/iwl-legacy.h          |   79 +
 drivers/net/wireless/iwlwifi/iwl-power.c           |  190 +-
 drivers/net/wireless/iwlwifi/iwl-power.h           |    3 +
 drivers/net/wireless/iwlwifi/iwl-prph.h            |    2 +-
 drivers/net/wireless/iwlwifi/iwl-rx.c              |   47 +-
 drivers/net/wireless/iwlwifi/iwl-scan.c            |   14 +-
 drivers/net/wireless/iwlwifi/iwl-sta.c             |   64 +-
 drivers/net/wireless/iwlwifi/iwl-sta.h             |    1 +
 drivers/net/wireless/iwlwifi/iwl-tx.c              |   64 +-
 drivers/net/wireless/iwlwifi/iwl3945-base.c        |   88 +-
 drivers/net/wireless/iwmc3200wifi/cfg80211.c       |    3 +-
 drivers/net/wireless/iwmc3200wifi/commands.c       |    2 +-
 drivers/net/wireless/libertas/cfg.c                |    7 +-
 drivers/net/wireless/libertas/cmd.c                |    8 +
 drivers/net/wireless/libertas/dev.h                |    1 +
 drivers/net/wireless/libertas/if_spi.c             |    2 +-
 drivers/net/wireless/libertas/if_usb.c             |   13 +-
 drivers/net/wireless/libertas/main.c               |    3 +-
 drivers/net/wireless/libertas/rx.c                 |    4 +-
 drivers/net/wireless/mac80211_hwsim.c              |    5 +-
 drivers/net/wireless/mwl8k.c                       |  670 +-
 drivers/net/wireless/orinoco/wext.c                |    8 +
 drivers/net/wireless/p54/p54usb.c                  |    2 +-
 drivers/net/wireless/ray_cs.c                      |   18 +-
 drivers/net/wireless/rndis_wlan.c                  |  402 +-
 drivers/net/wireless/rt2x00/Kconfig                |   72 +-
 drivers/net/wireless/rt2x00/rt2400pci.c            |  144 +-
 drivers/net/wireless/rt2x00/rt2400pci.h            |    6 +-
 drivers/net/wireless/rt2x00/rt2500pci.c            |  150 +-
 drivers/net/wireless/rt2x00/rt2500pci.h            |    4 +-
 drivers/net/wireless/rt2x00/rt2500usb.c            |   98 +-
 drivers/net/wireless/rt2x00/rt2800.h               |  218 +-
 drivers/net/wireless/rt2x00/rt2800lib.c            |  223 +-
 drivers/net/wireless/rt2x00/rt2800lib.h            |    2 +
 drivers/net/wireless/rt2x00/rt2800pci.c            |  214 +-
 drivers/net/wireless/rt2x00/rt2800pci.h            |   12 +-
 drivers/net/wireless/rt2x00/rt2800usb.c            |  363 +-
 drivers/net/wireless/rt2x00/rt2800usb.h            |    4 +-
 drivers/net/wireless/rt2x00/rt2x00.h               |  113 +-
 drivers/net/wireless/rt2x00/rt2x00config.c         |   14 +-
 drivers/net/wireless/rt2x00/rt2x00debug.c          |   15 +-
 drivers/net/wireless/rt2x00/rt2x00dev.c            |   95 +-
 drivers/net/wireless/rt2x00/rt2x00ht.c             |    2 -
 drivers/net/wireless/rt2x00/rt2x00lib.h            |   12 +-
 drivers/net/wireless/rt2x00/rt2x00link.c           |    2 +-
 drivers/net/wireless/rt2x00/rt2x00mac.c            |   61 +-
 drivers/net/wireless/rt2x00/rt2x00pci.c            |   11 +-
 drivers/net/wireless/rt2x00/rt2x00pci.h            |    2 +-
 drivers/net/wireless/rt2x00/rt2x00queue.c          |  270 +-
 drivers/net/wireless/rt2x00/rt2x00queue.h          |   74 +-
 drivers/net/wireless/rt2x00/rt2x00reg.h            |    4 -
 drivers/net/wireless/rt2x00/rt2x00soc.c            |    6 +-
 drivers/net/wireless/rt2x00/rt2x00usb.c            |  305 +-
 drivers/net/wireless/rt2x00/rt2x00usb.h            |   12 +-
 drivers/net/wireless/rt2x00/rt61pci.c              |  185 +-
 drivers/net/wireless/rt2x00/rt61pci.h              |   64 +-
 drivers/net/wireless/rt2x00/rt73usb.c              |  107 +-
 drivers/net/wireless/rt2x00/rt73usb.h              |   38 +-
 drivers/net/wireless/rtl818x/Makefile              |    9 +-
 drivers/net/wireless/rtl818x/rtl8180/Makefile      |    5 +
 .../rtl818x/{rtl8180_dev.c => rtl8180/dev.c}       |    8 +-
 .../{rtl8180_grf5101.c => rtl8180/grf5101.c}       |    2 +-
 .../{rtl8180_grf5101.h => rtl8180/grf5101.h}       |    0
 .../{rtl8180_max2820.c => rtl8180/max2820.c}       |    2 +-
 .../{rtl8180_max2820.h => rtl8180/max2820.h}       |    0
 .../net/wireless/rtl818x/{ => rtl8180}/rtl8180.h   |    0
 .../{rtl8180_rtl8225.c => rtl8180/rtl8225.c}       |    2 +-
 .../{rtl8180_rtl8225.h => rtl8180/rtl8225.h}       |    0
 .../rtl818x/{rtl8180_sa2400.c => rtl8180/sa2400.c} |    2 +-
 .../rtl818x/{rtl8180_sa2400.h => rtl8180/sa2400.h} |    0
 drivers/net/wireless/rtl818x/rtl8187/Makefile      |    5 +
 .../rtl818x/{rtl8187_dev.c => rtl8187/dev.c}       |  146 +-
 .../rtl818x/{rtl8187_leds.c => rtl8187/leds.c}     |    2 +-
 .../rtl818x/{rtl8187_leds.h => rtl8187/leds.h}     |    0
 .../rtl818x/{rtl8187_rfkill.c => rtl8187/rfkill.c} |    2 +-
 .../rtl818x/{rtl8187_rfkill.h => rtl8187/rfkill.h} |    0
 .../net/wireless/rtl818x/{ => rtl8187}/rtl8187.h   |    2 +-
 .../{rtl8187_rtl8225.c => rtl8187/rtl8225.c}       |   24 +-
 .../{rtl8187_rtl8225.h => rtl8187/rtl8225.h}       |    0
 drivers/net/wireless/rtlwifi/Kconfig               |   15 +
 drivers/net/wireless/rtlwifi/Makefile              |   13 +
 drivers/net/wireless/rtlwifi/base.c                |  956 ++
 drivers/net/wireless/rtlwifi/base.h                |  120 +
 drivers/net/wireless/rtlwifi/cam.c                 |  291 +
 drivers/net/wireless/rtlwifi/cam.h                 |   53 +
 drivers/net/wireless/rtlwifi/core.c                | 1029 ++
 drivers/net/wireless/rtlwifi/core.h                |   42 +
 drivers/net/wireless/rtlwifi/debug.c               |   50 +
 drivers/net/wireless/rtlwifi/debug.h               |  212 +
 drivers/net/wireless/rtlwifi/efuse.c               | 1189 ++
 drivers/net/wireless/rtlwifi/efuse.h               |  124 +
 drivers/net/wireless/rtlwifi/pci.c                 | 1945 +++
 drivers/net/wireless/rtlwifi/pci.h                 |  302 +
 drivers/net/wireless/rtlwifi/ps.c                  |  493 +
 drivers/net/wireless/rtlwifi/ps.h                  |   43 +
 drivers/net/wireless/rtlwifi/rc.c                  |  329 +
 drivers/net/wireless/rtlwifi/rc.h                  |   40 +
 drivers/net/wireless/rtlwifi/regd.c                |  400 +
 drivers/net/wireless/rtlwifi/regd.h                |   61 +
 drivers/net/wireless/rtlwifi/rtl8192ce/Makefile    |   12 +
 drivers/net/wireless/rtlwifi/rtl8192ce/def.h       |  257 +
 drivers/net/wireless/rtlwifi/rtl8192ce/dm.c        | 1473 ++
 drivers/net/wireless/rtlwifi/rtl8192ce/dm.h        |  196 +
 drivers/net/wireless/rtlwifi/rtl8192ce/fw.c        |  804 +
 drivers/net/wireless/rtlwifi/rtl8192ce/fw.h        |   98 +
 drivers/net/wireless/rtlwifi/rtl8192ce/hw.c        | 2162 +++
 drivers/net/wireless/rtlwifi/rtl8192ce/hw.h        |   57 +
 drivers/net/wireless/rtlwifi/rtl8192ce/led.c       |  144 +
 drivers/net/wireless/rtlwifi/rtl8192ce/led.h       |   41 +
 drivers/net/wireless/rtlwifi/rtl8192ce/phy.c       | 2676 ++++
 drivers/net/wireless/rtlwifi/rtl8192ce/phy.h       |  237 +
 drivers/net/wireless/rtlwifi/rtl8192ce/reg.h       | 2065 +++
 drivers/net/wireless/rtlwifi/rtl8192ce/rf.c        |  523 +
 drivers/net/wireless/rtlwifi/rtl8192ce/rf.h        |   44 +
 drivers/net/wireless/rtlwifi/rtl8192ce/sw.c        |  282 +
 drivers/net/wireless/rtlwifi/rtl8192ce/sw.h        |   37 +
 drivers/net/wireless/rtlwifi/rtl8192ce/table.c     | 1224 ++
 drivers/net/wireless/rtlwifi/rtl8192ce/table.h     |   58 +
 drivers/net/wireless/rtlwifi/rtl8192ce/trx.c       | 1031 ++
 drivers/net/wireless/rtlwifi/rtl8192ce/trx.h       |  714 +
 drivers/net/wireless/rtlwifi/wifi.h                | 1532 ++
 drivers/net/wireless/wl1251/boot.c                 |    1 -
 drivers/net/wireless/wl1251/main.c                 |   15 +-
 drivers/net/wireless/wl1251/sdio.c                 |  103 +-
 drivers/net/wireless/wl1251/spi.c                  |    9 +
 drivers/net/wireless/wl1251/wl1251.h               |    1 +
 drivers/net/wireless/wl12xx/Kconfig                |   64 +-
 drivers/net/wireless/wl12xx/Makefile               |   22 +-
 .../net/wireless/wl12xx/{wl1271_acx.c => acx.c}    |   99 +-
 .../net/wireless/wl12xx/{wl1271_acx.h => acx.h}    |  108 +-
 .../net/wireless/wl12xx/{wl1271_boot.c => boot.c}  |   38 +-
 .../net/wireless/wl12xx/{wl1271_boot.h => boot.h}  |    3 +-
 .../net/wireless/wl12xx/{wl1271_cmd.c => cmd.c}    |   81 +-
 .../net/wireless/wl12xx/{wl1271_cmd.h => cmd.h}    |   58 +-
 .../net/wireless/wl12xx/{wl1271_conf.h => conf.h}  |    4 +-
 drivers/net/wireless/wl12xx/debugfs.c              |  480 +
 .../wl12xx/{wl1271_debugfs.h => debugfs.h}         |    6 +-
 .../wireless/wl12xx/{wl1271_event.c => event.c}    |   14 +-
 .../wireless/wl12xx/{wl1271_event.h => event.h}    |    4 +-
 .../net/wireless/wl12xx/{wl1271_ini.h => ini.h}    |    4 +-
 .../net/wireless/wl12xx/{wl1271_init.c => init.c}  |   23 +-
 .../net/wireless/wl12xx/{wl1271_init.h => init.h}  |    6 +-
 drivers/net/wireless/wl12xx/{wl1271_io.c => io.c}  |    5 +-
 drivers/net/wireless/wl12xx/{wl1271_io.h => io.h}  |    6 +-
 .../net/wireless/wl12xx/{wl1271_main.c => main.c}  |  494 +-
 drivers/net/wireless/wl12xx/{wl1271_ps.c => ps.c}  |    6 +-
 drivers/net/wireless/wl12xx/{wl1271_ps.h => ps.h}  |    8 +-
 .../net/wireless/wl12xx/{wl1271_reg.h => reg.h}    |    0
 drivers/net/wireless/wl12xx/{wl1271_rx.c => rx.c}  |   38 +-
 drivers/net/wireless/wl12xx/{wl1271_rx.h => rx.h}  |    6 +-
 .../net/wireless/wl12xx/{wl1271_scan.c => scan.c}  |   17 +-
 .../net/wireless/wl12xx/{wl1271_scan.h => scan.h}  |    6 +-
 .../net/wireless/wl12xx/{wl1271_sdio.c => sdio.c}  |    4 +-
 drivers/net/wireless/wl12xx/sdio_test.c            |  520 +
 .../net/wireless/wl12xx/{wl1271_spi.c => spi.c}    |    6 +-
 .../wl12xx/{wl1271_testmode.c => testmode.c}       |   18 +-
 .../wl12xx/{wl1271_testmode.h => testmode.h}       |    4 +-
 drivers/net/wireless/wl12xx/{wl1271_tx.c => tx.c}  |  196 +-
 drivers/net/wireless/wl12xx/{wl1271_tx.h => tx.h}  |    7 +-
 drivers/net/wireless/wl12xx/wl1271_debugfs.c       |  583 -
 drivers/net/wireless/wl12xx/{wl1271.h => wl12xx.h} |  150 +-
 drivers/net/wireless/wl12xx/wl12xx_80211.h         |   17 +-
 drivers/net/wireless/zd1201.c                      |    3 +-
 drivers/net/wireless/zd1211rw/zd_chip.c            |    5 +-
 drivers/net/wireless/zd1211rw/zd_usb.c             |    2 +
 drivers/net/xilinx_emaclite.c                      |   36 +-
 drivers/net/znet.c                                 |    2 +-
 drivers/s390/net/lcs.c                             |   10 +-
 drivers/s390/net/qeth_core_main.c                  |    2 +-
 drivers/s390/net/qeth_core_mpc.h                   |    2 +-
 drivers/s390/net/qeth_core_sys.c                   |    2 +-
 drivers/s390/net/qeth_l2_main.c                    |   11 +-
 drivers/s390/net/qeth_l3_main.c                    |  245 +-
 drivers/scsi/bnx2i/bnx2i_hwi.c                     |   14 +-
 drivers/scsi/cxgbi/libcxgbi.c                      |    2 +-
 drivers/ssb/main.c                                 |   30 +
 drivers/ssb/pci.c                                  |   96 +-
 drivers/ssb/pcihost_wrapper.c                      |    7 +
 drivers/ssb/scan.c                                 |    4 +-
 drivers/vhost/net.c                                |    9 +-
 drivers/vhost/test.c                               |  320 +
 drivers/vhost/test.h                               |    7 +
 drivers/vhost/vhost.c                              |   43 +-
 drivers/vhost/vhost.h                              |    2 +-
 firmware/Makefile                                  |   10 +-
 firmware/WHENCE                                    |    4 +-
 ...6-6.0.15.fw.ihex => bnx2-mips-06-6.2.1.fw.ihex} | 5429 ++++----
 ...9-6.0.17.fw.ihex => bnx2-mips-09-6.2.1.fw.ihex} | 5412 ++++----
 firmware/bnx2x/bnx2x-e1-6.0.34.0.fw.ihex           | 9476 ------------
 firmware/bnx2x/bnx2x-e1-6.2.5.0.fw.ihex            | 9483 ++++++++++++
 firmware/bnx2x/bnx2x-e1h-6.0.34.0.fw.ihex          |13178 -----------------
 firmware/bnx2x/bnx2x-e1h-6.2.5.0.fw.ihex           |13181 +++++++++++++++++
 firmware/bnx2x/bnx2x-e2-6.0.34.0.fw.ihex           |15442 -------------------
 firmware/bnx2x/bnx2x-e2-6.2.5.0.fw.ihex            |15456 ++++++++++++++++++++
 include/linux/average.h                            |   30 +
 include/linux/bitops.h                             |   11 +
 include/linux/dcbnl.h                              |  184 +
 include/linux/dccp.h                               |   23 +
 include/linux/ethtool.h                            |    4 +-
 include/linux/filter.h                             |   56 +-
 include/linux/ieee80211.h                          |   30 +-
 include/linux/if_bridge.h                          |    4 +-
 include/linux/if_ether.h                           |    1 +
 include/linux/if_link.h                            |   28 +
 include/linux/if_macvlan.h                         |   34 +-
 include/linux/igmp.h                               |   18 +-
 include/linux/inetdevice.h                         |   15 +-
 include/linux/ipv6.h                               |    2 +-
 include/linux/jhash.h                              |  183 +-
 include/linux/mdio.h                               |    5 +
 include/linux/netdevice.h                          |   89 +-
 include/linux/netfilter.h                          |    2 +
 include/linux/nl80211.h                            |  188 +-
 include/linux/rfkill.h                             |   31 -
 include/linux/security.h                           |   15 +-
 include/linux/skbuff.h                             |   13 +-
 include/linux/socket.h                             |    8 +-
 include/linux/ssb/ssb.h                            |    4 +
 include/linux/ssb/ssb_regs.h                       |   40 +
 include/linux/stmmac.h                             |    6 +-
 include/linux/tipc.h                               |   18 +-
 include/linux/tipc_config.h                        |   76 +-
 include/linux/usb/usbnet.h                         |    6 +
 include/linux/wl12xx.h                             |    8 +
 include/linux/xfrm.h                               |    1 +
 include/net/addrconf.h                             |    2 -
 include/net/bluetooth/bluetooth.h                  |    1 +
 include/net/bluetooth/hci.h                        |   20 +-
 include/net/bluetooth/hci_core.h                   |   23 +-
 include/net/bluetooth/l2cap.h                      |   22 +-
 include/net/bluetooth/mgmt.h                       |   87 +
 include/net/bluetooth/rfcomm.h                     |   18 +-
 include/net/bluetooth/sco.h                        |   20 +-
 include/net/caif/cfctrl.h                          |    2 +-
 include/net/cfg80211.h                             |  171 +-
 include/net/dcbevent.h                             |   31 +
 include/net/dcbnl.h                                |   28 +
 include/net/dn_dev.h                               |   27 +-
 include/net/dn_route.h                             |   10 +
 include/net/dst.h                                  |   68 +-
 include/net/dst_ops.h                              |    2 +
 include/net/flow.h                                 |    2 +
 include/net/if_inet6.h                             |    3 +-
 include/net/inet6_connection_sock.h                |    3 +
 include/net/inet_connection_sock.h                 |    3 +-
 include/net/inet_sock.h                            |    7 +-
 include/net/inet_timewait_sock.h                   |   20 +-
 include/net/inetpeer.h                             |   32 +-
 include/net/ip.h                                   |   10 -
 include/net/ip6_fib.h                              |    2 +
 include/net/ip6_route.h                            |   13 +-
 include/net/mac80211.h                             |  125 +-
 include/net/ndisc.h                                |    3 -
 include/net/neighbour.h                            |   10 +-
 include/net/netfilter/nf_conntrack.h               |    2 +
 include/net/netlink.h                              |   21 +-
 include/net/netns/generic.h                        |    2 +-
 include/net/regulatory.h                           |    7 +
 include/net/route.h                                |   37 +-
 include/net/rtnetlink.h                            |   35 +
 include/net/sch_generic.h                          |    1 +
 include/net/scm.h                                  |    5 +-
 include/net/sctp/command.h                         |    3 -
 include/net/sctp/constants.h                       |   14 -
 include/net/sctp/structs.h                         |    2 -
 include/net/snmp.h                                 |    4 +-
 include/net/sock.h                                 |   97 +-
 include/net/tcp.h                                  |   22 +-
 include/net/timewait_sock.h                        |    8 +
 include/net/tipc/tipc.h                            |  186 -
 include/net/tipc/tipc_bearer.h                     |  138 -
 include/net/tipc/tipc_msg.h                        |  207 -
 include/net/tipc/tipc_port.h                       |  101 -
 include/net/x25.h                                  |    2 +
 include/net/xfrm.h                                 |    7 +
 lib/Kconfig                                        |    3 +
 lib/Makefile                                       |    2 +
 lib/average.c                                      |   61 +
 lib/nlattr.c                                       |   22 +-
 net/8021q/vlan.c                                   |   13 +-
 net/8021q/vlan.h                                   |   22 +-
 net/8021q/vlan_core.c                              |    4 +-
 net/8021q/vlan_dev.c                               |  197 +-
 net/8021q/vlan_netlink.c                           |   20 -
 net/8021q/vlanproc.c                               |    5 -
 net/9p/protocol.c                                  |   33 +-
 net/Kconfig                                        |    6 +
 net/Makefile                                       |    1 +
 net/atm/br2684.c                                   |    2 +-
 net/atm/clip.c                                     |    3 +-
 net/atm/lec.c                                      |    3 +-
 net/atm/mpc.c                                      |    2 -
 net/batman-adv/Kconfig                             |   25 +
 net/batman-adv/Makefile                            |   39 +
 net/batman-adv/aggregation.c                       |  273 +
 net/batman-adv/aggregation.h                       |   43 +
 net/batman-adv/bat_debugfs.c                       |  360 +
 net/batman-adv/bat_debugfs.h                       |   33 +
 net/batman-adv/bat_sysfs.c                         |  593 +
 net/batman-adv/bat_sysfs.h                         |   42 +
 net/batman-adv/bitarray.c                          |  201 +
 net/batman-adv/bitarray.h                          |   44 +
 net/batman-adv/gateway_client.c                    |  477 +
 net/batman-adv/gateway_client.h                    |   36 +
 net/batman-adv/gateway_common.c                    |  177 +
 net/batman-adv/gateway_common.h                    |   38 +
 net/batman-adv/hard-interface.c                    |  651 +
 net/batman-adv/hard-interface.h                    |   53 +
 net/batman-adv/hash.c                              |   62 +
 net/batman-adv/hash.h                              |  176 +
 net/batman-adv/icmp_socket.c                       |  356 +
 net/batman-adv/icmp_socket.h                       |   34 +
 net/batman-adv/main.c                              |  187 +
 net/batman-adv/main.h                              |  183 +
 net/batman-adv/originator.c                        |  564 +
 net/batman-adv/originator.h                        |   64 +
 net/batman-adv/packet.h                            |  136 +
 net/batman-adv/ring_buffer.c                       |   52 +
 net/batman-adv/ring_buffer.h                       |   28 +
 net/batman-adv/routing.c                           | 1397 ++
 net/batman-adv/routing.h                           |   48 +
 net/batman-adv/send.c                              |  585 +
 net/batman-adv/send.h                              |   41 +
 net/batman-adv/soft-interface.c                    |  697 +
 net/batman-adv/soft-interface.h                    |   35 +
 net/batman-adv/translation-table.c                 |  534 +
 net/batman-adv/translation-table.h                 |   45 +
 net/batman-adv/types.h                             |  271 +
 net/batman-adv/unicast.c                           |  343 +
 net/batman-adv/unicast.h                           |   35 +
 net/batman-adv/vis.c                               |  949 ++
 net/batman-adv/vis.h                               |   37 +
 net/bluetooth/Makefile                             |    2 +-
 net/bluetooth/bnep/core.c                          |    1 +
 net/bluetooth/cmtp/core.c                          |    1 +
 net/bluetooth/hci_conn.c                           |   23 +-
 net/bluetooth/hci_core.c                           |   83 +-
 net/bluetooth/hci_event.c                          |  210 +-
 net/bluetooth/hci_sock.c                           |   67 +-
 net/bluetooth/hidp/core.c                          |    2 +-
 net/bluetooth/l2cap.c                              |  102 +-
 net/bluetooth/mgmt.c                               |  308 +
 net/bluetooth/rfcomm/core.c                        |    8 +-
 net/bluetooth/rfcomm/sock.c                        |   24 +-
 net/bluetooth/rfcomm/tty.c                         |   28 +-
 net/bluetooth/sco.c                                |   22 +-
 net/bridge/br.c                                    |    4 -
 net/bridge/br_device.c                             |    2 +-
 net/bridge/br_fdb.c                                |   15 +-
 net/bridge/br_forward.c                            |   20 +-
 net/bridge/br_if.c                                 |    7 +-
 net/bridge/br_input.c                              |   10 +-
 net/bridge/br_multicast.c                          |   88 +-
 net/bridge/br_netfilter.c                          |   49 +-
 net/bridge/br_netlink.c                            |   10 +-
 net/bridge/br_notify.c                             |    6 +-
 net/bridge/br_private.h                            |   21 +-
 net/bridge/br_stp_bpdu.c                           |    8 +-
 net/bridge/br_stp_if.c                             |    2 +-
 net/bridge/netfilter/ebtable_broute.c              |    3 +-
 net/bridge/netfilter/ebtables.c                    |   13 +-
 net/caif/Makefile                                  |    8 +-
 net/can/Makefile                                   |    6 +-
 net/ceph/Makefile                                  |    2 +-
 net/core/datagram.c                                |    2 +-
 net/core/dev.c                                     |  383 +-
 net/core/ethtool.c                                 |   21 +-
 net/core/filter.c                                  |  514 +-
 net/core/neighbour.c                               |    1 -
 net/core/net-sysfs.c                               |  430 +-
 net/core/net-sysfs.h                               |    4 +-
 net/core/netpoll.c                                 |    4 +-
 net/core/pktgen.c                                  |   44 +-
 net/core/request_sock.c                            |    1 +
 net/core/rtnetlink.c                               |  166 +-
 net/core/scm.c                                     |   10 +-
 net/core/skbuff.c                                  |   36 +-
 net/core/sock.c                                    |   13 +-
 net/core/timestamping.c                            |    4 +-
 net/dcb/Makefile                                   |    2 +-
 net/dcb/dcbevent.c                                 |   40 +
 net/dcb/dcbnl.c                                    |  435 +-
 net/dccp/Makefile                                  |    4 +-
 net/dccp/ackvec.c                                  |  616 +-
 net/dccp/ackvec.h                                  |  151 +-
 net/dccp/ccids/ccid2.c                             |  143 +-
 net/dccp/ccids/ccid2.h                             |    2 +
 net/dccp/dccp.h                                    |   32 +-
 net/dccp/input.c                                   |   33 +-
 net/dccp/ipv4.c                                    |   13 +-
 net/dccp/options.c                                 |  100 +-
 net/dccp/output.c                                  |   22 +-
 net/dccp/proto.c                                   |   71 +-
 net/dccp/qpolicy.c                                 |  137 +
 net/decnet/af_decnet.c                             |    6 +-
 net/decnet/dn_dev.c                                |  100 +-
 net/decnet/dn_fib.c                                |    6 +-
 net/decnet/dn_neigh.c                              |    2 +-
 net/decnet/dn_route.c                              |  137 +-
 net/decnet/dn_rules.c                              |    2 +-
 net/dns_resolver/Makefile                          |    2 +-
 net/econet/Makefile                                |    2 +-
 net/ieee802154/af_ieee802154.c                     |    6 +-
 net/ipv4/af_inet.c                                 |   18 +-
 net/ipv4/arp.c                                     |   31 +-
 net/ipv4/devinet.c                                 |   97 +-
 net/ipv4/esp4.c                                    |   32 +-
 net/ipv4/fib_frontend.c                            |   34 +-
 net/ipv4/fib_semantics.c                           |    8 +-
 net/ipv4/icmp.c                                    |   32 +-
 net/ipv4/igmp.c                                    |  282 +-
 net/ipv4/inet_connection_sock.c                    |   22 +-
 net/ipv4/inetpeer.c                                |  167 +-
 net/ipv4/ip_fragment.c                             |   36 +-
 net/ipv4/ip_gre.c                                  |   52 +-
 net/ipv4/ip_output.c                               |   28 +-
 net/ipv4/ipconfig.c                                |   32 +-
 net/ipv4/ipip.c                                    |   21 +-
 net/ipv4/ipmr.c                                    |   20 +-
 net/ipv4/netfilter.c                               |    8 +-
 net/ipv4/netfilter/Makefile                        |    6 +-
 net/ipv4/netfilter/ipt_REJECT.c                    |    2 +-
 .../netfilter/nf_conntrack_l3proto_ipv4_compat.c   |    2 +-
 net/ipv4/raw.c                                     |    7 +-
 net/ipv4/route.c                                   |  252 +-
 net/ipv4/syncookies.c                              |   15 +-
 net/ipv4/sysctl_net_ipv4.c                         |    7 +-
 net/ipv4/tcp.c                                     |   16 +-
 net/ipv4/tcp_input.c                               |   51 +-
 net/ipv4/tcp_ipv4.c                                |   74 +-
 net/ipv4/tcp_minisocks.c                           |   63 +-
 net/ipv4/tcp_output.c                              |   37 +-
 net/ipv4/tcp_probe.c                               |    4 +-
 net/ipv4/udp.c                                     |   18 +-
 net/ipv4/xfrm4_mode_tunnel.c                       |    2 +-
 net/ipv4/xfrm4_policy.c                            |   47 +-
 net/ipv6/addrconf.c                                |  115 +-
 net/ipv6/af_inet6.c                                |    2 +-
 net/ipv6/esp6.c                                    |   32 +-
 net/ipv6/inet6_connection_sock.c                   |   54 +-
 net/ipv6/ip6_tunnel.c                              |    2 -
 net/ipv6/ip6mr.c                                   |    4 +-
 net/ipv6/mcast.c                                   |   77 +-
 net/ipv6/ndisc.c                                   |   29 +-
 net/ipv6/netfilter.c                               |    6 +-
 net/ipv6/netfilter/Makefile                        |    4 +-
 net/ipv6/netfilter/ip6t_REJECT.c                   |    2 +-
 net/ipv6/reassembly.c                              |   36 +-
 net/ipv6/route.c                                   |  156 +-
 net/ipv6/sit.c                                     |   14 +-
 net/ipv6/tcp_ipv6.c                                |  151 +-
 net/ipv6/udp.c                                     |   10 +-
 net/ipv6/xfrm6_mode_tunnel.c                       |    3 +-
 net/irda/ircomm/Makefile                           |    4 +-
 net/irda/irlan/Makefile                            |    2 +-
 net/irda/irnet/Makefile                            |    2 +-
 net/l2tp/l2tp_ip.c                                 |   12 +-
 net/lapb/Makefile                                  |    2 +-
 net/llc/af_llc.c                                   |    6 +-
 net/mac80211/Kconfig                               |    1 +
 net/mac80211/aes_ccm.c                             |    3 +-
 net/mac80211/aes_cmac.c                            |    3 +-
 net/mac80211/agg-rx.c                              |    8 +-
 net/mac80211/agg-tx.c                              |    7 +-
 net/mac80211/cfg.c                                 |  373 +-
 net/mac80211/debugfs.c                             |   60 +-
 net/mac80211/debugfs.h                             |    2 +
 net/mac80211/debugfs_key.c                         |   56 +-
 net/mac80211/debugfs_key.h                         |    8 +-
 net/mac80211/debugfs_netdev.c                      |    2 +
 net/mac80211/debugfs_sta.c                         |   57 +-
 net/mac80211/driver-ops.h                          |   69 +-
 net/mac80211/driver-trace.h                        |  151 +
 net/mac80211/ibss.c                                |    2 +
 net/mac80211/ieee80211_i.h                         |   75 +-
 net/mac80211/iface.c                               |   52 +-
 net/mac80211/key.c                                 |   98 +-
 net/mac80211/key.h                                 |    3 +-
 net/mac80211/led.c                                 |  186 +-
 net/mac80211/led.h                                 |   45 +-
 net/mac80211/main.c                                |   28 +-
 net/mac80211/mesh.c                                |   88 +-
 net/mac80211/mesh.h                                |   45 +-
 net/mac80211/mesh_hwmp.c                           |    9 +-
 net/mac80211/mesh_pathtbl.c                        |    7 +-
 net/mac80211/mesh_plink.c                          |    3 +-
 net/mac80211/mlme.c                                |  227 +-
 net/mac80211/offchannel.c                          |   85 +
 net/mac80211/rate.c                                |   18 +-
 net/mac80211/rc80211_minstrel_ht.c                 |   21 +-
 net/mac80211/rx.c                                  |  190 +-
 net/mac80211/sta_info.c                            |   19 +-
 net/mac80211/sta_info.h                            |   37 +-
 net/mac80211/status.c                              |   51 +-
 net/mac80211/tx.c                                  |   62 +-
 net/mac80211/util.c                                |   43 +-
 net/mac80211/wme.c                                 |   31 +-
 net/mac80211/work.c                                |   27 +-
 net/netfilter/core.c                               |    6 +-
 net/netfilter/ipvs/ip_vs_ctl.c                     |    6 +-
 net/netfilter/ipvs/ip_vs_xmit.c                    |   42 +-
 net/netfilter/nf_conntrack_core.c                  |   30 +-
 net/netfilter/nf_conntrack_expect.c                |   10 +-
 net/netfilter/nf_conntrack_netlink.c               |   25 +-
 net/netfilter/nf_conntrack_standalone.c            |    2 +-
 net/netfilter/xt_TEE.c                             |   12 +-
 net/netlabel/netlabel_cipso_v4.h                   |    1 -
 net/netlabel/netlabel_mgmt.h                       |    1 -
 net/netlabel/netlabel_unlabeled.h                  |    1 -
 net/packet/af_packet.c                             |  156 +-
 net/phonet/Makefile                                |    4 +-
 net/rds/Makefile                                   |    8 +-
 net/rfkill/core.c                                  |   14 -
 net/rxrpc/Makefile                                 |    4 +-
 net/rxrpc/ar-peer.c                                |   10 +-
 net/sched/sch_fifo.c                               |    2 -
 net/sched/sch_generic.c                            |   41 +-
 net/sched/sch_red.c                                |    1 +
 net/sched/sch_sfq.c                                |  283 +-
 net/sched/sch_teql.c                               |    3 +-
 net/sctp/socket.c                                  |    2 +-
 net/socket.c                                       |   11 +-
 net/sunrpc/auth_gss/Makefile                       |    4 +-
 net/tipc/Kconfig                                   |   35 +-
 net/tipc/Makefile                                  |    4 +-
 net/tipc/addr.c                                    |   10 -
 net/tipc/addr.h                                    |   25 -
 net/tipc/bcast.c                                   |   50 +-
 net/tipc/bcast.h                                   |    1 +
 net/tipc/bearer.c                                  |   22 +-
 net/tipc/bearer.h                                  |   71 +-
 net/tipc/cluster.c                                 |  557 -
 net/tipc/cluster.h                                 |   92 -
 net/tipc/config.c                                  |  118 +-
 net/tipc/config.h                                  |    1 -
 net/tipc/core.c                                    |  101 +-
 net/tipc/core.h                                    |   76 +-
 net/tipc/discover.c                                |   14 +-
 net/tipc/discover.h                                |    2 -
 net/tipc/eth_media.c                               |   15 +-
 net/tipc/handler.c                                 |    2 +-
 net/tipc/link.c                                    |  383 +-
 net/tipc/link.h                                    |   10 +-
 net/tipc/{dbg.c => log.c}                          |  111 +-
 net/tipc/{dbg.h => log.h}                          |    6 +-
 net/tipc/msg.c                                     |   75 +-
 net/tipc/msg.h                                     |  185 +-
 net/tipc/name_distr.c                              |   47 +-
 net/tipc/name_table.c                              |   60 +-
 net/tipc/name_table.h                              |    2 +-
 net/tipc/net.c                                     |   72 +-
 net/tipc/net.h                                     |   14 +-
 net/tipc/node.c                                    |  301 +-
 net/tipc/node.h                                    |   27 +-
 net/tipc/node_subscr.c                             |    2 -
 net/tipc/port.c                                    |  170 +-
 net/tipc/port.h                                    |  137 +-
 net/tipc/ref.c                                     |    8 +-
 net/tipc/socket.c                                  |  155 +-
 net/tipc/subscr.c                                  |   38 +-
 net/tipc/user_reg.c                                |  264 -
 net/tipc/user_reg.h                                |   48 -
 net/tipc/zone.c                                    |  162 -
 net/tipc/zone.h                                    |   70 -
 net/unix/af_unix.c                                 |   36 +-
 net/wanrouter/Makefile                             |    2 +-
 net/wireless/Makefile                              |    2 +-
 net/wireless/core.c                                |   33 +-
 net/wireless/core.h                                |   18 +-
 net/wireless/lib80211.c                            |    8 +-
 net/wireless/lib80211_crypt_tkip.c                 |   16 +-
 net/wireless/mesh.c                                |  142 +
 net/wireless/mlme.c                                |   43 +-
 net/wireless/nl80211.c                             |  612 +-
 net/wireless/nl80211.h                             |   10 +
 net/wireless/reg.c                                 |  262 +-
 net/wireless/scan.c                                |   11 +
 net/wireless/util.c                                |   15 +-
 net/wireless/wext-compat.c                         |    8 +-
 net/wireless/wext-core.c                           |   10 +-
 net/x25/af_x25.c                                   |   95 +-
 net/x25/x25_link.c                                 |    8 +-
 net/xfrm/xfrm_policy.c                             |   20 +-
 net/xfrm/xfrm_user.c                               |   19 +-
 security/capability.c                              |    2 +-
 security/security.c                                |    3 +-
 security/selinux/hooks.c                           |   22 +-
 security/smack/smack_lsm.c                         |   14 +-
 tools/virtio/Makefile                              |   12 +
 tools/virtio/linux/device.h                        |    2 +
 tools/virtio/linux/slab.h                          |    2 +
 tools/virtio/linux/virtio.h                        |  223 +
 tools/virtio/vhost_test/Makefile                   |    2 +
 tools/virtio/vhost_test/vhost_test.c               |    1 +
 tools/virtio/virtio_test.c                         |  248 +
 1108 files changed, 147630 insertions(+), 78395 deletions(-)
 create mode 100644 Documentation/ABI/testing/sysfs-class-net-batman-adv
 create mode 100644 Documentation/ABI/testing/sysfs-class-net-mesh
 create mode 100644 Documentation/networking/LICENSE.qlcnic
 create mode 100644 Documentation/networking/batman-adv.txt
 create mode 100644 drivers/net/bnx2x/bnx2x_dcb.c
 create mode 100644 drivers/net/bnx2x/bnx2x_dcb.h
 create mode 100644 drivers/net/bonding/bond_debugfs.c
 create mode 100644 drivers/net/can/slcan.c
 create mode 100644 drivers/net/ixgbe/ixgbe_x540.c
 create mode 100644 drivers/net/usb/cdc_ncm.c
 create mode 100644 drivers/net/wireless/ath/ath5k/ahb.c
 create mode 100644 drivers/net/wireless/ath/ath5k/mac80211-ops.c
 create mode 100644 drivers/net/wireless/ath/ath5k/pci.c
 create mode 100644 drivers/net/wireless/ath/ath9k/ar9485_initvals.h
 delete mode 100644 drivers/net/wireless/ath/debug.h
 create mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
 create mode 100644 drivers/net/wireless/iwlwifi/iwl-legacy.c
 create mode 100644 drivers/net/wireless/iwlwifi/iwl-legacy.h
 create mode 100644 drivers/net/wireless/rtl818x/rtl8180/Makefile
 rename drivers/net/wireless/rtl818x/{rtl8180_dev.c => rtl8180/dev.c} (99%)
 rename drivers/net/wireless/rtl818x/{rtl8180_grf5101.c => rtl8180/grf5101.c} (99%)
 rename drivers/net/wireless/rtl818x/{rtl8180_grf5101.h => rtl8180/grf5101.h} (100%)
 rename drivers/net/wireless/rtl818x/{rtl8180_max2820.c => rtl8180/max2820.c} (99%)
 rename drivers/net/wireless/rtl818x/{rtl8180_max2820.h => rtl8180/max2820.h} (100%)
 rename drivers/net/wireless/rtl818x/{ => rtl8180}/rtl8180.h (100%)
 rename drivers/net/wireless/rtl818x/{rtl8180_rtl8225.c => rtl8180/rtl8225.c} (99%)
 rename drivers/net/wireless/rtl818x/{rtl8180_rtl8225.h => rtl8180/rtl8225.h} (100%)
 rename drivers/net/wireless/rtl818x/{rtl8180_sa2400.c => rtl8180/sa2400.c} (99%)
 rename drivers/net/wireless/rtl818x/{rtl8180_sa2400.h => rtl8180/sa2400.h} (100%)
 create mode 100644 drivers/net/wireless/rtl818x/rtl8187/Makefile
 rename drivers/net/wireless/rtl818x/{rtl8187_dev.c => rtl8187/dev.c} (94%)
 rename drivers/net/wireless/rtl818x/{rtl8187_leds.c => rtl8187/leds.c} (99%)
 rename drivers/net/wireless/rtl818x/{rtl8187_leds.h => rtl8187/leds.h} (100%)
 rename drivers/net/wireless/rtl818x/{rtl8187_rfkill.c => rtl8187/rfkill.c} (98%)
 rename drivers/net/wireless/rtl818x/{rtl8187_rfkill.h => rtl8187/rfkill.h} (100%)
 rename drivers/net/wireless/rtl818x/{ => rtl8187}/rtl8187.h (99%)
 rename drivers/net/wireless/rtl818x/{rtl8187_rtl8225.c => rtl8187/rtl8225.c} (97%)
 rename drivers/net/wireless/rtl818x/{rtl8187_rtl8225.h => rtl8187/rtl8225.h} (100%)
 create mode 100644 drivers/net/wireless/rtlwifi/Kconfig
 create mode 100644 drivers/net/wireless/rtlwifi/Makefile
 create mode 100644 drivers/net/wireless/rtlwifi/base.c
 create mode 100644 drivers/net/wireless/rtlwifi/base.h
 create mode 100644 drivers/net/wireless/rtlwifi/cam.c
 create mode 100644 drivers/net/wireless/rtlwifi/cam.h
 create mode 100644 drivers/net/wireless/rtlwifi/core.c
 create mode 100644 drivers/net/wireless/rtlwifi/core.h
 create mode 100644 drivers/net/wireless/rtlwifi/debug.c
 create mode 100644 drivers/net/wireless/rtlwifi/debug.h
 create mode 100644 drivers/net/wireless/rtlwifi/efuse.c
 create mode 100644 drivers/net/wireless/rtlwifi/efuse.h
 create mode 100644 drivers/net/wireless/rtlwifi/pci.c
 create mode 100644 drivers/net/wireless/rtlwifi/pci.h
 create mode 100644 drivers/net/wireless/rtlwifi/ps.c
 create mode 100644 drivers/net/wireless/rtlwifi/ps.h
 create mode 100644 drivers/net/wireless/rtlwifi/rc.c
 create mode 100644 drivers/net/wireless/rtlwifi/rc.h
 create mode 100644 drivers/net/wireless/rtlwifi/regd.c
 create mode 100644 drivers/net/wireless/rtlwifi/regd.h
 create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ce/Makefile
 create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ce/def.h
 create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ce/dm.c
 create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ce/dm.h
 create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ce/fw.c
 create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ce/fw.h
 create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ce/hw.c
 create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ce/hw.h
 create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ce/led.c
 create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ce/led.h
 create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ce/phy.c
 create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ce/phy.h
 create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ce/reg.h
 create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ce/rf.c
 create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ce/rf.h
 create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ce/sw.c
 create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ce/sw.h
 create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ce/table.c
 create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ce/table.h
 create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ce/trx.c
 create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ce/trx.h
 create mode 100644 drivers/net/wireless/rtlwifi/wifi.h
 rename drivers/net/wireless/wl12xx/{wl1271_acx.c => acx.c} (91%)
 rename drivers/net/wireless/wl12xx/{wl1271_acx.h => acx.h} (89%)
 rename drivers/net/wireless/wl12xx/{wl1271_boot.c => boot.c} (96%)
 rename drivers/net/wireless/wl12xx/{wl1271_boot.h => boot.h} (96%)
 rename drivers/net/wireless/wl12xx/{wl1271_cmd.c => cmd.c} (90%)
 rename drivers/net/wireless/wl12xx/{wl1271_cmd.h => cmd.h} (91%)
 rename drivers/net/wireless/wl12xx/{wl1271_conf.h => conf.h} (99%)
 create mode 100644 drivers/net/wireless/wl12xx/debugfs.c
 rename drivers/net/wireless/wl12xx/{wl1271_debugfs.h => debugfs.h} (93%)
 rename drivers/net/wireless/wl12xx/{wl1271_event.c => event.c} (97%)
 rename drivers/net/wireless/wl12xx/{wl1271_event.h => event.h} (98%)
 rename drivers/net/wireless/wl12xx/{wl1271_ini.h => ini.h} (98%)
 rename drivers/net/wireless/wl12xx/{wl1271_init.c => init.c} (95%)
 rename drivers/net/wireless/wl12xx/{wl1271_init.h => init.h} (93%)
 rename drivers/net/wireless/wl12xx/{wl1271_io.c => io.c} (98%)
 rename drivers/net/wireless/wl12xx/{wl1271_io.h => io.h} (98%)
 rename drivers/net/wireless/wl12xx/{wl1271_main.c => main.c} (87%)
 rename drivers/net/wireless/wl12xx/{wl1271_ps.c => ps.c} (98%)
 rename drivers/net/wireless/wl12xx/{wl1271_ps.h => ps.h} (92%)
 rename drivers/net/wireless/wl12xx/{wl1271_reg.h => reg.h} (100%)
 rename drivers/net/wireless/wl12xx/{wl1271_rx.c => rx.c} (87%)
 rename drivers/net/wireless/wl12xx/{wl1271_rx.h => rx.h} (96%)
 rename drivers/net/wireless/wl12xx/{wl1271_scan.c => scan.c} (96%)
 rename drivers/net/wireless/wl12xx/{wl1271_scan.h => scan.h} (97%)
 rename drivers/net/wireless/wl12xx/{wl1271_sdio.c => sdio.c} (99%)
 create mode 100644 drivers/net/wireless/wl12xx/sdio_test.c
 rename drivers/net/wireless/wl12xx/{wl1271_spi.c => spi.c} (99%)
 rename drivers/net/wireless/wl12xx/{wl1271_testmode.c => testmode.c} (94%)
 rename drivers/net/wireless/wl12xx/{wl1271_testmode.h => testmode.h} (93%)
 rename drivers/net/wireless/wl12xx/{wl1271_tx.c => tx.c} (77%)
 rename drivers/net/wireless/wl12xx/{wl1271_tx.h => tx.h} (97%)
 delete mode 100644 drivers/net/wireless/wl12xx/wl1271_debugfs.c
 rename drivers/net/wireless/wl12xx/{wl1271.h => wl12xx.h} (71%)
 create mode 100644 drivers/vhost/test.c
 create mode 100644 drivers/vhost/test.h
 rename firmware/bnx2/{bnx2-mips-06-6.0.15.fw.ihex => bnx2-mips-06-6.2.1.fw.ihex} (54%)
 rename firmware/bnx2/{bnx2-mips-09-6.0.17.fw.ihex => bnx2-mips-09-6.2.1.fw.ihex} (59%)
 delete mode 100644 firmware/bnx2x/bnx2x-e1-6.0.34.0.fw.ihex
 create mode 100644 firmware/bnx2x/bnx2x-e1-6.2.5.0.fw.ihex
 delete mode 100644 firmware/bnx2x/bnx2x-e1h-6.0.34.0.fw.ihex
 create mode 100644 firmware/bnx2x/bnx2x-e1h-6.2.5.0.fw.ihex
 delete mode 100644 firmware/bnx2x/bnx2x-e2-6.0.34.0.fw.ihex
 create mode 100644 firmware/bnx2x/bnx2x-e2-6.2.5.0.fw.ihex
 create mode 100644 include/linux/average.h
 create mode 100644 include/net/bluetooth/mgmt.h
 create mode 100644 include/net/dcbevent.h
 delete mode 100644 include/net/tipc/tipc.h
 delete mode 100644 include/net/tipc/tipc_bearer.h
 delete mode 100644 include/net/tipc/tipc_msg.h
 delete mode 100644 include/net/tipc/tipc_port.h
 create mode 100644 lib/average.c
 create mode 100644 net/batman-adv/Kconfig
 create mode 100644 net/batman-adv/Makefile
 create mode 100644 net/batman-adv/aggregation.c
 create mode 100644 net/batman-adv/aggregation.h
 create mode 100644 net/batman-adv/bat_debugfs.c
 create mode 100644 net/batman-adv/bat_debugfs.h
 create mode 100644 net/batman-adv/bat_sysfs.c
 create mode 100644 net/batman-adv/bat_sysfs.h
 create mode 100644 net/batman-adv/bitarray.c
 create mode 100644 net/batman-adv/bitarray.h
 create mode 100644 net/batman-adv/gateway_client.c
 create mode 100644 net/batman-adv/gateway_client.h
 create mode 100644 net/batman-adv/gateway_common.c
 create mode 100644 net/batman-adv/gateway_common.h
 create mode 100644 net/batman-adv/hard-interface.c
 create mode 100644 net/batman-adv/hard-interface.h
 create mode 100644 net/batman-adv/hash.c
 create mode 100644 net/batman-adv/hash.h
 create mode 100644 net/batman-adv/icmp_socket.c
 create mode 100644 net/batman-adv/icmp_socket.h
 create mode 100644 net/batman-adv/main.c
 create mode 100644 net/batman-adv/main.h
 create mode 100644 net/batman-adv/originator.c
 create mode 100644 net/batman-adv/originator.h
 create mode 100644 net/batman-adv/packet.h
 create mode 100644 net/batman-adv/ring_buffer.c
 create mode 100644 net/batman-adv/ring_buffer.h
 create mode 100644 net/batman-adv/routing.c
 create mode 100644 net/batman-adv/routing.h
 create mode 100644 net/batman-adv/send.c
 create mode 100644 net/batman-adv/send.h
 create mode 100644 net/batman-adv/soft-interface.c
 create mode 100644 net/batman-adv/soft-interface.h
 create mode 100644 net/batman-adv/translation-table.c
 create mode 100644 net/batman-adv/translation-table.h
 create mode 100644 net/batman-adv/types.h
 create mode 100644 net/batman-adv/unicast.c
 create mode 100644 net/batman-adv/unicast.h
 create mode 100644 net/batman-adv/vis.c
 create mode 100644 net/batman-adv/vis.h
 create mode 100644 net/bluetooth/mgmt.c
 create mode 100644 net/dcb/dcbevent.c
 create mode 100644 net/dccp/qpolicy.c
 delete mode 100644 net/tipc/cluster.c
 delete mode 100644 net/tipc/cluster.h
 rename net/tipc/{dbg.c => log.c} (81%)
 rename net/tipc/{dbg.h => log.h} (96%)
 delete mode 100644 net/tipc/user_reg.c
 delete mode 100644 net/tipc/user_reg.h
 delete mode 100644 net/tipc/zone.c
 delete mode 100644 net/tipc/zone.h
 create mode 100644 net/wireless/mesh.c
 create mode 100644 tools/virtio/Makefile
 create mode 100644 tools/virtio/linux/device.h
 create mode 100644 tools/virtio/linux/slab.h
 create mode 100644 tools/virtio/linux/virtio.h
 create mode 100644 tools/virtio/vhost_test/Makefile
 create mode 100644 tools/virtio/vhost_test/vhost_test.c
 create mode 100644 tools/virtio/virtio_test.c

^ permalink raw reply	[flat|nested] 1437+ messages in thread
* [GIT] Networking
@ 2011-01-12  0:24 David Miller
  0 siblings, 0 replies; 1437+ messages in thread
From: David Miller @ 2011-01-12  0:24 UTC (permalink / raw)
  To: torvalds; +Cc: akpm, netdev, netfilter-devel, linux-wireless, linux-kernel


Mostly driver stuff (as usual), a TCP bind fix, some checksum
offloading cures, and random other small bits all over.

1) Fix signedness bugs in phonet, from Dan Carpenter.

2) Sequence number checking fixes in DCCP from Samuel Jero and
   Gerrit Renker.

3) Support both ports of FEC ethernet device properly, from
   Shawn Guo.

4) Memory leak fix in hamradio and ATM ambassador driver from Jesper
   Juhl.

5) MSI interrupt and statistic handling fixes in bnx2x from Vladislav
   Zolotarov and Eilon Greenstein.

6) Autonegotiation and VLAN fixes in sky2 from Stephen Hemminger.

7) Power management fixes in forcedeth from Rafael J. Wysocki.

8) Fix handling of NLM_F_ROOT | NLM_F_MATCH (can be mistaken as
   a NLM_F_DUMP request) in genetlink.  From Jan Engelhardt.

9) Kernel doc fixes in net/sock.h and net/core/filter.c from Randy
   Dunlap

10) Do PHY init, and thus firmware request, at ->open() time to
    workaround bootup 60 second delay when r8169 is built statically
    into the kernel.  From Francois Romieu.

11) Checksumming offload flags are handled improperly, in particular
    when VLAN's are nested.  From Jesse Gross.

12) Various Intel wired driver fixes from Bruce Allan, Jeff Kirsher,
    Dirk Brandewie, Yi Zou, and Alexander Duyck.

13) Software interrupts are disabled way too long when reading counters
    (for "iptables -L" output, for example).  Fix from Eric Dumazet.

14) bfin_mac driver has to disable checksum offloading when a writeback
    cache is in use, since corrupt packets can result, fix from
    Sonic Zhang.

15) Firmware version detection and ethtool diag dixes in qlcnic from
    Amit Kumar Salecha and Sony Chacko.

16) Mailbox register coherency, and ->open() failure unwinding fixes
    in cxgb4vf from Casey Leedom.

17) On user copy failure, we erroneously leave the connection request
    parameter size set, in CAIF protocol.  Fix from Dan Rosenberg.

18) MLX4 driver needs to be able to allocate different numbers of
    TX vs. RX queues, add a helper for that and use it.  From Tom
    Herbert.

19) Only HTB scheduler handles packet counting in statistics properly
    wrt. segmented SKBs.  Fix this by creating a helper function and
    using it everywhere.  From Eric Dumazet.

20) Firewire needs to be able to invalidate specific ARP entries since
    it uses ARP to discover private info about firewiare network nodes.
    From Maxim Levitsky.

21) IPV6 not handled properly in CAIF, fix from Sjur Braendeland and
    Kumar Sanghvi.

22) Firmware parsing function in r8169 needs some minor tweaks, from
    Hayes Wang.

23) TCP binding bug fix from Eric Dumazet.

24) ehea RX ring initialization fix on device up from Breno Leitao.

25) AUTH truncation bug fixes in IPSEC from Nicolas Dichtel.

26) AH protocol header parsing needs to reload pointers after
    skb COW, also from Nicolas Dichtel.

27) Fix netfilter conntrack race between table dumping and destroy of
    entries, from Stephen Hemminger.

28) RCU annotation addition to bridge netfilter broke broute table,
    fix from Florian Westphal.

Please pull, thanks a lot!

The following changes since commit 0c21e3aaf6ae85bee804a325aa29c325209180fd:

  Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/hfsplus (2011-01-07 17:16:27 -0800)

are available in the git repository at:

  master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git master

Alexander Duyck (3):
      ixgbe: cleanup flow director hash computation to improve performance
      ixgbe: further flow director performance optimizations
      ixgbe: update ntuple filter configuration

Breno Leitao (1):
      ehea: Increase the skb array usage

Bruce Allan (6):
      e1000e: cleanup variables set but not used
      e1000e: convert calls of ops.[read|write]_reg to e1e_[r|w]phy
      e1000e: properly bounds-check string functions
      e1000e: use either_crc_le() rather than re-write it
      e1000e: power off PHY after reset when interface is down
      e1000e: add custom set_d[0|3]_lplu_state function pointer for 82574

Casey Leedom (2):
      cxgb4vf: fix mailbox data/control coherency domain race
      cxgb4vf: recover from failure in cxgb4vf_open()

Changli Gao (1):
      net: ppp: use {get,put}_unaligned_be{16,32}

Dan Carpenter (1):
      phonet: some signedness bugs

Dan Rosenberg (1):
      caif: don't set connection request param size before copying data

Dang Hongwu (1):
      ah: reload pointers to skb data after calling skb_cow_data()

David S. Miller (2):
      Merge branch 'dccp' of git://eden-feed.erg.abdn.ac.uk/net-next-2.6
      Merge branch 'master' of git://1984.lsi.us.es/net-2.6

Dirk Brandewie (1):
      e1000: Add support for the CE4100 reference platform

Eric Dumazet (3):
      netfilter: x_tables: dont block BH while reading counters
      net_sched: factorize qdisc stats handling
      tcp: disallow bind() to reuse addr/port

Florian Westphal (1):
      netfilter: ebtables: make broute table work again

Gerrit Renker (1):
      dccp: make upper bound for seq_window consistent on 32/64 bit

Jan Engelhardt (1):
      netlink: test for all flags of the NLM_F_DUMP composite

Jesper Juhl (2):
      hamradio: Resolve memory leak due to missing firmware release in add_mcs()
      Madge Ambassador ATM Adapter driver: Always release_firmware() in ucode_init() and don't leak memory.

Jesse Gross (6):
      net offloading: Accept NETIF_F_HW_CSUM for all protocols.
      net offloading: Generalize netif_get_vlan_features().
      net offloading: Pass features into netif_needs_gso().
      net offloading: Convert dev_gso_segment() to use precomputed features.
      net offloading: Convert skb_need_linearize() to use precomputed features.
      net offloading: Convert checksums to use centrally computed features.

Ken Kawasaki (1):
      pcnet_cs: add new_id

Kumar Sanghvi (1):
      CAIF: Fix IPv6 support in receive path for GPRS/3G

Maxim Levitsky (1):
      arp: allow to invalidate specific ARP entries

Mike Frysinger (4):
      netdev: bfin_mac: clean up printk messages
      netdev: bfin_mac: mark setup_system_regs as static
      netdev: bfin_mac: drop unused Mac data
      netdev: bfin_mac: let boards set vlan masks

Nicolas Dichtel (2):
      xfrm: check trunc_len in XFRMA_ALG_AUTH_TRUNC
      ah: update maximum truncated ICV length

Rafael J. Wysocki (1):
      forcedeth: Do not use legacy PCI power management

Randy Dunlap (2):
      net/sock.h: make some fields private to fix kernel-doc warning(s)
      net: fix kernel-doc warning in core/filter.c

Samuel Jero (2):
      dccp: fix return value for sequence-invalid packets
      dccp: fix bug in updating the GSR

Shawn Guo (6):
      net/fec: fix MMFR_OP type in fec_enet_mdio_write
      net/fec: remove the use of "index" which is legacy
      net/fec: add mac field into platform data and consolidate fec_get_mac
      net/fec: improve pm for better suspend/resume
      net/fec: add dual fec support for mx28
      net/fec: remove config FEC2 as it's used nowhere

Sonic Zhang (1):
      netdev: bfin_mac: disable hardware checksum if writeback cache is enabled

Sony Chacko (1):
      qlcnic: fix ethtool diagnostics test

Stephen Hemminger (3):
      sky2: fix limited auto negotiation
      sky2: convert to new VLAN model (v0.2)
      netfilter: fix race in conntrack between dump_table and destroy

Tom Herbert (2):
      net: Add alloc_netdev_mqs function
      mlx4: Call alloc_etherdev to allocate RX and TX queues

Vladislav Zolotarov (4):
      bnx2x: Don't prevent RSS configuration in INT#x and MSI interrupt modes.
      bnx2x: registers dump fixes
      bnx2x: Move to D0 before clearing MSI/MSI-X configuration.
      bnx2x: Fix the race on bp->stats_pending.

Yi Zou (1):
      ixgbe: make sure per Rx queue is disabled before unmapping the receive buffer

amit salecha (2):
      qlcnic: fix flash fw version read
      qlcnic: change module parameter permissions

françois romieu (1):
      r8169: delay phy init until device opens.

hayeswang (1):
      net/r8169: Update the function of parsing firmware

 Documentation/networking/dccp.txt    |    1 +
 drivers/atm/ambassador.c             |   19 +-
 drivers/net/Kconfig                  |    9 +-
 drivers/net/bfin_mac.c               |   74 ++--
 drivers/net/bfin_mac.h               |   11 +-
 drivers/net/bnx2x/bnx2x.h            |    1 +
 drivers/net/bnx2x/bnx2x_dump.h       |  988 +++++++++++++++++++--------------
 drivers/net/bnx2x/bnx2x_ethtool.c    |   22 +-
 drivers/net/bnx2x/bnx2x_init.h       |  220 ++++++++
 drivers/net/bnx2x/bnx2x_main.c       |   70 +--
 drivers/net/bnx2x/bnx2x_reg.h        |   74 +++
 drivers/net/bnx2x/bnx2x_stats.c      |    5 +
 drivers/net/cxgb4vf/cxgb4vf_main.c   |   15 +-
 drivers/net/cxgb4vf/t4vf_hw.c        |   11 +
 drivers/net/e1000/e1000_hw.c         |  328 +++++++++---
 drivers/net/e1000/e1000_hw.h         |   59 ++-
 drivers/net/e1000/e1000_main.c       |   35 ++
 drivers/net/e1000/e1000_osdep.h      |   19 +-
 drivers/net/e1000e/82571.c           |   77 +++-
 drivers/net/e1000e/e1000.h           |    3 +
 drivers/net/e1000e/es2lan.c          |    4 +-
 drivers/net/e1000e/ethtool.c         |   54 ++-
 drivers/net/e1000e/hw.h              |    1 +
 drivers/net/e1000e/ich8lan.c         |   77 +--
 drivers/net/e1000e/lib.c             |    3 +-
 drivers/net/e1000e/netdev.c          |   53 ++-
 drivers/net/e1000e/phy.c             |   40 +-
 drivers/net/ehea/ehea.h              |    2 +-
 drivers/net/ehea/ehea_main.c         |    6 +-
 drivers/net/fec.c                    |  248 ++++++---
 drivers/net/fec.h                    |    5 +-
 drivers/net/forcedeth.c              |   34 +-
 drivers/net/hamradio/yam.c           |    4 +-
 drivers/net/ixgbe/ixgbe.h            |   21 +-
 drivers/net/ixgbe/ixgbe_82599.c      |  749 ++++++++++----------------
 drivers/net/ixgbe/ixgbe_ethtool.c    |  142 ++++--
 drivers/net/ixgbe/ixgbe_main.c       |  169 +++++--
 drivers/net/ixgbe/ixgbe_type.h       |   91 ++--
 drivers/net/mlx4/en_netdev.c         |    3 +-
 drivers/net/pcmcia/pcnet_cs.c        |    1 +
 drivers/net/ppp_async.c              |   10 +-
 drivers/net/ppp_deflate.c            |    9 +-
 drivers/net/ppp_generic.c            |    9 +-
 drivers/net/ppp_mppe.c               |    7 +-
 drivers/net/ppp_synctty.c            |    3 +-
 drivers/net/qlcnic/qlcnic.h          |   24 +-
 drivers/net/qlcnic/qlcnic_ethtool.c  |    2 +-
 drivers/net/qlcnic/qlcnic_init.c     |   63 +++-
 drivers/net/qlcnic/qlcnic_main.c     |   10 +-
 drivers/net/r8169.c                  |  143 +++++-
 drivers/net/sky2.c                   |  143 +++---
 drivers/net/sky2.h                   |    6 +-
 drivers/net/xen-netfront.c           |    2 +-
 include/linux/bfin_mac.h             |    1 +
 include/linux/etherdevice.h          |    4 +-
 include/linux/fec.h                  |    3 +
 include/linux/if_bridge.h            |    2 +-
 include/linux/netdevice.h            |   24 +-
 include/linux/netfilter/x_tables.h   |   10 +-
 include/net/ah.h                     |    2 +-
 include/net/arp.h                    |    1 +
 include/net/phonet/phonet.h          |    4 +-
 include/net/sch_generic.h            |   20 +-
 include/net/sock.h                   |    4 +
 net/caif/caif_socket.c               |    2 +-
 net/caif/chnl_net.c                  |   18 +-
 net/core/dev.c                       |  149 +++---
 net/core/filter.c                    |    2 +-
 net/core/rtnetlink.c                 |    2 +-
 net/dccp/dccp.h                      |    3 +-
 net/dccp/input.c                     |    2 +-
 net/dccp/sysctl.c                    |    4 +-
 net/ethernet/eth.c                   |   12 +-
 net/ipv4/ah4.c                       |    7 +-
 net/ipv4/arp.c                       |   29 +-
 net/ipv4/inet_connection_sock.c      |    5 +-
 net/ipv4/inet_diag.c                 |    2 +-
 net/ipv4/netfilter/arp_tables.c      |   45 +--
 net/ipv4/netfilter/ip_tables.c       |   45 +--
 net/ipv6/ah6.c                       |    8 +-
 net/ipv6/inet6_connection_sock.c     |    2 +-
 net/ipv6/netfilter/ip6_tables.c      |   45 +--
 net/netfilter/nf_conntrack_netlink.c |   18 +-
 net/netfilter/x_tables.c             |    3 +-
 net/netlink/genetlink.c              |    2 +-
 net/phonet/af_phonet.c               |    6 +-
 net/sched/act_csum.c                 |    3 +-
 net/sched/act_ipt.c                  |    3 +-
 net/sched/act_mirred.c               |    3 +-
 net/sched/act_nat.c                  |    3 +-
 net/sched/act_pedit.c                |    3 +-
 net/sched/act_police.c               |    3 +-
 net/sched/act_simple.c               |    3 +-
 net/sched/act_skbedit.c              |    3 +-
 net/sched/sch_atm.c                  |    6 +-
 net/sched/sch_cbq.c                  |    6 +-
 net/sched/sch_drr.c                  |    8 +-
 net/sched/sch_dsmark.c               |    3 +-
 net/sched/sch_hfsc.c                 |    6 +-
 net/sched/sch_htb.c                  |   17 +-
 net/sched/sch_ingress.c              |    3 +-
 net/sched/sch_multiq.c               |    3 +-
 net/sched/sch_netem.c                |    6 +-
 net/sched/sch_prio.c                 |    3 +-
 net/sched/sch_red.c                  |    3 +-
 net/sched/sch_sfq.c                  |    3 +-
 net/sched/sch_tbf.c                  |    3 +-
 net/sched/sch_teql.c                 |    3 +-
 net/xfrm/xfrm_user.c                 |    6 +-
 109 files changed, 2901 insertions(+), 1867 deletions(-)
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 1437+ messages in thread
* [GIT] Networking
@ 2011-01-14 21:03 David Miller
  0 siblings, 0 replies; 1437+ messages in thread
From: David Miller @ 2011-01-14 21:03 UTC (permalink / raw)
  To: torvalds; +Cc: akpm, netdev, linux-kernel


1) NAPI and SMP locking bug fixes in GRETH from Daniel Hellstrom.

2) Fix Cassini driver build on x86.

3) Fix unhandled IRQs in e1000, from Jesse Brandeburg.

4) SFC accidently stopped adhering to rss_cpus module parm, from
   Ben Hutchings.

5) IPV6 forwarding path must check skb->packet_type for PACKET_HOST,
   otherwise we get packet storms, fix from Alexey Kuznetsov.

6) rndis driver can deadlock in stats handling, part of the problem is
   the use of dev_txq_stats_fold() which makes this situation too easy
   to get into.  Kill the interface and convert the small number of
   existing users, thus fixing the rndis deadlocks.  From Eric Dumazet.

7) tproxy w/o conntrack build fix in netfilter, from KOVACS Krisztian.

8) ath9k wireless fixes from Sujith Manoharan.

9) Fix ctnetlink error signalling such that we don't loop forever
   in some situations, from Pablo Neira Ayuso.

10) Kernel doc fixups from Randy Dunlap.

11) Wireless stack kernel doc and other comment fixes from Johannes Berg.

Please pull, thanks a lot!

The following changes since commit 4162cf64973df51fc885825bc9ca4d055891c49f:

  Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (2011-01-11 16:32:41 -0800)

are available in the git repository at:

  master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git master

Alexey Kuznetsov (1):
      inet6: prevent network storms caused by linux IPv6 routers

Ben Hutchings (4):
      sfc: Make efx_get_tx_queue() an inline function
      sfc: Restore the effect of the rss_cpus module parameter
      ks8695net: Disable non-working ethtool operations
      ks8695net: Use default implementation of ethtool_ops::get_link

Bruce Allan (2):
      e1000e: update Copyright for 2011
      e1000e: consistent use of Rx/Tx vs. RX/TX/rx/tx in comments/logs

Christian Lamparter (1):
      p54: fix sequence no. accounting off-by-one error

Daniel Hellstrom (7):
      GRETH: added raw AMBA vendor/device number to match against.
      GRETH: fix opening/closing
      GRETH: GBit transmit descriptor handling optimization
      GRETH: fixed skb buffer memory leak on frame errors
      GRETH: avoid writing bad speed/duplex when setting transfer mode
      GRETH: handle frame error interrupts
      GRETH: resolve SMP issues and other problems

David S. Miller (7):
      Merge branch 'master' of git://git.kernel.org/.../linville/wireless-2.6
      Merge branch 'master' of git://1984.lsi.us.es/net-2.6
      Merge branch 'master' of git://1984.lsi.us.es/net-2.6
      cassini: Fix build bustage on x86.
      Merge branch 'vhost-net' of git://git.kernel.org/.../mst/vhost
      Merge branch 'master' of git://git.kernel.org/.../bwh/sfc-2.6
      Merge branch 'master' of master.kernel.org:/.../jkirsher/net-2.6

Eric Dumazet (1):
      net: remove dev_txq_stats_fold()

Indan Zupancic (1):
      ipw2200: Check for -1 INTA in tasklet too.

Jesper Juhl (2):
      vxge: Remember to release firmware after upgrading firmware
      USB CDC NCM: Don't deref NULL in cdc_ncm_rx_fixup() and don't use uninitialized variable.

Jesse Brandeburg (1):
      e1000: Avoid unhandled IRQ

Joe Perches (2):
      bna: Remove unnecessary memset(,0,)
      netdev: bfin_mac: Remove is_multicast_ether_addr use in netdev_for_each_mc_addr

Johannes Berg (5):
      mac80211: add remain-on-channel docs
      mac80211: add missing docs for off-chan TX flag
      cfg80211: add mesh join/leave callback docs
      nl80211: add/fix mesh docs
      mac80211: add doc short section on LED triggers

KOVACS Krisztian (1):
      netfilter: fix compilation when conntrack is disabled but tproxy is enabled

Kees Cook (1):
      net: ax25: fix information leak to userland harder

Michael Buesch (1):
      ssb: Ignore dangling ethernet cores on wireless devices

Michael S. Tsirkin (1):
      vhost: fix signed/unsigned comparison

Nicolas Dichtel (1):
      ipsec: update MAX_AH_AUTH_LEN to support sha512

Pablo Neira Ayuso (1):
      netfilter: ctnetlink: fix loop in ctnetlink_get_conntrack()

Randy Dunlap (1):
      eth: fix new kernel-doc warning

Stanislaw Gruszka (1):
      hostap_cs: fix sleeping function called from invalid context

Sujith Manoharan (5):
      ath9k_hw: Fix chip test
      ath9k_hw: Fix calibration for AR9287 devices
      ath9k_hw: Fix thermal issue with UB94
      ath9k_hw: Fix RX handling for USB devices
      ath9k_htc: Really fix packet injection

Tobias Klauser (4):
      netdev: ucc_geth: Use is_multicast_ether_addr helper
      netdev: bfin_mac: Use is_multicast_ether_addr helper
      etherdevice.h: Add is_unicast_ether_addr function
      netdev: tilepro: Use is_unicast_ether_addr helper

françois romieu (1):
      r8169: keep firmware in memory.

stephen hemminger (1):
      sched: remove unused backlog in RED stats

 Documentation/DocBook/80211.tmpl               |   21 ++-
 drivers/net/arm/ks8695net.c                    |  288 ++++++++----------------
 drivers/net/bfin_mac.c                         |    9 +-
 drivers/net/bna/bnad_ethtool.c                 |    1 -
 drivers/net/cassini.c                          |    6 +-
 drivers/net/e1000/e1000_main.c                 |   10 +-
 drivers/net/e1000e/82571.c                     |    4 +-
 drivers/net/e1000e/Makefile                    |    2 +-
 drivers/net/e1000e/defines.h                   |    2 +-
 drivers/net/e1000e/e1000.h                     |    2 +-
 drivers/net/e1000e/es2lan.c                    |    2 +-
 drivers/net/e1000e/ethtool.c                   |    2 +-
 drivers/net/e1000e/hw.h                        |    4 +-
 drivers/net/e1000e/ich8lan.c                   |    2 +-
 drivers/net/e1000e/lib.c                       |   20 +-
 drivers/net/e1000e/netdev.c                    |  223 +++++++++---------
 drivers/net/e1000e/param.c                     |    6 +-
 drivers/net/e1000e/phy.c                       |    4 +-
 drivers/net/gianfar.c                          |   10 +-
 drivers/net/gianfar.h                          |   10 +
 drivers/net/greth.c                            |  221 +++++++++++--------
 drivers/net/greth.h                            |    2 +
 drivers/net/ixgbe/ixgbe_main.c                 |   23 ++-
 drivers/net/macvtap.c                          |    2 +-
 drivers/net/r8169.c                            |   43 +++-
 drivers/net/sfc/efx.c                          |   18 +-
 drivers/net/sfc/net_driver.h                   |   10 +-
 drivers/net/tile/tilepro.c                     |   10 +-
 drivers/net/ucc_geth.c                         |    2 +-
 drivers/net/usb/cdc_ncm.c                      |    4 +-
 drivers/net/vxge/vxge-main.c                   |    1 +
 drivers/net/wireless/ath/ath9k/ar9002_calib.c  |    3 +
 drivers/net/wireless/ath/ath9k/eeprom_def.c    |    4 +
 drivers/net/wireless/ath/ath9k/htc.h           |    1 +
 drivers/net/wireless/ath/ath9k/htc_drv_main.c  |   37 +++-
 drivers/net/wireless/ath/ath9k/hw.c            |    5 +-
 drivers/net/wireless/hostap/hostap_cs.c        |   15 +-
 drivers/net/wireless/ipw2x00/ipw2200.c         |    7 +
 drivers/net/wireless/p54/txrx.c                |    2 +-
 drivers/ssb/scan.c                             |   10 +
 drivers/vhost/vhost.c                          |   18 +-
 include/linux/etherdevice.h                    |   11 +
 include/linux/netdevice.h                      |    5 -
 include/linux/nl80211.h                        |   20 ++-
 include/linux/skbuff.h                         |   15 ++
 include/net/ah.h                               |    2 +-
 include/net/cfg80211.h                         |    2 +
 include/net/mac80211.h                         |   14 ++
 include/net/netfilter/ipv6/nf_conntrack_ipv6.h |   10 -
 include/net/netfilter/ipv6/nf_defrag_ipv6.h    |   10 +
 include/net/red.h                              |    1 -
 net/ax25/af_ax25.c                             |    2 +-
 net/core/dev.c                                 |   29 ---
 net/core/skbuff.c                              |    2 +
 net/ethernet/eth.c                             |    2 +-
 net/ipv6/ip6_output.c                          |    3 +
 net/ipv6/netfilter/nf_defrag_ipv6_hooks.c      |    8 +-
 net/netfilter/nf_conntrack_netlink.c           |    3 +-
 net/sched/sch_teql.c                           |   26 ++-
 59 files changed, 655 insertions(+), 576 deletions(-)

^ permalink raw reply	[flat|nested] 1437+ messages in thread
* [GIT] Networking
@ 2011-01-20  2:04 David Miller
  2011-01-20 21:12 ` Linus Torvalds
  0 siblings, 1 reply; 1437+ messages in thread
From: David Miller @ 2011-01-20  2:04 UTC (permalink / raw)
  To: torvalds; +Cc: akpm, netdev, linux-kernel


1) Revert a netlink flag sanity check that is causing regressions in
   existing applications.

2) can_checksum_protocol() args were swapped, causing broken ipv6
   checksum handling with devices that cannot offload ipv6 checksums.
   Regression fix from Eric Dumazet.

3) CAN protocol sendmsg() doesn't validate sockaddr size, fix from
   Kurt Van Dijck.

4) Name space creation spams logs with useless ipv6 private extension
   messages, fix from Romain Francoise.

5) sctp SACK timer socket option is not properly named, but since it's
   been wrong for a long time provide a back-compat cpp define as well
   so we don't break existing apps.  Fix from Shan Wei.

6) NETIF_F_HW_VLAN_TX accidently masked out in network device offloading
   feature tests, regression fix from Jesse Gross.

7) iwmc3200wifi accidently returns ERR_PTR(0) on allocation failures,
   fix from Axel Lin.

8) rt2x00 leaks memory in firmware request error path, from Jesper Juhl.

9) Make IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK definition match spec, from
   Amitkumar Karwar.

10) Fix erroneous lockdep warnings in mac80211, from Johannes Berg.

11) In mac80211 aggregate code, handle black ack parameter of zero correctly,
    which means we should use maximum supported number of sub-frames.  Fix
    from Luciano Coelho.

12) Missing allocation failure checks in batman-adv meshing code, fix from
    Jesper Juhl.

13) TX checksumming bug fix in qeth from Frank Blaschka.

14) Fix error checking in cfcnfg_disconn_adapt_layer() CAIF protocol
    code, from Dan Carpenter.

15) vmxnet driver bug fixes from Shreyas Bhatewara, Guolin Yang,
    Matthieu Bucchianeri, and Dmitry Torokhov:
    1) Wrong variable used in ring size updates.
    2) ifconfig set MAC address setting gets lost
    3) NAPI needs to be disabled/enabled across suspend/resume.
    4) Command register access needs locking
    5) Too many MSI-X vectors allocated in single TX single RX queue case

16) Endianness fixes in ath9k_htc driver from Rajkumar Manoharan.

17) tx_complete_poll_work locking fix in ath5k driver from Bob Copeland.

18) iwlwifi EEPROM reading fix from Wey-Yi Guy.

19) LED, microcode loading, and duplex setting fixes for bnx2x from
    Yaniv Rosner and Eilon Greenstein.

20) ns83820 driver checks wrong pointer for NULL after alloc_etherdev(),
    fix from Jesper Juhl.

Please pull, thanks a lot!

The following changes since commit c56eb8fb6dccb83d9fe62fd4dc00c834de9bc470:

  Linux 2.6.38-rc1 (2011-01-18 15:14:02 -0800)

are available in the git repository at:
  master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git master

Alexey Orishko (1):
      USB CDC NCM: tx_fixup() race condition fix

Amitkumar Karwar (1):
      ieee80211: correct IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK macro

Anton Vorontsov (1):
      gianfar: Fix misleading indentation in startup_gfar()

Axel Lin (1):
      iwmc3200wifi: Return proper error for iwm_if_alloc

Bob Copeland (1):
      ath5k: fix locking in tx_complete_poll_work

Dan Carpenter (1):
      caif: checking the wrong variable

David S. Miller (3):
      Merge branch 'for-david' of git://git.open-mesh.org/ecsv/linux-merge
      Merge branch 'master' of git://git.kernel.org/.../linville/wireless-2.6
      Revert "netlink: test for all flags of the NLM_F_DUMP composite"

Eric Dumazet (1):
      net: fix can_checksum_protocol() arguments swap

Frank Blaschka (1):
      qeth: l3 hw tx csum circumvent hw bug

Jesper Juhl (3):
      rt2x00: Don't leak mem in error path of rt2x00lib_request_firmware()
      batman-adv: Even Batman should not dereference NULL pointers
      ns83820: Avoid bad pointer deref in ns83820_init_one().

Jesse Gross (1):
      net offloading: Do not mask out NETIF_F_HW_VLAN_TX for vlan.

Johannes Berg (1):
      mac80211: fix lockdep warning

Kuninori Morimoto (1):
      net/irda/sh_irda: return to RX mode when TX error

Kurt Van Dijck (1):
      can: test size of struct sockaddr in sendmsg

Luciano Coelho (1):
      mac80211: use maximum number of AMPDU frames as default in BA RX

Luis R. Rodriguez (1):
      ath9k_hw: ASPM interoperability fix for AR9380/AR9382

Rajkumar Manoharan (2):
      ath9k_htc: Fix endian issue in tx header
      ath9k_hw: do PA offset calibration only on longcal interval

Romain Francoise (1):
      ipv6: Silence privacy extensions initialization

Shan Wei (1):
      sctp: user perfect name for Delayed SACK Timer option

Shreyas Bhatewara (8):
      vmxnet3: fix ring size update
      vmxnet3: Preserve the MAC address configured by ifconfig
      vmxnet3: Enable HW Rx VLAN stripping by default
      vmxnet3: Provide required number of bytes in first SG buffer
      vmxnet3: Make ethtool handlers multiqueue aware
      vmxnet3: Disable napi in suspend, reenable in resume.
      vmxnet3: Add locking for access to command register
      vmxnet3: Dont allocate extra MSI-x vectors

Sven Eckelmann (1):
      batman-adv: Use "__attribute__" shortcut macros

Ursula Braun (1):
      qeth: postpone open till recovery is finished

Wey-Yi Guy (1):
      iwlwifi: fix valid chain reading from EEPROM

Yaniv Rosner (8):
      bnx2x: Swap BCM8073 PHY polarity if required
      bnx2x: Common init will be executed only once after POR
      bnx2x: LED fix for BCM8727 over BCM57712
      bnx2x: Fix BCM8073/BCM8727 microcode loading
      bnx2x: Mark full duplex on some external PHYs
      bnx2x: Fix BCM84823 LED behavior
      bnx2x: Fix AER setting for BCM57712
      bnx2x: Update bnx2x version to 1.62.00-4

 drivers/net/bnx2x/bnx2x.h                          |    4 +-
 drivers/net/bnx2x/bnx2x_hsi.h                      |    4 +
 drivers/net/bnx2x/bnx2x_link.c                     |  173 ++++++++++---
 drivers/net/bnx2x/bnx2x_reg.h                      |    4 +
 drivers/net/gianfar.c                              |    2 +-
 drivers/net/irda/sh_irda.c                         |   14 +-
 drivers/net/ns83820.c                              |    5 +-
 drivers/net/usb/cdc_ncm.c                          |   19 +-
 drivers/net/vmxnet3/vmxnet3_drv.c                  |   93 +++++---
 drivers/net/vmxnet3/vmxnet3_ethtool.c              |  274 ++++++++++++--------
 drivers/net/vmxnet3/vmxnet3_int.h                  |    7 +-
 drivers/net/wireless/ath/ath5k/base.c              |    4 +
 drivers/net/wireless/ath/ath9k/ar9002_calib.c      |   10 +-
 .../net/wireless/ath/ath9k/ar9003_2p2_initvals.h   |    2 +-
 drivers/net/wireless/ath/ath9k/ar9003_hw.c         |    4 +-
 drivers/net/wireless/ath/ath9k/htc.h               |    2 +-
 drivers/net/wireless/ath/ath9k/htc_drv_txrx.c      |    8 +-
 drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c      |    2 +-
 drivers/net/wireless/iwmc3200wifi/netdev.c         |    2 +
 drivers/net/wireless/rt2x00/rt2x00firmware.c       |    1 +
 drivers/s390/net/qeth_l2_main.c                    |   18 ++-
 drivers/s390/net/qeth_l3_main.c                    |   22 ++-
 include/linux/ieee80211.h                          |    2 +-
 include/net/sctp/user.h                            |    1 +
 net/batman-adv/main.h                              |    6 +-
 net/batman-adv/packet.h                            |   14 +-
 net/batman-adv/types.h                             |    4 +-
 net/batman-adv/unicast.c                           |    6 +-
 net/caif/cfcnfg.c                                  |    9 +-
 net/can/bcm.c                                      |    3 +
 net/can/raw.c                                      |    3 +
 net/core/dev.c                                     |    6 +-
 net/core/rtnetlink.c                               |    2 +-
 net/ipv4/inet_diag.c                               |    2 +-
 net/ipv6/addrconf.c                                |    3 -
 net/mac80211/agg-rx.c                              |   11 +-
 net/mac80211/main.c                                |   12 +-
 net/netfilter/nf_conntrack_netlink.c               |    4 +-
 net/netlink/genetlink.c                            |    2 +-
 net/sctp/socket.c                                  |    4 +-
 net/xfrm/xfrm_user.c                               |    2 +-
 41 files changed, 512 insertions(+), 258 deletions(-)

^ permalink raw reply	[flat|nested] 1437+ messages in thread
* [GIT] Networking
@ 2011-01-26 23:13 David Miller
  0 siblings, 0 replies; 1437+ messages in thread
From: David Miller @ 2011-01-26 23:13 UTC (permalink / raw)
  To: torvalds; +Cc: akpm, netdev, linux-kernel


The ipv6 inetpeer support changes this merge window introduced a
few regressions, sorry about that, but all of the ones I am aware
of should be completely fixed here.

We also have a bug fix for an 11 year old TCP bug, that to me is
the definition of "awesome"

1) INET peer cache releases ipv6 peers using ipv4 tree root, oops.
   Based upon a report by Eric Dumazet.

2) GRO packet merging bug fix from Michal Schmidt.  If the GRO code
   gets a linear SKB then a paged one, we merge incorrectly.  This is
   possible with the SFC driver which packages RX frames dynamically
   based upon a flow's behavior.

3) /proc/net/tcp optimization regression fix, we walk the listener hash
   incorrectly such that if there are enough sockets we can loop
   essentially forever.  Fix from Eric Dumazet.

4) The ipv6 inetpeer support wants to always attach peers to cached routes
   only.  This is almost always true, except for some special case situations
   wrt. local network routes.  Fix by always cloning these routes into
   RTF_CACHE ones.  Based upon a report by PK <runningdoglackey@yahoo.com>

5) Due to some merging side effects, we ended up undoing a memory clear for
   the ethtool get-regs request structure.  One change (the original fix)
   went kmalloc --> kzalloc, the other change did kmalloc --> vmalloc,
   and this wasn't caught during the merge (my bad).  Luckily Eugene Teo caught
   it and submitted thsi fix.

6) Like ipv4 ipsec routes, ipv6 ones must propagate the inetpeer binding from
   the non-ipsec child route.

7) Fix tg3 driver VLAN regressions reported by Eric Dumazet by converting over
   to the new VLAN driver interface framework.  From Matt Carlson.

8) Fix a TCP bug that causes erroneous resets to be emitted on the
   final "data + FIN" packet.  This bug dates back to January, 2000 :-)
   Fix from Jerry Chu.

9) Revert a set of ipv6 interface address semantic changes from last
   January that have broken several things, in particular the "disable_ipv6"
   sysctl.

10) at91_can driver chip bug errata handling from Marc Kleine-Budde.

11) New softing CAN driver from Kurt Van Dijck.

12) arp_ioctl() locking regression fix from Eric Dumazet based upon a report
    by Jamie Heilman.

13) atm idt77105 driver copies wrong stats back to userspace, fix from
    Vasiliy Kulikov.

14) Work cancelling fixup in pch_gbe from Tejun Heo.

15) CNIC endianness bug fix from Michael Chan, based upon a report by Breno
    Leitao.

16) BNX2 driver barks in logs about AER even on platforms where AER isn't even
    supported, fix from Michael Chan.

17) cxgb4 driver need to call netif_carrier_off() after registering the device,
    not before.

18) bonding crashes because it performs pskb_may_pull() potentially on shared
    SKBs, fix from Neil Horman.

19) All packet schedulers that can drop previously enqueued packets over-estimate
    their stats because the rules concerning bstats updates keep up from being
    able to undo the increment at drop time.  This makes accurate rate estimation
    et al. basically impossible.  Fix this by creating a helper function and
    doing the bstats increment at dequeue instead of enqueue time, this way the
    dropped frames do not accidently get into the state.  From Eric Dumazet.

20) Various bluetooth regression and memory leak fixes from Alexander Holler,
    Gustavo F. Padovan, David Sterba, Johan Hedberg, and Lukas Turek.

21) EEPROM reading fix for older iwlwifi devices from Wey-Yi Guy.

22) Disable PARPD on ath9k wireless, it is causing regressions in both
    connectivity and performance.  From Luis R. Rodriguez.

23) Missing dev_alloc_skb() error checking in rtlwifi, from Jesper Juhl.

24) ieee80211_beacon_get_tim() crash fix from Felix Fietkau.

Please pull, thanks a lot!

The following changes since commit c723fdab8aa728dc2bf0da6a0de8bb9c3f588d84:

  Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 (2011-01-25 14:23:54 +1000)

are available in the git repository at:

  master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git master

Alexander Holler (1):
      Bluetooth: ath3k: reduce memory usage

David S. Miller (7):
      Merge branch 'master' of master.kernel.org:/.../torvalds/linux-2.6
      inetpeer: Use correct AVL tree base pointer in inet_getpeer().
      Merge branch 'can/at91_can-for-net-2.6' of git://git.pengutronix.de/git/mkl/linux-2.6
      ipv6: Always clone offlink routes.
      ipv6: Revert 'administrative down' address handling changes.
      Merge branch 'master' of git://git.kernel.org/.../linville/wireless-2.6
      xfrm6: Don't forget to propagate peer into ipsec route.

David Sterba (1):
      Bluetooth: l2cap: fix misuse of logical operation in place of bitop

Dimitris Michailidis (1):
      cxgb4: fix reported state of interfaces without link

Eric Dumazet (3):
      net_sched: accurate bytes/packets stats/rates
      net: arp_ioctl() must hold RTNL
      tcp: fix bug in listening_get_next()

Eugene Teo (1):
      net: clear heap allocation for ethtool_get_regs()

Felix Fietkau (2):
      ath9k: add missing ps wakeup/restore calls
      mac80211: fix a crash in ieee80211_beacon_get_tim on change_interface

Greg Kroah-Hartman (1):
      rt2x00: add device id for windy31 usb device

Jerry Chu (1):
      TCP: fix a bug that triggers large number of TCP RST by mistake

Jesper Dangaard Brouer (1):
      textsearch: doc - fix spelling in lib/textsearch.c.

Jesper Juhl (2):
      rtlwifi: Fix possible NULL dereference
      USB NET KL5KUSB101: Fix mem leak in error path of kaweth_download_firmware()

Johan Hedberg (6):
      Bluetooth: Fix leaking blacklist when unregistering a hci device
      Revert "Bluetooth: Update sec_level/auth_type for already existing connections"
      Bluetooth: Fix MITM protection requirement preservation
      Bluetooth: Create a unified auth_type evaluation function
      Bluetooth: Fix authentication request for L2CAP raw sockets
      Bluetooth: Fix race condition with conn->sec_level

John Fastabend (1):
      dcbnl: make get_app handling symmetric for IEEE and CEE DCBx

Kurt Van Dijck (2):
      can: add driver for Softing card
      can: add driver for Softing card

Luis R. Rodriguez (1):
      ath9k_hw: disabled PAPRD for AR9003

Lukáš Turek (1):
      Bluetooth: Never deallocate a session when some DLC points to it

Marc Kleine-Budde (3):
      can: at91_can: clean up usage of AT91_MB_RX_FIRST and AT91_MB_RX_NUM
      can: at91_can: don't use mailbox 0
      can: at91_can: make can_id of mailbox 0 configurable

Matt Carlson (1):
      tg3: Use new VLAN code

Michael Chan (3):
      bnx2: Always set ETH_FLAG_TXVLAN
      cnic: Fix big endian bug
      bnx2: Eliminate AER error messages on systems not supporting it

Michal Schmidt (1):
      GRO: fix merging a paged skb after non-paged skbs

Neil Horman (1):
      bonding: Ensure that we unshare skbs prior to calling pskb_may_pull

Nicolas de Pesloüan (1):
      bonding: update documentation - alternate configuration.

Reinette Chatre (1):
      MAINTAINERS: remove Reinette Chatre as iwlwifi maintainer

Tejun Heo (1):
      pch_gbe: don't use flush_scheduled_work()

Vasiliy Kulikov (1):
      atm: idt77105: fix fetch_stats() result

Wey-Yi Guy (1):
      iwlwifi: don't read sku information from EEPROM for 4965

 Documentation/ABI/testing/sysfs-platform-at91 |   25 +
 Documentation/networking/bonding.txt          |   83 ++-
 MAINTAINERS                                   |    1 -
 drivers/atm/idt77105.c                        |    2 +-
 drivers/bluetooth/ath3k.c                     |   75 +--
 drivers/net/bnx2.c                            |   21 +-
 drivers/net/bnx2.h                            |    1 +
 drivers/net/bonding/bond_3ad.c                |    4 +
 drivers/net/bonding/bond_alb.c                |    4 +
 drivers/net/bonding/bond_main.c               |    4 +
 drivers/net/can/Kconfig                       |    2 +
 drivers/net/can/Makefile                      |    1 +
 drivers/net/can/at91_can.c                    |  138 +++-
 drivers/net/can/softing/Kconfig               |   30 +
 drivers/net/can/softing/Makefile              |    6 +
 drivers/net/can/softing/softing.h             |  167 +++++
 drivers/net/can/softing/softing_cs.c          |  359 ++++++++++
 drivers/net/can/softing/softing_fw.c          |  691 +++++++++++++++++++
 drivers/net/can/softing/softing_main.c        |  893 +++++++++++++++++++++++++
 drivers/net/can/softing/softing_platform.h    |   40 ++
 drivers/net/cnic.c                            |   12 +-
 drivers/net/cxgb4/cxgb4_main.c                |    3 +-
 drivers/net/pch_gbe/pch_gbe_main.c            |    2 +-
 drivers/net/tg3.c                             |   95 +---
 drivers/net/tg3.h                             |    3 -
 drivers/net/usb/kaweth.c                      |    1 +
 drivers/net/wireless/ath/ath9k/hw.c           |    6 +-
 drivers/net/wireless/ath/ath9k/hw.h           |    1 +
 drivers/net/wireless/ath/ath9k/main.c         |    8 +-
 drivers/net/wireless/ath/ath9k/xmit.c         |    2 -
 drivers/net/wireless/iwlwifi/iwl-4965.c       |    1 +
 drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c |   11 +-
 drivers/net/wireless/rt2x00/rt73usb.c         |    1 +
 drivers/net/wireless/rtlwifi/pci.c            |   11 +-
 include/net/bluetooth/hci_core.h              |    1 +
 include/net/sch_generic.h                     |    8 +-
 lib/textsearch.c                              |   10 +-
 net/bluetooth/hci_conn.c                      |   16 +-
 net/bluetooth/hci_core.c                      |    4 +
 net/bluetooth/hci_event.c                     |    9 +-
 net/bluetooth/l2cap.c                         |   84 +--
 net/bluetooth/rfcomm/core.c                   |    3 +-
 net/core/dev.c                                |    3 +-
 net/core/ethtool.c                            |    2 +-
 net/core/skbuff.c                             |    8 +-
 net/dcb/dcbnl.c                               |   13 +-
 net/ipv4/arp.c                                |   11 +-
 net/ipv4/inetpeer.c                           |    2 +-
 net/ipv4/tcp_input.c                          |    2 +-
 net/ipv4/tcp_ipv4.c                           |    1 -
 net/ipv6/addrconf.c                           |   81 +--
 net/ipv6/route.c                              |    9 +-
 net/ipv6/xfrm6_policy.c                       |    6 +
 net/mac80211/tx.c                             |    3 +
 net/sched/sch_cbq.c                           |    3 +-
 net/sched/sch_drr.c                           |    2 +-
 net/sched/sch_dsmark.c                        |    2 +-
 net/sched/sch_fifo.c                          |    5 +-
 net/sched/sch_hfsc.c                          |    2 +-
 net/sched/sch_htb.c                           |   12 +-
 net/sched/sch_multiq.c                        |    2 +-
 net/sched/sch_netem.c                         |    3 +-
 net/sched/sch_prio.c                          |    2 +-
 net/sched/sch_red.c                           |   11 +-
 net/sched/sch_sfq.c                           |    5 +-
 net/sched/sch_tbf.c                           |    2 +-
 net/sched/sch_teql.c                          |    3 +-
 67 files changed, 2650 insertions(+), 384 deletions(-)
 create mode 100644 Documentation/ABI/testing/sysfs-platform-at91
 create mode 100644 drivers/net/can/softing/Kconfig
 create mode 100644 drivers/net/can/softing/Makefile
 create mode 100644 drivers/net/can/softing/softing.h
 create mode 100644 drivers/net/can/softing/softing_cs.c
 create mode 100644 drivers/net/can/softing/softing_fw.c
 create mode 100644 drivers/net/can/softing/softing_main.c
 create mode 100644 drivers/net/can/softing/softing_platform.h

^ permalink raw reply	[flat|nested] 1437+ messages in thread
* [GIT] Networking
@ 2011-02-04 21:18 David Miller
  0 siblings, 0 replies; 1437+ messages in thread
From: David Miller @ 2011-02-04 21:18 UTC (permalink / raw)
  To: torvalds; +Cc: akpm, netdev, linux-kernel


Lots of little fixes in here, as is usually the case at this point.

The qeth fixes and the XEN netfront buggy guest handling are the
largest changes, with the ipv4/ipv6 multicast compat ioctl handling
bits next in terms of size.

1) Missing ref grab in netfilter conntrack netlink, from Pablo Neira Ayuso.
2) IPV6 boundary checks busted in xt_iprange module, from Thomas Jacob.
3) Wrong indexes used in loop in batman-adv module, leading to crash, fix
   from Linus Lüssing.
4) rtlwifi refactoring caused regressions in firmware upload, fix from
   Chaoming Li.
5) Fix error handling in ath5k_hw_dma_stop, from Bob Copeland.
6) Frame endianness fixes in ath5k, also from Bob Copeland.
7) Fix crashes due to ath9k tasklet shutdown races, from Stanislaw Gruszka.
8) Fix build warnings in econet, from Eric Dumazet.
9) Handle buggy guests setting of NETRX_csum_* in XEN netfront driver, from
   Ian Campbell.
10) Fix DMA-API debugging message spew in dl2k driver due to double
    unmaps.  Fix from Stanislaw Gruszka.
11) In rtnetlink, validate_linkmsg() uses wrong afinfo pointer.  Fix
    from Kurt Van Dijck.
12) __alloc_skb() needs kmemcheck annotations to avoid false positives,
    from Eric Dumazet.
13) Remove some complications wrt. ipv6 inetpeer binding.  All reports
    about triggered warnings et al. should be gone now.
14) napi_reuse_skb() must reset skb->dev and skb->iif, from Herbert Xu
    and Andy Gospodarek.
15) CAIF protocol headers need userspace export.  From Sjur Braendeland.
16) Fix oops on adding network namespace, fix from Eric W. Biederman.
17) ipv4 and ipv6 multicast ioctls need compat handling.  Based upon
    some initial work by Eric W. Biederman and some audits by Arnd
    Bergmann.
18) batman-adv module unhashes wrong object on failures, fix from
    Sven Eckelmann.
19) batman-adv forgets to free memory in free_info(), also from Sven.
20) batman-adv list traversal in send_vis_packets() drops lock inside
    it's loop, so we have to iterate over the head to be thread safe.
    Also from Sven Eckelmann.
21) bnx2x driver fixes from Yaniv Rosner and Eilon Greenstein.
22) wl12xx wireless has use-after-free error, fix from Mathias Krause.
23) Fix OOPS regression with IPSEC, ipv4/ipv6 blackhole dst ops need
    to implement a "default_mtu" method.  Fix from Roland Dreier.
24) CAN softing driver needs to depend upon IOMEM.
25) get_rps_cpu() erroneously elides flow processing when RPS map has
    length of one.  Fix from Tom Herbert.
26) ipv6 unregisters sysctl tables in wrong order, resulting in
    WARNING in unregister_sysctl_table().  Fix from Eric W. Biederman.
27) enc28j60 driver uses "sizeof(pointer)" when it means "sizeof(array)",
    fix from Stefan Weil.
28) vhost spews bogus RCU warnings, fix from Micahel S. Tsirkin.
29) arpt_mangle.c's checkentry() was changed to return int, but it
    still erroneously returns "false" and "true".  Fix from Pable
    Neira Ayuso.
30) Fix netfilter conntrack event filtering, also from Pablo.
31) SKB leak in ath_paprd_send_frame(), fix from Mohammed Shafi Shajakhan.
32) Mixed up boolean operators in vxge driver result in condition
    always true, fix from Stefan Weil.
33) Remove use of undefined operation in depca driver, from Alan Cox.
34) ISDN icn driver strncpy() usage fix, from Stefan Weil.
35) be2net driver erroneously mucks with tx queue status during link
    up/down, resulting in crashes.  Fix from Ajit Khaparde.
36) be2net illegally calls netif_stop_queue() before register_netdevice()
    happens, also from Ajit.
37) s390 qeth fixes from Ursula Braun, Frank Blaschka, and Stefan Weil.
38) Fix races between interface up/down and get_stats in NIU driver.
39) Like nlmsg_cancel(), genlmsg_cancel() must explicitly handle NULL
    second argument (before we subtract from it and it no longer
    looks like "NULL").  Analysis and fix from Julia Lawall.
40) R8169 bug fixes via Francois Romieu:
    a) 8168c needs RxFIFO overflow workaround too, from Ivan Vecera.
    b) Refine RxFIFO overflow logic to reset less, from Francois.
    c) Interrupt handler needs to be more careful in RxFIFO overflow
       cases, also from Francois.
41) Bridging code inserts FDB entries to the hash table before they
    are fully initialized.  Since FDB lookup uses RCU this is a serious
    issue, from Pavel Emelyanov.
42) Some CAN drivers create world-writable sysfs files, oops.  Fix from
    Vasiliy Kulikov.

Please pull, thanks a lot!

The following changes since commit 831d52bc153971b70e64eccfbed2b232394f22f8:

  x86, mm: avoid possible bogus tlb entries by clearing prev mm_cpumask after switching mm (2011-02-03 13:32:39 -0800)

are available in the git repository at:
  master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git master

Ajit Khaparde (3):
      be2net: fix a crash seen during insmod/rmmod test
      be2net: remove netif_stop_queue being called before register_netdev.
      MAINTAINERS: update email ids of the be2net driver maintainers.

Alan Cox (1):
      depca: Fix warnings

Andy Gospodarek (1):
      gro: reset skb_iif on reuse

Bob Copeland (2):
      ath5k: fix error handling in ath5k_hw_dma_stop
      ath5k: correct endianness of frame duration

Chaoming Li (1):
      rtlwifi: Fix firmware upload errors

Chuck Ebbert (2):
      CAN: softing driver depends on IOMEM
      atl1c: Add missing PCI device ID

David S. Miller (9):
      ipv6: Remove route peer binding assertions.
      Merge branch 'batman-adv/merge-oopsonly' of git://git.open-mesh.org/ecsv/linux-merge
      Merge branch 'vhost-net' of git://git.kernel.org/.../mst/vhost
      Merge branch 'master' of git://git.kernel.org/.../linville/wireless-2.6
      Merge branch 'master' of git://git.kernel.org/.../kaber/nf-2.6
      niu: Fix races between up/down and get_stats.
      net: Fix bug in compat SIOCGETSGCNT handling.
      net: Support compat SIOCGETVIFCNT ioctl in ipv4.
      net: Provide compat support for SIOCGETMIFCNT_IN6 and SIOCGETSGCNT_IN6.

Eric Dumazet (2):
      econet: remove compiler warnings
      net: add kmemcheck annotation in __alloc_skb()

Eric W. Biederman (3):
      net: Fix ip link add netns oops
      net: Add compat ioctl support for the ipv4 multicast ioctl SIOCGETSGCNT
      net: Fix ipv6 neighbour unregister_sysctl_table warning

Francois Romieu (2):
      r8169: RxFIFO overflow oddities with 8168 chipsets.
      r8169: prevent RxFIFO induced loops in the irq handler.

Frank Blaschka (1):
      qeth: add more strict MTU checking

Herbert Xu (1):
      gro: Reset dev pointer on reuse

Ian Campbell (1):
      xen: netfront: handle incoming GSO SKBs which are not CHECKSUM_PARTIAL

Ivan Vecera (1):
      r8169: use RxFIFO overflow workaround for 8168c chipset.

Julia Lawall (1):
      include/net/genetlink.h: Allow genlmsg_cancel to accept a NULL argument

Ken Kawasaki (1):
      axnet_cs: reduce delay time at ei_rx_overrun

Kurt Van Dijck (1):
      net: fix validate_link_af in rtnetlink core

Linus Lüssing (1):
      batman-adv: Fix kernel panic when fetching vis data on a vis server

Luciano Coelho (1):
      MAINTAINERS: update information for the wl12xx driver

Mathias Krause (1):
      wl12xx: fix use after free

Michael S. Tsirkin (1):
      vhost: rcu annotation fixup

Mohammed Shafi Shajakhan (1):
      ath9k: Fix memory leak due to failed PAPRD frames

Oliver Hartkopp (1):
      slcan: fix referenced website in Kconfig help text

Pablo Neira Ayuso (3):
      netfilter: ctnetlink: fix missing refcount increment during dumps
      netfilter: arpt_mangle: fix return values of checkentry
      netfilter: ecache: always set events bits, filter them later

Pavel Emelyanov (1):
      bridge: Don't put partly initialized fdb into hash

Peter Chubb (1):
      tcp_ecn is an integer not a boolean

Rajkumar Manoharan (2):
      ath9k_hw: Fix system hang when resuming from S3/S4
      ath9k: Fix power save usage count imbalance on deinit

Roland Dreier (1):
      net: Add default_mtu() methods to blackhole dst_ops

Stanislaw Gruszka (3):
      ath9k: fix race conditions when stop device
      ath9k_htc: fix race conditions when stop device
      dl2k: nulify fraginfo after unmap

Stefan Weil (5):
      enc28j60: Fix reading of transmit status vector
      vxge: Fix wrong boolean operator
      isdn: icn: Fix potentially wrong string handling
      s390: Fix wrong size in memcmp (netiucv)
      s390: Fix possibly wrong size in strncmp (smsgiucv)

Sven Eckelmann (3):
      batman-adv: Remove vis info on hashing errors
      batman-adv: Remove vis info element in free_info
      batman-adv: Make vis info stack traversal threadsafe

Thomas Jacob (1):
      netfilter: xt_iprange: Incorrect xt_iprange boundary check for IPv6

Tom Herbert (1):
      net: Check rps_flow_table when RPS map length is 1

Ursula Braun (3):
      qeth: show new mac-address if its setting fails
      qeth: allow HiperSockets framesize change in suspend
      qeth: allow OSA CHPARM change in suspend state

Vasiliy Kulikov (2):
      net: can: at91_can: world-writable sysfs files
      net: can: janz-ican3: world-writable sysfs termination file

Vladislav Zolotarov (1):
      bnx2x: multicasts in NPAR mode

Yaniv Rosner (5):
      bnx2x: Remove setting XAUI low-power for BCM8073
      bnx2x: Fix LED blink rate on BCM84823
      bnx2x: Fix port swap for BCM8073
      bnx2x: Fix potential link loss in multi-function mode
      bnx2x: Update bnx2x version to 1.62.00-5

sjur.brandeland@stericsson.com (1):
      caif: bugfix - add caif headers for userspace usage.

 Documentation/networking/ip-sysctl.txt        |    2 +-
 MAINTAINERS                                   |   15 +--
 drivers/isdn/icn/icn.c                        |    3 +-
 drivers/net/atl1c/atl1c_main.c                |    1 +
 drivers/net/benet/be_main.c                   |    4 -
 drivers/net/bnx2x/bnx2x.h                     |    4 +-
 drivers/net/bnx2x/bnx2x_link.c                |   65 +++--------
 drivers/net/bnx2x/bnx2x_main.c                |   27 ++---
 drivers/net/can/Kconfig                       |    2 +-
 drivers/net/can/at91_can.c                    |    2 +-
 drivers/net/can/janz-ican3.c                  |    2 +-
 drivers/net/can/softing/Kconfig               |    2 +-
 drivers/net/depca.c                           |    6 +-
 drivers/net/dl2k.c                            |    4 +-
 drivers/net/enc28j60.c                        |    2 +-
 drivers/net/niu.c                             |   61 ++++++++---
 drivers/net/pcmcia/axnet_cs.c                 |    6 +-
 drivers/net/r8169.c                           |   41 ++++++--
 drivers/net/vxge/vxge-config.c                |    2 +-
 drivers/net/wireless/ath/ath5k/dma.c          |    4 +-
 drivers/net/wireless/ath/ath5k/pcu.c          |    4 +-
 drivers/net/wireless/ath/ath9k/ar9002_hw.c    |    3 +-
 drivers/net/wireless/ath/ath9k/htc_drv_init.c |    3 -
 drivers/net/wireless/ath/ath9k/htc_drv_main.c |   21 +++-
 drivers/net/wireless/ath/ath9k/init.c         |    7 +-
 drivers/net/wireless/ath/ath9k/main.c         |   19 +++-
 drivers/net/wireless/rtlwifi/efuse.c          |   40 ++++----
 drivers/net/wireless/wl12xx/spi.c             |    3 +-
 drivers/net/xen-netfront.c                    |   96 +++++++++++++++--
 drivers/s390/net/netiucv.c                    |    2 +-
 drivers/s390/net/qeth_core_main.c             |  149 +++++++++++++------------
 drivers/s390/net/qeth_l2_main.c               |    4 +-
 drivers/s390/net/smsgiucv.c                   |    2 +-
 drivers/vhost/net.c                           |    9 +-
 drivers/vhost/vhost.h                         |    6 +-
 include/linux/Kbuild                          |    1 +
 include/linux/caif/Kbuild                     |    2 +
 include/linux/mroute.h                        |    1 +
 include/linux/mroute6.h                       |    1 +
 include/net/genetlink.h                       |    3 +-
 include/net/netfilter/nf_conntrack_ecache.h   |    3 -
 include/net/sock.h                            |    2 +
 net/batman-adv/vis.c                          |   14 ++-
 net/bridge/br_fdb.c                           |    4 +-
 net/core/dev.c                                |    5 +-
 net/core/rtnetlink.c                          |    6 +-
 net/core/skbuff.c                             |    1 +
 net/econet/af_econet.c                        |    4 +-
 net/ipv4/af_inet.c                            |   16 +++
 net/ipv4/ipmr.c                               |   76 +++++++++++++
 net/ipv4/netfilter/arpt_mangle.c              |    6 +-
 net/ipv4/raw.c                                |   19 +++
 net/ipv4/route.c                              |    6 +
 net/ipv6/ip6mr.c                              |   75 +++++++++++++
 net/ipv6/raw.c                                |   19 +++
 net/ipv6/route.c                              |   10 +-
 net/ipv6/sysctl_net_ipv6.c                    |    9 ++-
 net/netfilter/nf_conntrack_ecache.c           |    3 +
 net/netfilter/nf_conntrack_netlink.c          |    1 +
 net/netfilter/xt_iprange.c                    |   16 +--
 60 files changed, 637 insertions(+), 289 deletions(-)
 create mode 100644 include/linux/caif/Kbuild

^ permalink raw reply	[flat|nested] 1437+ messages in thread
* [GIT] Networking
@ 2011-02-10 19:33 David Miller
  0 siblings, 0 replies; 1437+ messages in thread
From: David Miller @ 2011-02-10 19:33 UTC (permalink / raw)
  To: torvalds; +Cc: akpm, netdev, linux-kernel


1) Fix for x25 rmmod hang w/DEBUG_PAGE_ALLOC found by Randy Dunlap.

2) Fix for the hysdn "writes to const" bug, also found by Randy.

3) virtio_net napi_enable() fix from Bruce Rogers via Rusty.

4) Fix network device queue lockdep regression, we initialize the
   lockdep class (based upon dev->type) before we invoke setup()
   callback, which is where dev->type is actually set properly.

5) While fixing #4 I found a bug in net/caif wherein is uses
   the setup() function to create state that would need to
   be unwound on failure, which isn't possible in this context.

6) x25 leaks SKBs on bad facilities, fix from Andrew Hendry.

7) pch_gbe wedges when rx offload is set by ethtool, fix from Toshiharu Okada.

8) pch_can bug fixes from Tomoya MORINAGA.

9) batman-adv packet merging can crash on non-linear packets, fix from
   Sven Eckelmann.

10) Double SKB free fix in ath9k from Mohammed Shafi Shajakhan.

11) Mem leak in sis900 RX error path, from Jesper Juhl.

12) Fix mac80211 SKB clone check in TX path, from Felix Fietkau.

13) ixgbe header split erratum fix from Don Skidmore.

Please pull, thanks a lot!

The following changes since commit 6148a47ac3872092d4bc4888838bec6dff16654d:

  Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 (2011-02-09 16:56:33 -0800)

are available in the git repository at:

  master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git master

Ajit Khaparde (1):
      benet: Avoid potential null deref in be_cmd_get_seeprom_data()

Alexander Duyck (1):
      ixgbe: limit VF access to network traffic

Alexey Orishko (2):
      CDC NCM errata updates for cdc.h
      USB CDC NCM errata updates for cdc_ncm host driver

Bruce Rogers (1):
      virtio_net: Add schedule check to napi_enable call

Christian Lamparter (1):
      carl9170: fix typo in PS code

David S. Miller (8):
      Merge branch 'batman-adv/merge' of git://git.open-mesh.org/ecsv/linux-merge
      Merge branch 'master' of git://git.kernel.org/.../linville/wireless-2.6
      Merge branch 'master' of master.kernel.org:/.../jkirsher/net-2.6
      net/caif: Fix dangling list pointer in freed object on error.
      net: Fix lockdep regression caused by initializing netdev queues too early.
      Merge branch 'master' of git://git.kernel.org/.../kaber/nf-2.6
      isdn: hysdn: Kill (partially buggy) CVS regision log reporting.
      x25: Do not reference freed memory.

Don Fry (1):
      iwlagn: Re-enable RF_KILL interrupt when down

Don Skidmore (3):
      ixgbe: fix for 82599 erratum on Header Splitting
      ixgbe: cleanup variable initialization
      ixgbe: update version string

Emil Tantilov (1):
      ixgbe: fix variable set but not used warnings by gcc 4.6

Felix Fietkau (1):
      mac80211: fix the skb cloned check in the tx path

Florian Fainelli (1):
      e1000: add support for Marvell Alaska M88E1118R PHY

Jesper Juhl (2):
      wireless, wl1251: Fix potential NULL pointer dereference in wl1251_op_bss_info_changed()
      sis900: Fix mem leak in sis900_rx error path

Jesse Brandeburg (1):
      e1000e: tx_timeout should not increment for non-hang events

Johannes Berg (1):
      mac80211: fix TX status cookie in HW offload case

Michael Buesch (1):
      ssb-pcmcia: Fix parsing of invariants tuples

Mohammed Shafi Shajakhan (1):
      ath9k: Fix possible double free of PAPRD skb's

Pablo Neira Ayuso (1):
      netfilter: nf_conntrack: set conntrack templates again if we return NF_REPEAT

Randy Dunlap (1):
      can: softing_cs needs slab.h

Sven Eckelmann (1):
      batman-adv: Linearize fragment packets before merge

Tomoya (3):
      pch_can: fix 800k comms issue
      pch_can: fix rmmod issue
      pch_can: fix module reload issue with MSI

Tomoya MORINAGA (1):
      pch_can: fix tseg1/tseg2 setting issue

Toshiharu Okada (1):
      pch_gbe: Fix the issue which a driver locks when rx offload is set by ethtool

Vladislav Zolotarov (1):
      bnx2x: Duplication in promisc mode

Wey-Yi Guy (1):
      iwlagn: overwrite EEPROM chain setting for 6250 devices

andrew hendry (1):
      x25: possible skb leak on bad facilities

 drivers/isdn/hysdn/hysdn_defs.h         |    2 -
 drivers/isdn/hysdn/hysdn_init.c         |   26 +----
 drivers/isdn/hysdn/hysdn_net.c          |    3 -
 drivers/isdn/hysdn/hysdn_procconf.c     |    3 +-
 drivers/net/benet/be_cmds.c             |    5 +
 drivers/net/bnx2x/bnx2x_main.c          |   32 +++--
 drivers/net/can/pch_can.c               |    5 +-
 drivers/net/can/softing/softing_cs.c    |    1 +
 drivers/net/e1000/e1000_hw.c            |    4 +-
 drivers/net/e1000/e1000_hw.h            |    1 +
 drivers/net/e1000e/netdev.c             |    1 -
 drivers/net/ixgbe/ixgbe_common.c        |    3 +
 drivers/net/ixgbe/ixgbe_fcoe.c          |    2 +-
 drivers/net/ixgbe/ixgbe_main.c          |   16 ++-
 drivers/net/ixgbe/ixgbe_sriov.c         |    2 -
 drivers/net/ixgbe/ixgbe_x540.c          |    6 +-
 drivers/net/pch_gbe/pch_gbe_main.c      |   12 +-
 drivers/net/sis900.c                    |    1 +
 drivers/net/usb/cdc_ncm.c               |  227 ++++++++++++++++++++-----------
 drivers/net/virtio_net.c                |   27 ++--
 drivers/net/wireless/ath/ath9k/ath9k.h  |    2 +-
 drivers/net/wireless/ath/ath9k/main.c   |    2 -
 drivers/net/wireless/ath/ath9k/xmit.c   |    7 +-
 drivers/net/wireless/ath/carl9170/rx.c  |    2 +-
 drivers/net/wireless/iwlwifi/iwl-6000.c |    2 +
 drivers/net/wireless/iwlwifi/iwl-agn.c  |    6 +
 drivers/net/wireless/wl1251/main.c      |    3 +
 drivers/ssb/pcmcia.c                    |    2 +-
 include/linux/usb/cdc.h                 |   23 +++-
 net/batman-adv/unicast.c                |   15 ++-
 net/caif/chnl_net.c                     |    4 +-
 net/core/dev.c                          |   27 ++--
 net/mac80211/cfg.c                      |    2 +
 net/mac80211/ieee80211_i.h              |    2 +-
 net/mac80211/status.c                   |    7 +-
 net/mac80211/tx.c                       |    2 +-
 net/netfilter/nf_conntrack_core.c       |   11 ++-
 net/x25/x25_facilities.c                |   28 +++--
 net/x25/x25_in.c                        |   14 ++-
 net/x25/x25_link.c                      |    5 +-
 40 files changed, 342 insertions(+), 203 deletions(-)

^ permalink raw reply	[flat|nested] 1437+ messages in thread
* [GIT] Networking
@ 2011-02-18 21:52 David Miller
  0 siblings, 0 replies; 1437+ messages in thread
From: David Miller @ 2011-02-18 21:52 UTC (permalink / raw)
  To: torvalds; +Cc: akpm, netdev, linux-kernel


1) The on-stack list_head memory corruption fixes from Linus and Eric
   Dumazet.

2) ISDN hisax doesn't check alloc_skb() failures.

3) ieee80211_reconfig doesn't do necessary locking, fix from Eliad
   Peller.

4) Work around buffer size hw limitation in ixgbe driver, from Amir
   Hanania.

5) Fix crash in ixgbe driver due to NULL ptr deref, from Andy
   Gospodarek.

6) Fix crash in tcp_connect() due to blackhole dst_ops missing
   default_mss() method, fix from Eric Dumazet.

7) Multicast snooping list corruption et al. fixes in bridging from
   Herbert Xu.

8) NETDEV_NOTIFY_PEERS events should send gratuitous ARP unconditionally
   as it's used to trigger fail-over, from Ian Campbell.

9) xfrm_alloc_dst() can OOPS due to mis-coded conditional, from
   Hiroaki SHIMODA.

10) Several NULL deref fixes from Jesper Juhl in DCB, USB Net, USB HSO,
    and ATM Solos driver.

11) Device shutdown races and fixes in e1000e, from Jesse Brandeburg.

12) Fix CAN softing driver Kconfig deps, from Kurt Van Dijck.

13) Fix RCU usage in netfilter nf_iterate, from Patrick McHardy.

14) A cleanup change lost the setting of IPPROT_GRE value in the key
    used to lookup routes in ipgre_tunnel_xmit, fix from Steffen Klassert.

15) RX padding and MAC address loading fixes in pch_gbe driver from
    Toshiharu Okada.

16) If the firmward has control of the tg3 PHY, don't allow ioctl access
    otherwise we'll corrupt state.  Fix from Matt Carlson.

The following changes since commit a5bbef0b2deb7b943f095181309ecc9e1fc91c0f:

  Merge branch 'for-linus/bugfixes' of git://xenbits.xen.org/people/ianc/linux-2.6 (2011-02-18 12:44:41 -0800)

are available in the git repository at:

  master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git master

Amir Hanania (1):
      ixgbe: work around for DDP last buffer size

Andy Gospodarek (1):
      ixgbe: fix panic due to uninitialised pointer

Bao Liang (1):
      Bluetooth: Set conn state to BT_DISCONN to avoid multiple responses

Casey Leedom (4):
      cxgb4vf: Check driver parameters in the right place ...
      cxgb4vf: Behave properly when CONFIG_DEBUG_FS isn't defined ...
      cxgb4vf: Quiesce Virtual Interfaces on shutdown ...
      cxgb4vf: Use defined Mailbox Timeout

Cho, Yu-Chen (1):
      Bluetooth: add Atheros BT AR9285 fw supported

David S. Miller (5):
      hisax: Fix unchecked alloc_skb() return.
      Merge branch 'master' of git://git.kernel.org/.../kaber/nf-2.6
      Merge branch 'master' of git://git.kernel.org/.../linville/wireless-2.6
      iwlwifi: Delete iwl3945_good_plcp_health.
      isdn: hisax: Use l2headersize() instead of dup (and buggy) func.

Eliad Peller (1):
      mac80211: add missing locking in ieee80211_reconfig

Eric Dumazet (2):
      net: provide default_advmss() methods to blackhole dst_ops
      net: deinit automatic LIST_HEAD

Giuseppe Cavallaro (1):
      stmmac: enable wol via magic frame by default.

Herbert Xu (3):
      bridge: Fix mglist corruption that leads to memory corruption
      bridge: Fix timer typo that may render snooping less effective
      bridge: Replace mp->mglist hlist with a bool

Hiroaki SHIMODA (1):
      xfrm: avoid possible oopse in xfrm_alloc_dst

Ian Campbell (1):
      arp_notify: unconditionally send gratuitous ARP for NETDEV_NOTIFY_PEERS.

Ivan Vecera (1):
      drivers/net: Call netif_carrier_off at the end of the probe

Jesper Juhl (4):
      Don't potentially dereference NULL in net/dcb/dcbnl.c:dcbnl_getapp()
      USB Network driver infrastructure: Fix leak when usb_autopm_get_interface() returns less than zero in kevent().
      Net, USB, Option, hso: Do not dereference NULL pointer
      ATM, Solos PCI ADSL2+: Don't deref NULL pointer if net_ratelimit() and alloc_skb() interact badly.

Jesse Brandeburg (2):
      e1000e: check down flag in tasks
      e1000e: flush all writebacks before unload

John Fastabend (1):
      net: dcb: application priority is per net_device

John W. Linville (1):
      Merge branch 'master' of git://git.kernel.org/.../padovan/bluetooth-2.6

Kurt Van Dijck (1):
      net/can/softing: make CAN_SOFTING_CS depend on CAN_SOFTING

Linus Torvalds (1):
      net: dont leave active on stack LIST_HEAD

Matt Carlson (1):
      tg3: Restrict phy ioctl access

Patrick McHardy (1):
      netfilter: nf_iterate: fix incorrect RCU usage

Randy Dunlap (1):
      net: fix ifenslave build flags

Stanislaw Gruszka (1):
      iwl3945: remove plcp check

Steffen Klassert (1):
      ip_gre: Add IPPROTO_GRE to flowi in ipgre_tunnel_xmit

Toshiharu Okada (2):
      pch_gbe: Fix the issue that the receiving data is not normal.
      pch_gbe: Fix the MAC Address load issue.

 Documentation/networking/Makefile       |    2 +
 drivers/atm/solos-pci.c                 |    5 +-
 drivers/bluetooth/ath3k.c               |    2 +
 drivers/bluetooth/btusb.c               |    3 +
 drivers/isdn/hisax/isdnl2.c             |   28 ++++-----
 drivers/net/can/softing/Kconfig         |    2 +-
 drivers/net/cxgb4vf/cxgb4vf_main.c      |   80 ++++++++++++++++++------
 drivers/net/cxgb4vf/t4vf_hw.c           |    2 +-
 drivers/net/e1000e/netdev.c             |   52 ++++++++++++---
 drivers/net/forcedeth.c                 |    2 +
 drivers/net/ixgbe/ixgbe_fcoe.c          |   51 +++++++++++++++-
 drivers/net/ixgbe/ixgbe_fcoe.h          |    2 +
 drivers/net/ixgbe/ixgbe_main.c          |    6 +-
 drivers/net/pch_gbe/pch_gbe.h           |    2 +-
 drivers/net/pch_gbe/pch_gbe_main.c      |  104 ++++++++++++++++++------------
 drivers/net/r8169.c                     |    2 +
 drivers/net/stmmac/stmmac_main.c        |    4 +-
 drivers/net/tg3.c                       |    8 ++-
 drivers/net/usb/hso.c                   |   12 ++--
 drivers/net/usb/usbnet.c                |    4 +-
 drivers/net/wireless/iwlwifi/iwl-3945.c |   67 --------------------
 net/bluetooth/l2cap.c                   |    1 +
 net/bridge/br_input.c                   |    2 +-
 net/bridge/br_multicast.c               |   19 +++---
 net/bridge/br_private.h                 |    3 +-
 net/core/dev.c                          |    9 ++-
 net/dcb/dcbnl.c                         |    9 +++-
 net/ipv4/devinet.c                      |   30 ++++++---
 net/ipv4/ip_gre.c                       |    1 +
 net/ipv4/route.c                        |    1 +
 net/ipv6/route.c                        |    1 +
 net/mac80211/util.c                     |    2 +
 net/netfilter/core.c                    |    3 +-
 net/xfrm/xfrm_policy.c                  |    7 ++-
 34 files changed, 327 insertions(+), 201 deletions(-)

^ permalink raw reply	[flat|nested] 1437+ messages in thread
* [GIT] Networking
@ 2011-02-23 23:57 David Miller
  0 siblings, 0 replies; 1437+ messages in thread
From: David Miller @ 2011-02-23 23:57 UTC (permalink / raw)
  To: torvalds; +Cc: akpm, netdev, linux-kernel


1) Eric B.'s remaining on-stack list_head fixes.

2) inet_twsk_deschedule() called in wrong context, from Eric Dumazet.

3) sfc ethtool large stack usage exposes uninitialzed kernel data to
   user sometimes, from Eric Dumazet.

4) Packet scheduler private data needs to be long aligned, also from
   Eric Dumazet.

5) R8169 bug fixes from Hayes Wang via Francois Romieu.

6) Timewait socket fix in tproxy from Florian Westphal.

7) Someone actually tried to use the ipv6 multicast snooping support
   in bridging and it had lots of bugs.  All fixed by Linus Lüssing.
   a) packet header u16 access needs ntohs()
   b) parsing mldv2 packets at wrong offset
   c) MAC address creation for ipv6 is wrong
   d) multicast entries stored in table with ETH_P_IP instead of ETH_P_IPV6

8) DM9000B locking and PHY power fixes from Henry Nestler.

9) TCP's undo_retrans can go negative, fix from Yuchung Cheng.

10) cfg80211 deadlock fix from Daniel J Blueman

Please pull, thanks a lot.

The following changes since commit 4a508dd259f5995b8d31c576b894263f5947d654:

  Merge branch 'for-2639-rc4/i2c-fixes' of git://git.fluff.org/bjdooks/linux (2011-02-22 17:13:16 -0800)

are available in the git repository at:

  master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git master

Cho, Yu-Chen (1):
      Bluetooth: Add Atheros BT AR5BBU12 fw supported

Christian Lamparter (1):
      p54pci: update receive dma buffers before and after processing

Daniel J Blueman (1):
      fix cfg80211_wext_siwfreq lock ordering...

David S. Miller (3):
      Merge branch 'master' of git://git.kernel.org/.../kaber/nf-2.6
      Merge branch 'master' of git://git.kernel.org/.../linville/wireless-2.6
      Merge branch 'r8169-davem' of git://git.kernel.org/.../romieu/netdev-2.6

Eric Dumazet (3):
      tcp: fix inet_twsk_deschedule()
      sfc: lower stack usage in efx_ethtool_self_test
      net_sched: long word align struct qdisc_skb_cb data

Eric W. Biederman (1):
      net: Fix more stale on-stack list_head objects.

Florian Westphal (1):
      netfilter: tproxy: do not assign timewait sockets to skb->sk

Gertjan van Wingerde (1):
      rt2x00: Fix WPA TKIP Michael MIC failures.

Hayes Wang (3):
      r8169: fix incorrect args to oob notify.
      r8169: correct settings of rtl8102e.
      r8169: fix RTL8168DP power off issue.

Henry Nestler (2):
      DM9000B: Fix reg_save after spin_lock in dm9000_timeout
      DM9000B: Fix PHY power for network down/up

Jiri Bohac (1):
      sctp: fix reporting of unknown parameters

Joerg Marx (1):
      netfilter: ip6t_LOG: fix a flaw in printing the MAC

John Fastabend (1):
      net: dcb: match dcb_app protocol field with 802.1Qaz spec

John W. Linville (1):
      Merge branch 'master' of git://git.kernel.org/.../padovan/bluetooth-2.6

Linus Lüssing (7):
      bridge: Fix IPv6 multicast snooping by storing correct protocol type
      bridge: Fix IPv6 multicast snooping by correcting offset in MLDv2 report
      bridge: Add missing ntohs()s for MLDv2 report parsing
      ipv6: Add IPv6 multicast address flag defines
      bridge: Allow mcast snooping for transient link local addresses too
      bridge: Fix MLD queries' ethernet source address
      bridge: Use IPv6 link-local address for multicast listener queries

Mohammed Shafi Shajakhan (1):
      ath9k: Fix ath9k prevents CPU to enter C3 states

Nick Kossifidis (1):
      ath5k: Fix fast channel switching

Nikolay Ledovskikh (1):
      ath5k: Correct channel setting for AR2317 chip

Oliver Neukum (1):
      Bluetooth: fix crash with quirky dongles doing sound

Shahar Havivi (1):
      Added support for usb ethernet (0x0fe6, 0x9700)

Stanislaw Gruszka (1):
      mac80211: fix conn_mon_timer running after disassociate

Vladislav P (1):
      Bluetooth: Release BTM while sleeping to avoid deadlock

Xose Vazquez Perez (1):
      wireless: rt2x00: rt2800pci.c: add two ids

Yuchung Cheng (1):
      tcp: undo_retrans counter fixes

 drivers/bluetooth/ath3k.c               |    3 +
 drivers/bluetooth/btusb.c               |    7 +-
 drivers/net/dm9000.c                    |    9 +-
 drivers/net/r8169.c                     |   42 +++++----
 drivers/net/sfc/ethtool.c               |   22 +++--
 drivers/net/usb/dm9601.c                |    4 +
 drivers/net/wireless/ath/ath5k/phy.c    |  143 +++++++++++++++++++------------
 drivers/net/wireless/ath/ath9k/ath9k.h  |    6 --
 drivers/net/wireless/ath/ath9k/init.c   |    8 --
 drivers/net/wireless/ath/ath9k/main.c   |    8 --
 drivers/net/wireless/p54/p54pci.c       |   14 ++-
 drivers/net/wireless/rt2x00/rt2800pci.c |    8 ++
 drivers/net/wireless/rt2x00/rt2800usb.c |    6 ++
 include/linux/dcbnl.h                   |    2 +-
 include/net/ipv6.h                      |   12 +++
 include/net/netfilter/nf_tproxy_core.h  |   12 +---
 include/net/sch_generic.h               |    2 +-
 net/bluetooth/rfcomm/tty.c              |    2 +
 net/bridge/br_multicast.c               |   23 +++---
 net/ipv4/inet_timewait_sock.c           |    2 +
 net/ipv4/tcp_input.c                    |    5 +-
 net/ipv4/tcp_output.c                   |    2 +-
 net/ipv6/netfilter/ip6t_LOG.c           |    2 +-
 net/mac80211/iface.c                    |    1 +
 net/mac80211/mlme.c                     |    6 ++
 net/netfilter/nf_tproxy_core.c          |   27 +++---
 net/netfilter/xt_TPROXY.c               |   22 +++++-
 net/netfilter/xt_socket.c               |   13 +++-
 net/sched/sch_generic.c                 |    1 +
 net/sctp/sm_make_chunk.c                |   10 +-
 net/wireless/wext-compat.c              |    4 +-
 31 files changed, 258 insertions(+), 170 deletions(-)

^ permalink raw reply	[flat|nested] 1437+ messages in thread
* [GIT] Networking
@ 2011-03-03 22:34 David Miller
  0 siblings, 0 replies; 1437+ messages in thread
From: David Miller @ 2011-03-03 22:34 UTC (permalink / raw)
  To: torvalds; +Cc: akpm, netdev, linux-kernel


I have one ipv6 regression I'm still working on, but other
than that I think we look reasonably good.

1) skge carrier link state fix from Stephen Hemminger.

2) ipv6 sysctls operate on incorrect namespace sometimes, fix from
   Lucian Adrian Grijincu.

3) Add ID to carl9170 USB driver.

4) __hw_addr_del_multiple() passed wrong type into __hw_addr_del(), fix
   from Hagen Paul Pfeifer.

5) bnx2x fix to parity error blocking, from Vladislav Zolotarov.

6) netlink_dump() errors ignored and not properly propagated.  Fix from
   Andrey Vagin.

7) dnet and macb use platform_set_drvdata() on wrong object type, fixes
   from Jamie Iles and Ilya Yanok.

8) FEC driver platform_device_id table not terminated properly.

9) f_phonet get OOPS with highmem, fix from Rémi Denis-Courmont.

10) nla_policy_len() forgets to actually iterate policy pointer in loop,
    fix from Lars Ellenberg.

11) Missing checks in RX handling result in warnings from davinci_emac
    driver, fix from Vinay Hegde.

12) IPVS locking fix from Julian Anastasov.

13) DCCP gets oops on reset after close, fix from Gerrit Renker.

14) nf_log oops on bind with invalid nfproto value, fix from Jan
    Engelhardt.

15) Fix e1000e PHY wakeup for ICH10, from Bruce Allan.

16) dcbnl checks wrong OPS for NULL, fix from John Fastabend.

17) CNIC status block race and lost interrupt fix from Michael Chan.

18) RXRPC fixes from David Howells and Anton Blanchard, handle ACKALL
    packets which OpenAFS now emits, and fix regression in rxrpc_key
    layout.

19) Disable ASPM in r8169, causes lots of problems.

20) The usual peppering of small fixes via John Linville and the
    wireless crew.

Please pull, thanks a lot!

The following changes since commit cbdbb4c1d22e26f9d5314fefe6f2c7e5ed7f6a0f:

  Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 (2011-03-02 20:02:32 -0800)

are available in the git repository at:

  master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git master

Andrey Vagin (1):
      netlink: handle errors from netlink_dump()

Anton Blanchard (1):
      RxRPC: Fix v1 keys

Arnaldo Carvalho de Melo (1):
      dccp: Change maintainer

Axel Lin (1):
      net/fec: fix unterminated platform_device_id table

Bruce Allan (1):
      e1000e: disable broken PHY wakeup for ICH10 LOMs, use MAC wakeup instead

Christian Lamparter (1):
      p54usb: add Senao NUB-350 usbid

David Howells (1):
      AF_RXRPC: Handle receiving ACKALL packets

David S. Miller (3):
      Merge branch 'master' of git://git.kernel.org/.../linville/wireless-2.6
      Merge branch 'master' of git://git.kernel.org/.../kaber/nf-2.6
      Merge branch 'master' of master.kernel.org:/.../jkirsher/net-2.6

Dmitry Kravkov (5):
      bnx2x: (NPAR mode) Fix FW initialization
      bnx2x: Fix nvram test for single port devices.
      bnx2x: Fix ethtool -t link test for MF (non-pmf) devices.
      bnx2x: properly configure coefficients for MinBW algorithm (NPAR mode).
      bnx2x: update driver version to 1.62.00-6

Fry, Donald H (1):
      iwlagn: Support new 5000 microcode.

Gerrit Renker (1):
      dccp: fix oops on Reset after close

Hagen Paul Pfeifer (1):
      net: handle addr_type of 0 properly

Hegde, Vinay (1):
      davinci_emac: Add Carrier Link OK check in Davinci RX Handler

Ilya Yanok (1):
      dnet: fix wrong use of platform_set_drvdata()

Jamie Iles (1):
      macb: don't use platform_set_drvdata() on a net_device

Jan Engelhardt (1):
      netfilter: nf_log: avoid oops in (un)bind with invalid nfproto values

Jan Puk (1):
      carl9170: add Airlive X.USB a/b/g/n USBID

Jay Vosburgh (1):
      MAINTAINERS: Add Andy Gospodarek as co-maintainer.

Jeff Kirsher (1):
      igb: fix sparse warning

John Fastabend (1):
      net: dcbnl: check correct ops in dcbnl_ieee_set()

John W. Linville (1):
      Merge branch 'wireless-2.6' of git://git.kernel.org/.../iwlwifi/iwlwifi-2.6

Julian Anastasov (1):
      ipvs: fix dst_lock locking on dest update

Jussi Kivilinna (1):
      rndis_wlan: use power save only for BCM4320b

Justin Mattock (1):
      drivers:isdn:istream.c Fix typo pice to piece

Ken Kawasaki (1):
      fmvj18x_cs: add new id

Kurt Van Dijck (1):
      CAN: add controller hardware name for Softing cards

Lars Ellenberg (1):
      net: fix nla_policy_len to actually _iterate_ over the policy

Lucian Adrian Grijincu (1):
      sysctl: ipv6: use correct net in ipv6_sysctl_rtcache_flush

Michael Chan (2):
      cnic: Prevent status block race conditions with hardware
      cnic: Fix lost interrupt on bnx2x

Randy Dunlap (1):
      net: update Documentation/networking/00-INDEX

Rémi Denis-Courmont (1):
      f_phonet: avoid pskb_pull(), fix OOPS with CONFIG_HIGHMEM

Stanislaw Gruszka (2):
      ath9k: correct ath9k_hw_set_interrupts
      r8169: disable ASPM

Stephen Hemminger (2):
      skge: don't mark carrier down at start
      e1000: fix sparse warning

Sujith Manoharan (1):
      ath9k_htc: Fix an endian issue

Vladislav Zolotarov (3):
      bnx2x: Add a missing bit for PXP parity register of 57712.
      bnx2x: perform statistics "action" before state transition.
      bnx2x: properly calculate lro_mss

 Documentation/networking/00-INDEX        |    6 ---
 MAINTAINERS                              |    3 +-
 drivers/isdn/hardware/eicon/istream.c    |    2 +-
 drivers/net/bnx2x/bnx2x.h                |   28 +++++++-----
 drivers/net/bnx2x/bnx2x_cmn.c            |   65 +++++++++++++++++++++++------
 drivers/net/bnx2x/bnx2x_cmn.h            |   20 +++++++++
 drivers/net/bnx2x/bnx2x_ethtool.c        |   25 +++++------
 drivers/net/bnx2x/bnx2x_init.h           |    2 +-
 drivers/net/bnx2x/bnx2x_main.c           |   18 ++++++--
 drivers/net/bnx2x/bnx2x_stats.c          |    4 +-
 drivers/net/can/softing/softing_main.c   |    1 +
 drivers/net/cnic.c                       |   33 +++++++++++----
 drivers/net/davinci_emac.c               |    2 +-
 drivers/net/dnet.c                       |    3 +-
 drivers/net/e1000/e1000_osdep.h          |    3 +-
 drivers/net/e1000e/netdev.c              |    3 +-
 drivers/net/fec.c                        |    3 +-
 drivers/net/igbvf/vf.c                   |    2 +-
 drivers/net/macb.c                       |    2 +-
 drivers/net/pcmcia/fmvj18x_cs.c          |    1 +
 drivers/net/r8169.c                      |    6 +++
 drivers/net/skge.c                       |    3 -
 drivers/net/wireless/ath/ath9k/hif_usb.c |    9 ++--
 drivers/net/wireless/ath/ath9k/mac.c     |    5 +-
 drivers/net/wireless/ath/carl9170/usb.c  |    2 +
 drivers/net/wireless/iwlwifi/iwl-5000.c  |    2 +-
 drivers/net/wireless/p54/p54usb.c        |    1 +
 drivers/net/wireless/rndis_wlan.c        |    3 +
 drivers/tty/serial/serial_cs.c           |    1 +
 drivers/usb/gadget/f_phonet.c            |   15 +++++--
 include/keys/rxrpc-type.h                |    1 -
 lib/nlattr.c                             |    2 +-
 net/core/dev_addr_lists.c                |    2 +-
 net/dcb/dcbnl.c                          |    2 +-
 net/dccp/input.c                         |    7 +--
 net/ipv6/route.c                         |   17 +++++---
 net/netfilter/ipvs/ip_vs_ctl.c           |    4 +-
 net/netfilter/nf_log.c                   |    4 ++
 net/netlink/af_netlink.c                 |   18 ++++++--
 net/rxrpc/ar-input.c                     |    1 +
 40 files changed, 225 insertions(+), 106 deletions(-)

^ permalink raw reply	[flat|nested] 1437+ messages in thread
* [GIT] Networking
@ 2011-03-10 23:34 David Miller
  2011-03-10 23:49 ` Linus Torvalds
  0 siblings, 1 reply; 1437+ messages in thread
From: David Miller @ 2011-03-10 23:34 UTC (permalink / raw)
  To: torvalds; +Cc: akpm, netdev, linux-kernel


I think all the major known regressions are cured and we should be
ready to go for 2.6.38-final

1) Fix regression in IPV6 route lookups, cures BZ 29252 and 30462

2) We use ifa_address where we mean ifa_local in ipv4 stack,
   reported by Julian Anastasov.

3) pktgen time reporting units are wrong, fix from Daniel Turull

4) IPV6=m/BRIDGE=y results in broken build, fix from Randy Dunlap.

5) Network modloading security fix needs to handle ip6 tunnel case,
   fix from Stephen Hemminger.

6) bnx2x driver fixes from Dmitry Kravkov and Eilon Greenstein.

7) smsc911x drops full sized VLAN packets erroneously, fix from Göran
   Weinholt.

8) Fix Makefile logic for entering net/ipv6 directory for the case
   where we are only building {exthdrs,addrconf}_core.o Fix from
   Thomas Graf.

9) Multi-threaded signal handling is botched because we use plain
   mutex_lock() to synchronize readers in recvmsg(), change to use
   mutex_lock_interruptible().  Fix from Rainer Weikusat.

10) Bonding driver state machine locking doesn't cover enough code,
    fix from Nils Carlson.

12) Fix BUG_ON trigger in RDS stack, fix from Neil Horman.

13) Multicase handling fixes to r6040 driver from Shawn Lin.

Please pull, thanks a lot!

The following changes since commit 9179746652faf0aba07b8b7f770dcf29892a24c6:

  Merge branch 'media_fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 (2011-03-10 13:22:10 -0800)

are available in the git repository at:

  master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git master

Daniel Turull (1):
      pktgen: fix errata in show results

David S. Miller (3):
      ipv4: Fix erroneous uses of ifa_address.
      ipv6: Don't create clones of host routes.
      Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

Dmitry Kravkov (4):
      bnx2x: fix non-pmf device load flow
      bnx2x: fix link notification
      bnx2x: (NPAR) prevent HW access in D3 state
      bnx2x: fix MaxBW configuration

Florian Fainelli (1):
      r6040: bump to version 0.27 and date 23Feb2011

Göran Weinholt (1):
      net/smsc911x.c: Set the VLAN1 register to fix VLAN MTU problem

Jon Mason (1):
      vxge: update MAINTAINERS

Neil Horman (1):
      rds: prevent BUG_ON triggering on congestion map updates

Nicolas Kaiser (1):
      drivers/net/macvtap: fix error check

Nils Carlson (2):
      bonding 802.3ad: Fix the state machine locking v2
      bonding 802.3ad: Rename rx_machine_lock to state_machine_lock

Rainer Weikusat (1):
      net: fix multithreaded signal handling in unix recv routines

Randy Dunlap (1):
      net: bridge builtin vs. ipv6 modular

Shawn Lin (1):
      r6040: fix multicast operations

Thomas Graf (1):
      net: Enter net/ipv6/ even if CONFIG_IPV6=n

j223yang@asset.uwaterloo.ca (1):
      ariadne: remove redundant NULL check

stephen hemminger (1):
      ip6ip6: autoload ip6 tunnel

 MAINTAINERS                       |    5 +-
 drivers/net/ariadne.c             |    5 --
 drivers/net/bnx2x/bnx2x.h         |    5 +-
 drivers/net/bnx2x/bnx2x_cmn.c     |   22 +++++++
 drivers/net/bnx2x/bnx2x_cmn.h     |    9 +++
 drivers/net/bnx2x/bnx2x_ethtool.c |   18 +++---
 drivers/net/bnx2x/bnx2x_main.c    |   19 +++---
 drivers/net/bonding/bond_3ad.c    |   32 ++++++----
 drivers/net/bonding/bond_3ad.h    |    3 +-
 drivers/net/macvtap.c             |    3 +-
 drivers/net/r6040.c               |  115 +++++++++++++++++++++----------------
 drivers/net/smsc911x.c            |    5 ++
 net/Makefile                      |    4 +-
 net/bridge/Kconfig                |    1 +
 net/core/pktgen.c                 |    2 +-
 net/ipv4/devinet.c                |    6 +-
 net/ipv6/ip6_tunnel.c             |    1 +
 net/ipv6/route.c                  |    4 +-
 net/rds/ib_send.c                 |    5 +-
 net/rds/loop.c                    |   11 +++-
 net/unix/af_unix.c                |   17 ++++-
 21 files changed, 182 insertions(+), 110 deletions(-)

^ permalink raw reply	[flat|nested] 1437+ messages in thread
* [GIT] Networking
@ 2011-03-16 21:21 David Miller
  0 siblings, 0 replies; 1437+ messages in thread
From: David Miller @ 2011-03-16 21:21 UTC (permalink / raw)
  To: torvalds-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b
  Cc: akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b,
	netdev-u79uwXL29TY76Z2rM5mHXA,
	linux-wireless-u79uwXL29TY76Z2rM5mHXA,
	netfilter-devel-u79uwXL29TY76Z2rM5mHXA,
	linux-bluetooth-u79uwXL29TY76Z2rM5mHXA,
	linux-kernel-u79uwXL29TY76Z2rM5mHXA

[-- Warning: decoded text below may be mangled --]
[-- Attachment #0: Type: Text/Plain; charset=utf-8, Size: 181391 bytes --]


I just did a test merge of this work into your tree and it went without
any conflicts, so it should go easy for you too.

1) The long awaited addition of Jozsef Kadlecsik's totally awesome
   "ipset" to netfilter.

2) Several major changes to our routing infrastructure:

   a) Routing metrics are stored in inetpeer cache and are COW'able.

   b) PMTU and redirect information can be stored in the inetpeer
      cache as well.  IPV4 is fully converted over to this scheme.

      Changes 'a' and 'b' are significant because it paves the way
      to be able to legitimately remove the ipv4 routing cache once
      we can get the FIB backend efficient enough.

   c) Route flow lookup keys and compacted, and optimized for the
      individual address families.  On ipv4 this means the (often
      on-stack) flow keys are 32 bytes in size, instead of the
      whopping 60 bytes they used to be.

   d) Instead of returning an error code, and writing the resulting
      route entry pointer on the callers stack by reference, we
      return error encoded pointers instead.

   e) We had two ipv4 routing table lookup algorithms, selected
      at compile time, one based upon a set of hash tables and
      another based upon the LC-trie data structure.  After many
      years it is time to stop having two sets of code to update
      when fixes or API changes take place, and settle on the
      LC-trie.  fib_hash has therefore been completely removed.

   f) Several optimizations to the slow paths of IPV4 routing lookups,
      in particular caching of per-nexthop source address selection
      values in the FIB table entries.

   g) The routing cache entry data structure, struct rtable, has
      been completely stripped of extraneous and unnecessary members.

3) The initial TCP congestion window is increased to 10, as per
   draft-hkchu-tcpm-initcwnd-01

4) Multi-threaded sending on UDP sockets are significantly improved
   by eliminating the use of shared socket state in the non-cork
   cases of I/O.  From Herbert Xu.

5) Several fixes to the Hystart mechanism of CUBIC TCP congestion
   control.  From Stephem Hemminger, Sangtae Ha, and Lucas Nussbaum.

6) Many cleanups and improvements to IPVS support in netfilter from
   Simon Horman, Julian Anastasov, and many others.

7) Add the XEN network backend driver, from Ian Campbell.

8) Numerous cleanups, simplifications, and fixes to the TIPC stack
   from Allan Stephens and Paul Gortmaker.

9) Support for extended sequence numbers in IPSEC, from Steffen
   Klassert.

10) Socket filters can now be used with AF_UNIX sockets.  From
    Alban Crequy.

11) Socket filter running no longer blocks softirqs, as they are fully
    re-entrant and lock-less.  From Eric Dumazet.

12) Support for network device groups, which allows manipulation of
    settings on a group basis, from Vlad Dogaru.

13) Add HW based qos support, in that we can now use the skb->priority
    field to steer packets to individual HW TX queues.  From John
    Fastabend.

14) Convert PPP away from direct SKB list implementation details as
    much as possible, with much help from Paul Mackerras.

15) RPS can now be accelerated directly in hardware, thanks to
    Ben Hutchings.

16) New packet schedulers, CHOKe and SFB, From Stephen Hemminger and
    Eric Dumazet.

17) Consolidation of how bonding binds master and slave devices, as well	
    as how RX packet processing works.  From Jiri Pirko and others.

18) Harmonization of network device checksum offload setting
    management, from Michał Mirosław.

19) Support correlated packet loss support to the network emulator
    packet scheduler, from Stephen Hemminger and based upon work done
    by Stefano Salsano and Fabio Ludovici.

20) An entry in the ip_tos2prio[] table has been wrong for ~8 years :-)
    Thanks to Dan Siemon and Eric Dumazet.

21) As usual the wired and wireless developers have been busy little
    bees fixing bugs, improving performance, and adding new features.
    See the changelog for details.

Please pull, thanks a lot.

The following changes since commit 76ca07832842100b14a31ad8996dab7b0c28aa42:

  Merge branch 'for-linus' of git://xenbits.xen.org/people/sstabellini/linux-pvhvm (2011-03-15 10:59:09 -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 (23):
      be2net: While configuring QOS for VF, pass proper domain id
      be2net: endianness fix in be_cmd_set_qos().
      be2net: Use domain id when be_cmd_if_destroy is called.
      be2net: Initialize and cleanup sriov resources only if pci_enable_sriov has succeeded.
      be2net: call be_vf_eth_addr_config() after register_netdev
      be2net: Cleanup the VF interface handles
      be2net: For the VF MAC, use the OUI from current MAC address
      be2net: pass domain numbers for pmac_add/del functions
      be2net: Allow VFs to call be_cmd_reset_function.
      be2net: Fix broken priority setting when vlan tagging is enabled.
      be2net: pass proper hdr_size while flashing redboot.
      be2net: fix be_suspend/resume/shutdown
      be2net: gracefully handle situations when UE is detected
      be2net: detect a UE even when a interface is down.
      be2net: restrict WOL to PFs only.
      be2net: add new counters to display via ethtool stats
      be2net: fixes in ethtool selftest
      be2net: variable name change
      be2net: fix to ignore transparent vlan ids wrongly indicated by NIC
      be2net: add code to display temperature of ASIC
      be2net: use hba_port_num instead of port_num
      be2net: Copyright notice change. Update to Emulex instead of ServerEngines
      be2net: Bump up the version number

Alban Crequy (2):
      af_unix: implement socket filter
      af_unix: coding style: remove one level of indentation in unix_shutdown()

Alessio Igor Bogani (2):
      rtlwifi: Add the missing rcu_read_lock/unlock
      rtlwifi: fix places where uninitialized data is used

Alexander Duyck (1):
      ixgbe: balance free_irq calls with request_irq calls

Allan Stephens (42):
      tipc: Combine port structure with tipc_port structure
      tipc: Combine bearer structure with tipc_bearer structure
      tipc: Remove unused global variable tipc_user_count
      tipc: Prevent invalid memory access when sending to configuration service
      tipc: Improve handling of invalid link tolerance values
      tipc: Fix print statements that assume pointers are 32-bit values
      tipc: Clean out all remaining instances of #if 0'd unused code
      tipc: Clean up tracking of node requesting a broadcast retransmit
      tipc: Eliminate unnecessary locking when starting topology service
      tipc: Improve accuracy of link transmit queue maximum size statistic
      tipc: Set unused probe field of link protocol messages to defined value
      tipc: Minor optimization to topology service connection establishment
      tipc: Fix port counter handling to correct congestion control
      tipc: Add in missing lock during link initialization
      tipc: Remove support for per-connection message sequence numbering
      tipc: Remove unused message header field for requested number of links
      tipc: Avoid reliable broadcast preparation for NACK messages
      tipc: Allow receiving into iovec containing multiple entries
      tipc: Correct broadcast link peer info when displaying links
      tipc: Add network address mask helper routines
      tipc: Prevent null pointer error when removing a node subscription
      tipc: Cosmetic changes to node subscription code
      tipc: Add support for SO_RCVTIMEO socket option
      tipc: Fix problem with missing link in "tipc-config -l" output
      tipc: Split up unified structure of network-related variables
      tipc: Eliminate configuration for maximum number of cluster nodes
      tipc: Convert node object array to a hash table
      tipc: manually inline net_start/stop, make assoc. vars static
      tipc: Eliminate timestamp from link protocol messages
      tipc: make msg_set_redundant_link() consistent with other set ops
      tipc: Fix redundant link field handling in link protocol message
      tipc: Cosmetic changes to neighbor discovery logic
      tipc: Give Tx of discovery responses priority over link messages
      tipc: Optimizations to link creation code
      tipc: Correct misnamed references to neighbor discovery domain
      tipc: Remove unused field in bearer structure
      tipc: Eliminate unnecessary constant for neighbor discovery msg size
      tipc: Don't respond to neighbor discovery request on blocked bearer
      tipc: Remove bearer flag indicating existence of broadcast address
      tipc: Eliminate remaining support for routing table messages
      tipc: Eliminate obsolete routine for handling routed messages
      tipc: Update maintenance information

Amerigo Wang (5):
      bonding: sync netpoll code with bridge
      netpoll: remove IFF_IN_NETPOLL flag
      bond: service netpoll arp queue on master device
      bonding: use the correct size for _simple_hash()
      bonding: move procfs code into bond_procfs.c

Anand Gadiyar (2):
      Bluetooth: fix build break on hci_sock.c
      Bluetooth: remove unnecessary call to hci_sock_cleanup

Anders Berggren (2):
      net: TX timestamps for IPv6 UDP packets
      igb: fix hw timestamping

Anderson Briglia (1):
      Bluetooth: Fix LE conn creation

Andrei Emeltchenko (3):
      Bluetooth: Use non-flushable by default L2CAP data packets
      Bluetooth: Do not use assignments in IF conditions
      Bluetooth: fix crash by disabling tasklet in sock accept

Andrei Warkentin (1):
      Bluetooth: Make hci a child of the corresponding tty device.

Andy Gospodarek (2):
      ixgbe: fix compile failure in ixgbe_init_mbx_params_pf
      bonding: enable netpoll without checking link status

Ariel Elior (1):
      bnx2x: fix swap of rx-ticks and tx-ticks parameters in interrupt coalescing flow

Arik Nemtsov (33):
      wl12xx: Add AP related configuration to conf_drv_settings
      wl12xx: AP mode - AP specific CMD_CONFIGURE sub-commands
      wl12xx: AP mode - add AP specific event
      wl12xx: AP-mode high level commands
      wl12xx: AP mode - workaround for FW bug on station remove
      wl12xx: AP mode - init sequence
      wl12xx: AP specific RX filter configuration
      wl12xx: Add AP related definitions to HOST-FW interface
      wl12xx: Configure AP on BSS info change
      wl12xx: AP mode config in ieee80211_ops.config
      wl12xx: AP mode - change filter config
      wl12xx: AP mode - add STA add/remove ops
      wl12xx: AP mode - changes in TX path
      wl12xx: AP mode - record TX configuration settings
      wl12xx: AP mode - encryption support
      wl12xx: AP mode - fetch appropriate firmware for AP
      wl12xx: Read MAC address from NVS file on HW startup
      wl12xx: Enable AP-mode
      wl12xx: add missing MODULE_FIRMWARE statment for AP-mode FW
      wl12xx: Add channel 14 to list of supported 2ghz channels
      mac80211: do not calc frame duration when using HW rate-control
      mac80211: add HW flag for disabling auto link-PS in AP mode
      mac80211: pass up beacons from external BSS when operating as AP
      wl12xx: avoid blocking while holding rcu lock on bss info change
      wl12xx: fix potential race condition with TX queue watermark
      wl12xx: AP-mode - fix race condition on sta connection
      wl12xx: AP-mode - TX queue per link in AC
      wl12xx: report invalid TX rate when returning non-TX-ed skbs
      wl12xx: AP-mode - support HW based link PS monitoring
      wl12xx: AP mode - fix bug in cleanup of wl1271_op_sta_add()
      wl12xx: AP-mode - count free FW TX blocks per link
      wl12xx: AP-mode - management of links in PS-mode
      wl12xx: wakeup chip from ELP during scan

Atita Shirwaikar (1):
      ixgbe: Adding 100MB FULL support in ethtool

Bala Shanmugam (1):
      Bluetooth: Add firmware support for Atheros 3012

Baruch Siach (1):
      phy/micrel: add ability to support 50MHz RMII clock on KZS8051RNL

Ben Dooks (1):
      DM9000: Allow randomised ethernet address

Ben Greear (32):
      mac80211: Show max retry-counts in kernel messages.
      ath9k: Fix up hardware mode and beacons with multiple vifs.
      mac80211: Fix skb-copy failure debug message.
      ath9k: Show some live tx-queue values in debugfs.
      ath9k: Initialize ah->hw
      ath9k: Add more information to debugfs xmit file.
      ath9k: Remove un-used member from ath_node.
      ath9k: Ensure xmit makes progress.
      ath9k: Add counters to distinquish AMPDU enqueues.
      ath9k: Keep track of stations for debugfs.
      ath9k: More xmit queue debugfs information.
      ath9k: Restart xmit logic in xmit watchdog.
      ath9k: Add 'misc' file to debugfs, fix queue indexes.
      ath9k: Try more than one queue when scheduling new aggregate.
      mac80211: Add sdata state and flags to debugfs.
      mac80211: Be more careful when changing channels.
      mac80211: Show configured channel-type in netdev debugfs.
      mac80211: Warn users if HT fails because of freq mismatch.
      ath9k: Show channel type and frequency in debugfs.
      mac80211: Recalculate channel-type on iface removal.
      mac80211: Optimize scans on current operating channel.
      mac80211: Make some mlme timers module paramaters.
      ath9k: Print channel-type in chan-change dbg message.
      mac80211: Properly set work-item channel-type.
      mac80211: Allow scanning on existing channel-type.
      mac80211: Allow work items to use existing channel type.
      ath9k: Add debug info for configuring power level.
      mac80211: Ensure power-level set properly for scanning.
      network: Allow af_packet to transmit +4 bytes for VLAN packets.
      mac80211: Add power to debugfs.
      ath9k: Fix txq memory address printing in debugfs.
      ath5k: Put hardware in PROMISC mode if there is more than 1 stations.

Ben Hutchings (18):
      genirq: Add IRQ affinity notifiers
      lib: cpu_rmap: CPU affinity reverse-mapping
      net: RPS: Enable hardware acceleration of RFS
      sch_mqprio: Always set num_tc to 0 in mqprio_destroy()
      net: Adjust TX queue kobjects if number of queues changes during unregister
      sfc: Move TX queue core queue mapping into tx.c
      sfc: Distinguish queue lookup from test for queue existence
      sfc: Add TX queues for high-priority traffic
      net: RPS: Make hardware-accelerated RFS conditional on NETIF_F_NTUPLE
      sfc: Limit filter search depth further for performance hints (i.e. RFS)
      sfc: Implement hardware acceleration of RFS
      sfc: Read MC firmware version when requested through ethtool
      sfc: Do not read STAT1.FAULT in efx_mdio_check_mmd()
      sfc: Update copyright dates
      sfc: Expose TX push and TSO counters through ethtool statistics
      sfc: Remove configurable FIFO thresholds for pause frame generation
      sfc: Bump version to 3.1
      sfc: Use write-combining to reduce TX latency

Bernard Pidoux (2):
      ROSE: rose AX25 packet routing improvement
      ROSE: AX25: finding routes simplification

Bhupesh Sharma (1):
      can: c_can: Added support for Bosch C_CAN controller

Bing Zhao (1):
      ieee80211: add IEEE80211_COUNTRY_STRING_LEN definition

Bob Copeland (3):
      ath5k: use tracing for packet tx/rx dump
      ath5k: remove debug_dump_skb() functions
      ath5k: move external function definitions to a header file

Bruce Allan (13):
      e1000e: reduce scope of some variables, remove unnecessary ones
      e1000e: Use kmemdup rather than duplicating its implementation
      e1000e: replace unbounded sprintf with snprintf
      e1000e: use correct pointer when memcpy'ing a 2-dimensional array
      e1000e: return appropriate errors for 'ethtool -r'
      e1000e: use dev_kfree_skb_irq() instead of dev_kfree_skb()
      e1000e: magic number cleanup - ETH_ALEN
      e1000e: extend timeout for ethtool link test diagnostic
      e1000e: extend EEE LPI timer to prevent dropped link
      e1000e: do not toggle LANPHYPC value bit when PHY reset is blocked
      e1000e: disable jumbo frames on 82579 when MACsec enabled in EEPROM
      e1000e: do not suggest the driver supports Wake-on-ARP
      e1000e: bump version number

Bruno Randolf (14):
      cfg80211: Extend channel to frequency mapping for 802.11j
      ath5k: Use mac80211 channel mapping function
      ath5k: Rename ath5k_copy_channels
      ath5k: Add 802.11j 4.9GHz channels to allowed channels
      ath5: Remove unused CTL definitions
      ath5k: Remove unused sc->curmode
      ath5k: Remove redundant sc->curband
      ath5k: Simplify loop when setting up channels
      ath5k: ath5k_setup_channels cleanup and whitespace
      ath5k: Use local variable for capabilities
      ath: Add function to check if 4.9GHz channels are allowed
      ath5k: Enable 802.11j 4.9GHz frequencies
      ath9k: Remove unused IEEE80211_WEP_NKID
      ath5k: Fix short and long retry configuration

Carolyn Wyborny (12):
      igb: Add support for i340 Quad Port Fiber Adapter
      igb: Enable PF side of SR-IOV support for i350 devices
      igb: Update Intel copyright notice for driver source.
      igb: update version string
      igb: Fix reg pattern test in ethtool for i350 devices
      igb: Fix strncpy calls to be safe per source code review tools
      igb: Add stats output for OS2BMC feature on i350 devices
      igb: Add Energy Efficient Ethernet (EEE) for i350 devices.
      igb: Update NVM functions to work with i350 devices
      igb: Add DMA Coalescing feature to driver
      igb: Bump version to 3.0.6
      igb: Add messaging for thermal sensor events on i350 devices

Changli Gao (22):
      netfilter: nf_conntrack: don't always initialize ct->proto
      netfilter: xt_NFQUEUE: remove modulo operations
      netfilter: ct_extend: fix the wrong alloc_size
      netfilter: nf_conntrack: define ct_*_info as needed
      netfilter: nf_nat: don't use atomic bit operation
      netfilter: ct_extend: define NF_CT_EXT_* as needed
      netfilter: nf_nat: define nat_pptp_info as needed
      netfilter: nf_nat: fix conversion to non-atomic bit ops
      netfilter: nf_conntrack: remove an atomic bit operation
      netfilter: nf_nat: place conntrack in source hash after SNAT is done
      netfilter: ipvs: fix compiler warnings
      netfilter: ipvs: fix compiler warnings
      ipvs: use hlist instead of list
      ipvs: use enum to instead of magic numbers
      ipvs: unify the formula to estimate the overhead of processing connections
      llc: avoid skb_clone() if there is only one handler
      bonding: remove the unused dummy functions when net poll controller isn't enabled
      bonding: COW before overwriting the destination MAC address
      netfilter: xt_connlimit: fix daddr connlimit in SNAT scenario
      netfilter: xt_connlimit: use kmalloc() instead of kzalloc()
      netfilter: xt_connlimit: use hlist instead
      netfilter: xt_connlimit: remove connlimit_rnd_inited

Chaoming Li (1):
      rtlwifi: Fix error registering rate-control

Christian Lamparter (11):
      carl9170: update fw/hw headers
      carl9170: enable wake-on-lan feature testing
      carl9170: utilize fw seq counter for mgmt/non-QoS data frames
      mac80211: fix race between next beacon dtim and ieee80211_get_buffered_bc
      p54: sort channel list by frequency instead of channel index
      p54: p54_generate_band cleanup
      p54: enhance rssi->dBm database import
      p54spi: update sample eeprom
      p54: implement flush callback
      ar9170usb: mark the old driver as obsolete
      p54: implement set_coverage_class

Claudio Takahasi (3):
      Bluetooth: Add LE signaling commands handling
      Bluetooth: Add connection parameter update response
      Bluetooth: Send LE Connection Update Command

Dan Carpenter (6):
      wl12xx: use after free in debug code
      IPVS: precedence bug in ip_vs_sync_switch_mode()
      mac80211: remove unneeded check
      wl12xx: change type from u8 to int
      iwlwifi: remove duplicate initialization
      libertas: fix write past end of array in mesh_id_get()

Dan Siemon (1):
      net_sched: fix ip_tos2prio

Daniel Baluta (1):
      af_unix: update locking comment

Daniel Halperin (1):
      mac80211: update minstrel_ht sample rate when probe is set

Daniel Lezcano (1):
      macvlan : fix checksums error when we are in bridge mode

Daniel Turull (1):
      pktgen: bug fix in transmission headers with frags=0

David Gnedt (6):
      wl1251: fix queue stopping/waking for TX path
      wl1251: fix 4-byte TX buffer alignment
      wl1251: enable beacon early termination while in power-saving mode
      wl1251: implement connection quality monitoring
      wl1251: enable adhoc mode
      wl1251: set rate index and preamble flag on received packets

David S. Miller (204):
      Merge branch 'master' of master.kernel.org:/.../davem/net-2.6
      Merge branch 'master' of git://git.kernel.org/.../kaber/nf-next-2.6
      ppp: Clean up kernel log messages.
      ppp: Reconstruct fragmented packets using frag lists instead of copying.
      net: Add safe reverse SKB queue walkers.
      ppp: Use SKB queue abstraction interfaces in fragment processing.
      Merge branch 'master' of master.kernel.org:/.../jkirsher/net-next-2.6
      Merge branch 'master' of master.kernel.org:/.../davem/net-2.6
      Merge branch 'irq/numa' of git://git.kernel.org/.../tip/linux-2.6-tip
      typhoon: Kill references to UTS_RELEASE
      Merge branch 'master' of master.kernel.org:/.../davem/net-2.6
      net: Implement read-only protection and COW'ing of metrics.
      inetpeer: Add metrics storage to inetpeer entries.
      inetpeer: Mark metrics as "new" in fresh inetpeer entries.
      Merge branch 'master' of master.kernel.org:/.../davem/net-2.6
      net: Store ipv4/ipv6 COW'd metrics in inetpeer cache.
      Merge branch 'master' of ssh://master.kernel.org/.../linville/wireless-next-2.6
      net: Pre-COW metrics for TCP.
      ipv4: Allocate fib metrics dynamically.
      ipv4: Attach FIB info to dst_default_metrics when possible
      ipv4: If fib metrics are default, no need to grab ref to FIB info.
      Merge branch 'master' of git://git.kernel.org/.../kaber/nf-next-2.6
      Merge branch 'master' of master.kernel.org:/.../davem/net-2.6
      Merge branch 'batman-adv/next' of git://git.open-mesh.org/ecsv/linux-merge
      ipv4: Remember FIB alias list head and table in lookup results.
      ipv4: Consolidate all default route selection implementations.
      ipv4: Remove fib_hash.
      ipv4: Update some fib_hash centric interface names.
      ipv4: Rename fib_hash_* locals in fib_semantics.c
      Merge branch 'master' of git://git.kernel.org/.../kaber/nf-next-2.6
      tcp: Increase the initial congestion window to 10.
      ipv4: Fix fib_trie build in some configurations.
      sch_choke: Need linux/vmalloc.h
      Merge branch 'master' of git://git.kernel.org/.../linville/wireless-next-2.6
      Merge branch 'master' of master.kernel.org:/.../davem/net-2.6
      ipv4: Don't miss existing cached metrics in new routes.
      inetpeer: Move ICMP rate limiting state into inet_peer entries.
      tcp: Add reference to initial CWND ietf draft.
      Merge branch 'master' of git://git.kernel.org/.../linville/wireless-next-2.6
      net: Remove bogus barrier() in dst_allfrag().
      net: Kill NETEVENT_PMTU_UPDATE.
      Merge branch 'master' of master.kernel.org:/.../davem/net-2.6
      Merge branch 'master' of git://git.kernel.org/.../kaber/nf-next-2.6
      inetpeer: Abstract address representation further.
      inetpeer: Add redirect and PMTU discovery cached info.
      inet: Create a mechanism for upward inetpeer propagation into routes.
      Merge branch 'master' of master.kernel.org:/.../jkirsher/net-next-2.6
      Merge branch 'batman-adv/next' of git://git.open-mesh.org/ecsv/linux-merge
      ipv4: Cache learned PMTU information in inetpeer.
      ipv4: Cache learned redirect information in inetpeer.
      Merge branch 'fec' of git://git.pengutronix.de/git/ukl/linux-2.6
      Merge branch 'for-davem' of git://git.kernel.org/.../bwh/sfc-next-2.6
      ipv4: Simplify output route creation call sequence.
      ipv4: Move rcu_read_{lock,unlock}() into ip_route_output_slow().
      ipv4: Consolidate ipv4 dst allocation logic.
      net: Add initial_ref arg to dst_alloc().
      ipv4: Avoid use of signed integers in fib_trie code.
      ipv4: Mark fib_combine_itag()'s 'res' arg as const.
      ipv4: Use const'ify fib_result deep in the route call chains.
      ipv4: Add hash table of interface addresses.
      ipv4: Implement __ip_dev_find using new interface address hash.
      Merge branch 'master' of master.kernel.org:/.../davem/net-2.6
      Merge branch 'fec' of git://git.pengutronix.de/git/ukl/linux-2.6
      Merge branch 'for-davem' of git://git.kernel.org/.../bwh/sfc-next-2.6
      Merge branch 'net/ax88796' of git://git.pengutronix.de/git/mkl/linux-2.6
      xfrm: Mark flowi arg const in key extraction helpers.
      xfrm: Mark flowi arg to ->get_tos() const.
      xfrm: Mark flowi arg to ->fill_dst() const.
      xfrm: Mark flowi arg to ->init_tempsel() const.
      xfrm: Mark flowi arg to xfrm_type->reject() const.
      xfrm: Mark token args to addr_match() const.
      xfrm: Mark flowi arg to xfrm_selector_match() const.
      xfrm: Mark flowi arg to security_xfrm_state_pol_flow_match() const.
      xfrm: Mark flowi arg to xfrm_state_look_at() const.
      xfrm: Mark flowi arg to xfrm_init_tempstate() const.
      xfrm: Mark flowi arg to xfrm_state_find() const.
      net: Mark flowi arg to flow_cache_uli_match() const.
      xfrm: Kill strict arg to xfrm_bundle_ok().
      xfrm: Mark flowi arg to xfrm_policy_{lookup_by_type,match}() const.
      xfrm: Mark flowi arg to xfrm_expand_policies() const.
      xfrm: Mark flowi arg to xfrm_tmpl_resolve{,_one}() const.
      xfrm: Mark flowi arg to xfrm_bundle_create() const.
      xfrm: Mark flowi arg to xfrm_dst_{alloc_copy,update_origin}() const.
      xfrm: Mark flowi arg to xfrm_resolve_and_create_bundle() const.
      net: Make flow cache paths use a const struct flowi.
      Merge branch 'tipc-Feb23-2011' of git://git.kernel.org/.../paulg/net-next-2.6
      xfrm: Pass km_event pointers around as const when possible.
      xfrm: Const'ify tmpl and address arguments to ->init_temprop()
      xfrm: Const'ify selector argument to xfrm_selector_match()
      xfrm: Const'ify address arguments to ->dst_lookup()
      xfrm: Const'ify address arguments to __xfrm_dst_lookup()
      xfrm: Const'ify address arguments to xfrm_addr_cmp()
      xfrm: Const'ify address argument to xfrm_addr_any()
      xfrm: Const'ify pointer args to migrate_tmpl_match and xfrm_migrate_check
      xfrm: Const'ify pointer args to km_migrate() and implementations.
      xfrm: Const'ify address args to hash helpers.
      xfrm: Const'ify selector args in xfrm_migrate paths.
      xfrm: Const'ify local xfrm_address_t pointers in xfrm_policy_lookup_bytype.
      xfrm: Const'ify policy arg and local selector in xfrm_policy_match.
      xfrm: Const'ify policy arg to xp_net.
      xfrm: Const'ify policy arg to clone_policy.
      xfrm: Const'ify selector arg to xfrm_dst_update_parent.
      xfrm: Const'ify xfrm_tmpl and xfrm_state args to xfrm_state_addr_cmp.
      xfrm: Const'ify ptr args to xfrm_state_*_check and xfrm_state_kern.
      xfrm: Const'ify ptr args to xfrm_state_ok.
      xfrm: Const'ify ptr args to xfrm_policy_ok.
      xfrm: Const'ify sec_path arg to secpath_has_nontransport.
      xfrm: Const'ify xfrm_address_t args to xfrm_*_hash.
      xfrm: Const'ify xfrm_tmpl arg to xfrm_init_tempstate.
      xfrm: Const'ify xfrm_address_t args to __xfrm_state_lookup{,_byaddr}.
      xfrm: Remove unused 'saddr' and 'daddr' args to xfrm_state_look_at.
      xfrm: Const'ify xfrm_address_t args to xfrm_state_find.
      ipv4: Rearrange how ip_route_newports() gets port keys.
      Merge branch 'master' of master.kernel.org:/.../jkirsher/net-next-2.6
      Merge branch 'for-davem' of git://git.kernel.org/.../linville/wireless-next-2.6
      sch_netem: Need to include vmalloc.h
      rtlwifi: Need to include vmalloc.h
      phonet: Protect pipe_do_remove() with appropriate ifdefs.
      pfkey: Use const where possible.
      xfrm: Pass name as const to xfrm_*_get_byname().
      xfrm: Pass const arg to xfrm_alg_len and xfrm_alg_auth_len.
      xfrm: Pass const xfrm_address_t objects to xfrm_state_lookup* and xfrm_find_acq.
      xfrm: Pass const xfrm_mark to xfrm_mark_put().
      net: Forgot to commit net/core/dev.c part of Jiri's ->rx_handler patch.
      Merge branch 'for-davem' of git://git.kernel.org/.../bwh/sfc-next-2.6
      ipv6: Consolidate route lookup sequences.
      ipv4: Can final ip_route_connect() arg to boolean "can_sleep".
      ipv4: Make final arg to ip_route_output_flow to be boolean "can_sleep"
      net: Add FLOWI_FLAG_CAN_SLEEP.
      ipv4: Kill can_sleep arg to ip_route_output_flow()
      ipv6: Change final dst lookup arg name to "can_sleep"
      xfrm: Kill XFRM_LOOKUP_WAIT flag.
      ipv6: Normalize arguments to ip6_dst_blackhole().
      xfrm: Handle blackhole route creation via afinfo.
      ipv4: Make icmp route lookup code a bit clearer.
      ipv6: Make icmp route lookup code a bit clearer.
      Merge branch 'master' of git://git.kernel.org/.../kaber/nf-next-2.6
      xfrm: Return dst directly from xfrm_lookup()
      ipv4: Make output route lookup return rtable directly.
      ipv4: ip_route_output_key() is better as an inline.
      ipv4: Fix crash in dst_release when udp_sendmsg route lookup fails.
      ipv4: Fix __ip_dev_find() to use ifa_local instead of ifa_address.
      Merge branch 'master' of master.kernel.org:/.../jkirsher/net-next-2.6
      ipv6: Use ERR_CAST in addrconf_dst_alloc.
      Merge branch 'master' of master.kernel.org:/.../davem/net-2.6
      Merge branch 'for-davem' of ssh://master.kernel.org/.../linville/wireless-next-2.6
      ipv4: Optimize flow initialization in output route lookup.
      ipv4: Get peer more cheaply in rt_init_metrics().
      ipv4: Use passed-in protocol in ip_route_newports().
      ipv4: Set rt->rt_iif more sanely on output routes.
      ipv4: Remove flowi from struct rtable.
      Merge branch 'batman-adv/next' of git://git.open-mesh.org/ecsv/linux-merge
      ipv4: Validate route entry type at insert instead of every lookup.
      ipv4: Inline fib_semantic_match into check_leaf
      Merge branch 'davem-next.r8169' of git://git.kernel.org/.../romieu/netdev-2.6
      ipv4: Cache source address in nexthop entries.
      ipv4: Fix scope value used in route src-address caching.
      Merge branch 'master' of master.kernel.org:/.../jkirsher/net-next-2.6
      Merge branch 'for-davem' of git://git.kernel.org/.../bwh/sfc-next-2.6
      inetpeer: Don't disable BH for initial fast RCU lookup.
      ipv4: Lookup multicast routes by rtable using helper.
      ipv4: Optimize flow initialization in input route lookup.
      ipv4: Optimize flow initialization in fib_validate_source().
      Merge branch 'master' of master.kernel.org:/.../davem/net-2.6
      ipv4: Remove redundant RCU locking in ip_check_mc().
      ipv4: Remove unnecessary test from ip_mkroute_input()
      ipv4: Kill flowi arg to fib_select_multipath()
      Merge branch 'for-davem' of git://git.kernel.org/.../linville/wireless-next-2.6
      Merge branch 'master' of master.kernel.org:/.../jkirsher/net-next-2.6
      ipv4: Create and use route lookup helpers.
      net: Remove unnecessary padding in struct flowi
      xfrm: Eliminate "fl" and "pol" args to xfrm_bundle_ok().
      net: Put flowi_* prefix on AF independent members of struct flowi
      net: Create struct flowi_common
      net: Create union flowi_uli
      net: Make flowi ports AF dependent.
      net: Break struct flowi out into AF specific instances.
      net: Add flowiX_to_flowi() shorthands.
      ipv4: Pass ipv4 flow objects into fib_lookup() paths.
      ipv4: Use struct flowi4 internally in routing lookups.
      ipv4: Use flowi4 in public route lookup interfaces.
      ipv4: Use flowi4 in FIB layer.
      ipv4: Use flowi4 in ipmr code.
      netfilter: Use flowi4 in nf_nat_standalone.c
      ipv4: Use flowi4 in UDP
      netfilter: Use flowi4 and flowi6 in nf_conntrack_h323_main
      netfilter: Use flowi4 and flowi6 in xt_TCPMSS
      net: Add flowi6_* member helper macros.
      net: Use flowi4 and flowi6 in xfrm layer.
      ipv4: Kill fib_semantic_match declaration from fib_lookup.h
      net: Put fl4_* macros to struct flowi4 and use them again.
      ipv6: Convert to use flowi6 where applicable.
      net: Put fl6_* macros to struct flowi6 and use them again.
      decnet: Convert to use flowidn where applicable.
      Merge branch 'tipc-Mar13-2011' of git://git.kernel.org/.../paulg/net-next-2.6
      Merge branch 'tipc-Mar14-2011' of git://git.kernel.org/.../paulg/net-next-2.6
      Merge branch 'master' of git://git.kernel.org/.../kaber/nf-next-2.6
      Merge branch 'for-davem' of git://git.kernel.org/.../linville/wireless-next-2.6
      Merge branch 'master' of master.kernel.org:/.../jkirsher/net-next-2.6
      Merge branch 'irq/numa' of git://git.kernel.org/.../tip/linux-2.6-tip
      Merge branch 'master' of master.kernel.org:/.../davem/net-2.6
      Merge branch 'master' of git://git.kernel.org/.../linville/wireless-2.6
      Merge branch 'stable/backends' of git://git.kernel.org/.../konrad/xen
      Merge branch 'master' of git://git.kernel.org/.../kaber/nf-next-2.6

Denis Kirjanov (1):
      sungem: Use net_device's internal stats

Dimitris Michailidis (1):
      cxgb{3,4}*: improve Kconfig dependencies

Domenico Andreoli (2):
      CS89x0: Finish transition to CS89x0_NONISA_IRQ
      CS89x0: Add networking support for QQ2440

Don Skidmore (7):
      ixgbe: fix namespace issue with ixgbe_dcb_txq_to_tc
      ixgbe: cleanup namespace complaint by removing little used function
      ixgbe: cleanup ixgbe_init_mbx_params_pf namespace issue
      ixgbe: cleanup X540 PHY reset function pointer
      ixgbe: add function pointer for semaphore function
      ixgbe: cleanup copyright string for 2011
      ixgbe: fix missing function pointer conversion

Eliad Peller (14):
      wl12xx: remove redundant debugfs_remove_recursive() call
      wl12xx: fix some sparse warnings
      wl12xx: don't join upon disassociation
      wl12xx: fix some endianess bugs
      wl12xx: wrong values are returned in gpio_power_write()
      wl12xx: disable auto-arp
      wl12xx: mcp2.5 - add config_ps acx
      wl12xx: move to new firmware (6.1.3.50.49)
      wl12xx: use the conf struct instead of macros for memory configuration
      wl12xx: set supported_rates after association
      wl12xx: fix identification of beacon packets (debug)
      wl12xx: declare support for IEEE80211_HW_REPORTS_TX_ACK_STATUS
      wl12xx: use standard ALIGN() macro
      wl12xx: always set mac_address when configuring ht caps

Emil Tantilov (28):
      ixgbe: cleanup wake on LAN defines
      ixgbe: cleanup logic related to HW semaphores
      ixgbe: set media type for 82599 T3 LOM
      ixgbe: Add ability to double reset on failure to clear master enable
      ixgbe: cleanup code in ixgbe_identify_sfp_module_generic
      ixgbe: Check link wants report current link state
      ixgbe: add polling test to end of PHY reset
      ixgbe: Fill out PCIe speed and width enums with values
      ixgbe: Bounds checking for set_rar, clear_rar, set_vmdq, clear_vmdq
      ixgbe: rework ixgbe MTA handling to not drop packets
      ixgbe: Drop unused code for setting up unicast addresses
      ixgbe: Specific check for 100 Full link speed
      ixgbe: Numerous whitespace / formatting cleanups
      ixgbe: store permanent address before initializing Rx addresses
      ixgbe: cleanup handling of I2C interface to PHY
      e1000e: fix build issue due to undefined reference to crc32_le
      ixgbe: cleanup PHY init
      ixgbe: clear correct counters for flow control on 82599
      ixgbe: Add x540 statistic counter definitions
      ixgbe: Enable flow control pause parameter auto-negotiation support
      ixgbe: add function description
      ixgbe: improve logic in ixgbe_init_mbx_params_pf
      ixgbe: fix spelling errors
      ixgbe: fix setting and reporting of advertised speeds
      ixgb: convert to new VLAN model
      ixgbe: remove timer reset to 0 on timeout
      ixgbe: update PHY code to support 100Mbps as well as 1G/10G
      ixgbe: correct typo in define name

Eric Dumazet (38):
      netfilter: add __rcu annotations
      netfilter: nf_ct_frag6_sysctl_table is static
      netfilter: add __rcu annotations
      netfilter: nf_nat_amanda: rename a variable
      netfilter: rcu sparse cleanups
      ipvs: add static and read_mostly attributes
      ipvs: remove shadow rt variable
      netfilter: nf_conntrack: one less atomic op in nf_ct_expect_insert()
      netfilter: x_table: speedup compat operations
      netfilter: ipt_CLUSTERIP: remove "no conntrack!"
      net: filter: dont block softirqs in sk_run_filter()
      net_sched: cleanups
      netfilter: add a missing include in nf_conntrack_reasm.c
      net: dev_close_many() is static
      net_sched: sfq: allow divisor to be a parameter
      net_sched: move TCQ_F_THROTTLED flag
      net_sched: RCU conversion of stab
      net: ipv6: sit: fix rcu annotations
      neigh: __rcu annotations
      ipv6: raw: rcu annotations
      net: netif_setup_tc() is static
      net_sched: TCQ_F_CAN_BYPASS generalization
      pktgen: speedup fragmented skbs
      net_sched: sch_mqprio: dont leak kernel memory
      net: fix dev_seq_next()
      drivers/net: remove some rcu sparse warnings
      ipv4: fix rcu lock imbalance in fib_select_default()
      net: add __rcu annotations to sk_wq and wq
      net_sched: SFB flow scheduler
      sch_choke: add choke_skb_cb
      net_sched: reduce fifo qdisc size
      benet: use GFP_KERNEL allocations when possible
      inetpeer: seqlock optimization
      inetpeer: should use call_rcu() variant
      ftmac100: use GFP_ATOMIC allocations where needed
      xen: netfront: fix xennet_get_ethtool_stats()
      xfrm: fix __xfrm_route_forward()
      e1000e: fix kconfig for crc32 dependency

Felix Fietkau (33):
      ath9k: fix bogus sequence number increases on aggregation tid flush
      ath9k: fix initial sequence number after starting an ampdu session
      ath9k: reinitialize block ack window data when starting aggregation
      ath9k: reduce the likelihood of baseband hang check false positives
      ath9k_hw: partially revert "fix dma descriptor rx error bit parsing"
      ath9k: try more than one tid when scheduling a new aggregate
      ath9k: fix excessive BAR sending when a frame exceeds its retry limit
      mac80211: drop non-auth 3-addr data frames when running as a 4-addr station
      ath9k: remove a bogus error message
      ath9k_hw: replace magic values in register writes with proper defines
      ath9k: fix misplaced debug code
      ath9k: clean up the code that wakes the mac80211 queues
      ath9k: remove the virtual wiphy debugfs interface
      ath9k: remove support for virtual wiphys
      ath9k: remove the bf->aphy field
      ath9k: fold struct ath_wiphy into struct ath_softc
      ath9k: fix tx queue index confusion in debugfs code
      ath9k: use split rx buffers to get rid of order-1 skb allocations
      ath9k: fix compile error in non-debug ath_debug_stat_tx() stub
      mac80211: do not send duplicate data frames to the cooked monitor interface
      ath9k: add additional checks for the baseband hang detection
      mac80211: as a 4-addr station, do not receive packets for other stations
      p54: fix a NULL pointer dereference bug
      ath9k: use generic mac80211 LED blinking code
      cfg80211: add a field for the bitrate of the last rx data packet from a station
      mac80211: add support for showing the last rx bitrate
      ath9k: remove support for the FIF_PROMISC_IN_BSS filter flag
      ath9k_hw: fix REG_SET_BIT and REG_CLR_BIT for multiple bits
      ath9k: fix stopping tx dma on reset
      ath9k: fix the .flush driver op implementation
      ath9k: improve reliability of beacon transmission and stuck beacon handling
      mac80211: fix channel type recalculation with HT and non-HT interfaces
      ath9k: fix aggregation related interoperability issues

Florian Fainelli (1):
      r6040: bump to version 0.27 and date 23Feb2011

Florian Westphal (10):
      netfilter: ebt_ip6: allow matching on ipv6-icmp types/codes
      netfilter: Kconfig: NFQUEUE is useless without NETFILTER_NETLINK_QUEUE
      netfilter: nfnetlink_queue: return error number to caller
      netfilter: nfnetlink_queue: do not free skb on error
      netfilter: reduce NF_VERDICT_MASK to 0xff
      netfilter: allow NFQUEUE bypass if no listener is available
      netfilter: do not omit re-route check on NF_QUEUE verdict
      netfilter: nfnetlink_log: remove unused parameter
      netfilter: ipt_addrtype: rename to xt_addrtype
      netfilter: xt_addrtype: ipv6 support

Francois Romieu (1):
      r8169: convert to new VLAN model.

Frank Blaschka (1):
      qeth: change some configurations defaults

Fry, Donald H (2):
      iwlagn: Support new 1000 microcode.
      iwlagn: report correct temperature for WiFi/BT devices.

Frédéric Leroy (1):
      netfilter: xt_CLASSIFY: add ARP support, allow CLASSIFY target on any table

Gabor Juhos (1):
      rt2x00: fix whitespace damage in the rt2800 specific code

George (9):
      rtlwifi: Add usb driver
      rtlwifi: Add headers for rtl8187cu
      rtlwifi: rtl8192cu: Add routines dm, fw, led and sw
      rtlwifi: rtl8192cu: Add routine hw
      rtlwifi: rtl8192cu: Add routine mac
      rtlwifi: rtl8192cu: Add routine phy
      rtlwifi: rtl8192cu: Add routine rf
      rtlwifi: rtl8192cu: Add routine table
      rtlwifi: rtl8192cu: Add routine trx

Gertjan van Wingerde (7):
      rt2x00: Fix WPA TKIP Michael MIC failures.
      rt2x00: Copy the MAC address to the WCID entry properly.
      rt2x00: Fix FIXME comments in rt61pci and rt73usb on Michael MIC.
      rt2x00: Don't treat ATIM queue as second beacon queue.
      rt2x00: Include ATIM queue support in rt2x00queue_get_tx_queue.
      rt2x00: Optimize getting the beacon queue structure.
      rt2x00: Remove unused rt2x00queue_get_queue function.

Gery Kahn (1):
      wl12xx: update PLT initialization for new firmware

Grazvydas Ignotas (2):
      wl1251: remove wl1251_ps_set_elp function
      wl1251: fix elp_work race condition

Greg Rose (7):
      ixgbe: Enable Jumbo Frames on the X540 10Gigabit Controller
      ixgbevf: Enable jumbo frame support for X540 VF
      ixgbevf: Fix name of function in function header comment
      ixgbevf: Fix Compiler Warnings
      ixgbe: X540 Cleanup
      ixgbevf: Fix Version String
      ixgbevf: Fix Driver String

Guo-Fu Tseng (9):
      jme: Extract main and sub chip revision
      jme: PHY Power control for new chip
      jme: Fix bit typo of JMC250A2 workaround
      jme: Rename phyfifo function for easier understand
      jme: Fix hardware action of full-duplex
      jme: Safer MAC processor reset sequence
      jme: Refill receive unicase MAC addr after resume
      jme: Don't show UDP Checksum error if HW misjudged
      jme: Advance driver version

Gustavo F. Padovan (29):
      Merge branch 'master' of git://git.kernel.org/.../padovan/bluetooth-2.6 into wireless
      Bluetooth: Fix setting of MTU for ERTM and Streaming Mode
      Bluetooth: Rename l2cap.c to l2cap_core.c
      Bluetooth: Initial work for L2CAP split.
      Bluetooth: move l2cap_sock_ops to l2cap_sock.c
      Bluetooth: move l2cap_sock_release() to l2cap_sock.c
      Bluetooth: move l2cap_sock_bind()/listen() to l2cap_sock.c
      Bluetooth: move l2cap_sock_accept() to l2cap_sock.c
      Bluetooth: move l2cap_sock_getname() to l2cap_sock.c
      Bluetooth: move l2cap_sock_setsockopt() to l2cap_sock.c
      Bluetooth: move l2cap_sock_getsockopt() to l2cap_sock.c
      Bluetooth: move l2cap_sock_connect() to l2cap_sock.c
      Bluetooth: move l2cap_sock_recvmsg() to l2cap_sock.c
      Bluetooth: move l2cap_sock_shutdown() to l2cap_sock.c
      Bluetooth: move l2cap_sock_sendmsg() to l2cap_sock.c
      Bluetooth: move L2CAP sock timers function to l2cap_sock.c
      Bluetooth: move l2cap_sock_kill() to l2cap_sock.c
      Bluetooth: move __l2cap_sock_close() to l2cap_sock.c
      Bluetooth: update Bluetooth daemon name in Kconfig help
      Bluetooth: Merge L2CAP and SCO modules into bluetooth.ko
      Bluetooth: remove l2cap_load() hack
      Bluetooth: Add L2CAP mode to debugfs output
      Bluetooth: Use usb_fill_int_urb()
      Bluetooth: Fix crash when ioctl(HCIUARTSETPROTO) fails
      Bluetooth: fix errors reported by checkpatch.pl
      Bluetooth: Fix errors reported by checkpatch.pl
      Bluetooth: fix checkpatch errors in af_bluetooth.c
      Bluetooth: Remove duplicated BT_INFO() from L2CAP
      Bluetooth: Fix BT_L2CAP and BT_SCO in Kconfig

Guy Eilam (1):
      wl12xx: change debug_level module param sysfs permissions

Hagen Paul Pfeifer (10):
      dccp: newdp is declared/assigned but never be used
      ipv6: totlen is declared and assigned but not used
      ipv6: hash is calculated but not used afterwards
      ipv6: variable next is never used in this function
      ipv6: ignore rtnl_unicast() return code
      sched: protocol only needed when CONFIG_NET_CLS_ACT is enabled
      mcast: net_device dev not used
      af_packet: struct socket declared/assigned but unused
      sctp: several declared/set but unused fixes
      af_unix: remove unused struct sockaddr_un cruft

Hans Schillstrom (31):
      IPVS: Backup, Prepare for transferring firewall marks (fwmark) to the backup daemon.
      IPVS: Split ports[2] into src_port and dst_port
      IPVS: skb defrag in L7 helpers
      IPVS: Handle Scheduling errors.
      IPVS: Backup, Adding structs for new sync format
      IPVS: Backup, Adding Version 1 receive capability
      IPVS: Backup, Change sending to Version 1 format
      IPVS: Backup, adding version 0 sending capabilities
      IPVS: netns, add basic init per netns.
      IPVS: netns to services part 1
      IPVS: netns awarness to lblcr sheduler
      IPVS: netns awarness to lblc sheduler
      IPVS: netns, prepare protocol
      IPVS: netns preparation for proto_tcp
      IPVS: netns preparation for proto_udp
      IPVS: netns preparation for proto_sctp
      IPVS: netns preparation for proto_ah_esp
      IPVS: netns, use ip_vs_proto_data as param.
      IPVS: netns, common protocol changes and use of appcnt.
      IPVS: netns awareness to ip_vs_app
      IPVS: netns awareness to ip_vs_est
      IPVS: netns awareness to ip_vs_sync
      IPVS: netns, ip_vs_stats and its procfs
      IPVS: netns, connection hash got net as param.
      IPVS: netns, ip_vs_ctl local vars moved to ipvs struct.
      IPVS: netns, defense work timer.
      IPVS: netns, trash handling
      IPVS: netns, svc counters moved in ip_vs_ctl,c
      IPVS: netns, misc init_net removal in core.
      IPVS: netns, final patch enabling network name space.
      IPVS netns BUG, register sysctl for root ns

Hayes Wang (2):
      r8169: adjust rtl8169_set_speed_xmii function.
      r8169: support the new chips for RTL8105E.

Helmut Schaa (34):
      rt2x00: Refactor beacon code to make use of start- and stop_queue
      rt2x00: Introduce beacon_update_locked that requires caller locking
      rt2x00: Limit beacon updates in bss_info_changed to USB devices
      rt2x00: Make periodic beacon updates for PCI devices atomic
      rt2x00: Introduce tasklets for interrupt handling
      rt2x00: Disable txstatus tasklet by default
      rt2x00: Convert rt2800pci to use tasklets
      rt2x00: Convert rt61pci to use tasklets
      rt2x00: Convert rt2500pci interrupt handling to use tasklets
      rt2x00: Convert rt2400pci interrupt handling to use tasklets
      rt2x00: Remove interrupt thread registration
      rt2x00: Remove STATE_RADIO_IRQ_OFF_ISR and STATE_RADIO_IRQ_ON_ISR
      rt2x00: Update MAINTAINERS
      mac80211: Remove superfluous if clause
      rt2x00: Minor optimization for devices with RTS/CTS offload
      Revert "rt2x00 : avoid timestamp for monitor injected frame."
      rt2x00: Remove superfluos empty line
      wl12xx: Correctly set up protection if non-GF STAs are present
      rt2x00: Optimize calls to rt2x00queue_get_queue
      rt2x00: Make use of unlikely during tx status processing
      rt2x00: Remove useless NULL check
      rt2x00: Add unlikely macro to special case tx status handling
      rt2x00: Use unlikely for unexpected error condition in rt2x00_mac_tx
      rt2x00: Generate sw sequence numbers only for devices that need it
      rt2x00: Optimize TX descriptor handling
      rt2x00: Move TX descriptor field "ifs" into plcp substruct
      rt2x00: Don't call ieee80211_get_tx_rate for MCS rates
      rt2x00: Use an enum instead of u16 for the rate_mode TX descriptor field
      rt2x00: Fix rt2800 key assignment in multi bssid setups
      rt2x00: Remove now unused crypto.aid field
      rt2x00: Revise irqmask locking for PCI devices
      rt2x00: Fix comment in rt2800pci
      mac80211: Remove redundant preamble and RTS flag setup in minstrel_ht
      mac80211: Shortcut minstrel_ht rate setup for non-MRR capable devices

Henry Ptasinski (1):
      wireless-next-2.6: brcm80211: fix compile issue

Herbert Xu (6):
      inet: Remove unused sk_sndmsg_* from UFO
      inet: Remove explicit write references to sk/inet in ip_append_data
      inet: Add ip_make_skb and ip_finish_skb
      udp: Switch to ip_finish_skb
      udp: Add lockless transmit path
      inet: Replace left-over references to inet->cork

Hiroaki SHIMODA (1):
      ipv4: Fix PMTU update.

Ian Campbell (3):
      xen/irq: implement bind_interdomain_evtchn_to_irqhandler for backend drivers
      xen: netfront: ethtool stats fields should be unsigned long
      xen network backend driver

Ido Yariv (9):
      wl12xx: Don't rely on runtime PM for toggling power
      wl12xx: Remove private headers in wl1271_tx_reset
      wl12xx: Reorder data handling in irq_work
      wl12xx: Do end-of-transactions transfers only if needed
      wl12xx: Change claiming of the SDIO bus
      wl12xx: Switch to a threaded interrupt handler
      wl12xx: Switch to level trigger interrupts
      wl12xx: Avoid redundant TX work
      wl12xx: Modify requested number of memory blocks

Ilpo Järvinen (1):
      tcp: document tcp_max_ssthresh (Limited Slow-Start)

Ivan Vecera (2):
      bna: use device model DMA API
      be2net: use device model DMA API

Ivo van Doorn (3):
      rt2x00: Kill all tasklets during device removal
      rt2x00: Move TX/RX work into dedicated workqueue
      rt2x00: Optimize TX descriptor memory layout

Jan Beulich (1):
      small adjustment to net/mac80211/Kconfig

Jan Engelhardt (13):
      netfilter: xt_LOG: do print MAC header on FORWARD
      netfilter: xtables: use guarded types
      netfilter: xt_comment: drop unneeded unsigned qualifier
      netfilter: xtables: add missing aliases for autoloading via iptables
      audit: export symbol for use with xt_AUDIT
      netfilter: xtables: use __uXX guarded types for userspace exports
      netfilter: xtables: add missing header files to export list
      netfilter: xtables: connlimit revision 1
      netfilter: xtables: remove extraneous header that slipped in
      netfilter: xtables: remove duplicate member
      netfilter: xtables: add missing header inclusions for headers_check
      netfilter: xt_connlimit: pick right dstaddr in NAT scenario
      netfilter: xt_conntrack: warn about use in raw table

Jason Young (1):
      mac80211: do not enable ps if 802.1x controlled port is unblocked

Jay Sternberg (1):
      iwlwifi: correct debugfs data dumped from sram

Jeff Kirsher (1):
      e1000e: convert to stats64

Jeongtae Park (1):
      smsc911x: Fix build error when SMSC_TRACE() used

Jesper Juhl (3):
      Bluetooth: Fix failure to release lock in read_index_list()
      batman-adv: Remove two duplicate includes.
      IPVS: Fix variable assignment in ip_vs_notrack

Jiri Olsa (1):
      netfilter: nf_conntrack: nf_conntrack snmp helper

Jiri Pirko (15):
      veth: remove unneeded ifname code from veth_newlink()
      bonding: fix return value of couple of store functions
      net: remove the unnecessary dance around skb_bond_should_drop
      net: make dev->master general
      rtnetlink: implement setting of master device
      bond: implement [add/del]_slave ops
      bridge: implement [add/del]_slave ops
      net: convert bonding to use rx_handler
      net: allow handlers to be processed for orig_dev
      fcoe: correct checking for bonding
      bonding: register slave pointer for rx_handler
      net: get rid of multiple bond-related netdevice->priv_flags
      bonding: wrap slave state work
      bonding: get rid of IFF_SLAVE_INACTIVE netdev->priv_flag
      net: introduce rx_handler results and logic around that

Jiri Slaby (2):
      NET: cdc-phonet, fix stop-queue handling
      NET: cdc-phonet, handle empty phonet header

Joe Gunn (1):
      orinoco: Drop scan results with unknown channels

Joe Perches (7):
      tun: Convert logging messages to pr_<level> and tun_debug
      tlan: Remove changelog
      tlan: Use pr_fmt, pr_<level> and netdev_<level>
      mv643xx_eth: Use netdev_<level> and pr_<level>
      mii: Convert printks to netdev_info
      eql: Convert printks to pr_<level> and netdev_<level>
      netdevice: Convert printk to pr_info in netif_tx_stop_queue

Joel A Fernandes (1):
      mac80211: Rewrote code for checking if destinations are proxied.

Johan Hedberg (33):
      Bluetooth: Implement automatic setup procedure for local adapters
      Bluetooth: Add support for management powered event
      Bluetooth: Add support for set_powered management command
      Bluetooth: Add support for set_discoverable management command
      Bluetooth: Add set_connectable management command
      Bluetooth: Unify mode related management messages to a single struct
      Bluetooth: Add flag to track managment controlled adapters
      Bluetooth: Add send_mode_rsp convenience function for mgmt.c
      Bluetooth: Implement set_pairable managment command
      Bluetooth: Implement UUID handling through the management interface
      Bluetooth: Implement debugfs support for listing UUIDs
      Bluetooth: Reject pairing requests when in non-pairable mode
      Bluetooth: Add special handling with __hci_request and HCI_INIT
      Bluetooth: Add controller side link key clearing to hci_init_req
      Bluetooth: Remove page timeout setting from HCI init sequence
      Bluetooth: Implement a more complete adapter initialization sequence
      Bluetooth: Add class of device control to the management interface
      Bluetooth: Implement link key handling for the management interface
      Bluetooth: Add connected/disconnected management events
      Bluetooth: Add disconnect managment command
      Bluetooth: Add support for connect failed management event
      Bluetooth: Add get_connections managment interface command
      Bluetooth: Create common cmd_complete function for mgmt.c
      Bluetooth: Add support for PIN code handling in the management interface
      Bluetooth: Add set_io_capability management command
      Bluetooth: Make pending_add return a pointer to the added entry
      Bluetooth: Add mgmt_pair_device command
      Bluetooth: Add management support for user confirmation request
      Bluetooth: Fix mgmt_pin_code_reply command status opcode
      Bluetooth: Fix mgmt_pin_code_reply return parameters
      Bluetooth: Add mgmt_auth_failed event
      Bluetooth: Fix inititial value for remote authentication requirements
      Bluetooth: Fix unnecessary list traversal in mgmt_pending_remove

Johannes Berg (30):
      mac80211: don't return beacons when mesh is disabled
      mac80211: track receiver's aggregation reorder buffer size
      mac80211: allow advertising correct maximum aggregate size
      iwlagn: make iwl_rx_handle static
      iwlagn: add support for waiting for notifications
      iwlagn: properly wait for PAN disable
      iwlagn: return error if PAN disable timeout
      iwlwifi: fix 4965 notification wait setup
      iwlwifi: implement remain-on-channel
      iwlwifi: replace minimum slot time constant
      mac80211: use DECLARE_EVENT_CLASS
      mac80211: add MCS information to radiotap
      iwlwifi: support RSN IBSS
      iwlwifi: advertise max aggregate size
      iwlwifi: use maximum aggregation size
      iwlwifi: fix beacon notification parsing
      mac80211: allow GO to scan like AP
      iwlwifi: remove unnecessary locking
      mac80211: reply to directed probes in IBSS
      mac80211: fix 2.4 GHz 40 MHz disabling
      mac80211: rename RX_FLAG_TSFT
      rtl8192c: fix compilation errors
      mac80211: make tx() operation return void
      mac80211: remove IBSS merge delay
      mac80211: copy peer MCS TX parameters
      iwlagn: fix iwlagn_check_needed_chains
      mac80211: support direct offchannel TX offload
      mac80211: make rate control Kconfig warning depend on mac80211
      mac80211: fix scan race, simplify code
      iwlagn: support off-channel TX

Johannes Stezenbach (1):
      rt2x00: trivial: add \n to WARNING message

John Fastabend (20):
      net: implement mechanism for HW based QOS
      net_sched: implement a root container qdisc sch_mqprio
      ixgbe: DCB, only reprogram HW if the FCoE priority is changed
      ixgbe: DCB, remove round robin mode on 82598 devices
      ixgbe: DCB, abstract out dcb_config from DCB hardware configuration
      ixgbe: DCB, implement 802.1Qaz routines
      ixgbe: DCB, do not reset on CEE pg changes
      ixgbe: DCB, remove RESET bit it is no longer needed
      ixgbe: DCB, use hardware independent routines
      ixgbe: DCB, implement capabilities flags
      ixgbe: DCB, implement ieee_setapp dcbnl ops
      ixgbe: DCB remove ixgbe_fcoe_getapp routine
      ixgbe: DCB, use multiple Tx rings per traffic class
      ixgbe: enable ndo_tc_setup
      ixgbe: DCB: enable RSS to be used with DCB
      ixgbe: DCB, missed translation from 8021Qaz TSA to CEE link strict
      ixgbe: IEEE 802.1Qaz, implement priority assignment table
      ixgbe: DCB during ifup use correct CEE or IEEE mode
      ixgbe: DCB, set minimum bandwidth per traffic class
      ixgbe: DCB, PFC not cleared until reset occurs

John W. Linville (26):
      Merge branch 'wireless-next-2.6' of git://git.kernel.org/.../iwlwifi/iwlwifi-2.6
      Merge branch 'for-linville' of git://git.kernel.org/.../luca/wl12xx
      Merge branch 'master' of git://git.kernel.org/.../linville/wireless-2.6
      Merge branch 'master' of git://git.kernel.org/.../linville/wireless-2.6
      Merge branch 'master' of git://git.kernel.org/.../linville/wireless-2.6
      Merge branch 'wireless-next-2.6' of git://git.kernel.org/.../iwlwifi/iwlwifi-2.6
      Merge branch 'for-linville' of git://git.kernel.org/.../luca/wl12xx
      Merge branch 'master' of git://git.kernel.org/.../padovan/bluetooth-next-2.6
      Merge ssh://master.kernel.org/.../linville/wireless-2.6
      Merge branch 'master' of git://git.kernel.org/.../linville/wireless-next-2.6 into for-davem
      Merge branch 'wireless-next-2.6' of git://git.kernel.org/.../iwlwifi/iwlwifi-2.6
      Merge branch 'for-linville' of git://git.kernel.org/.../luca/wl12xx
      iwlegacy: change some symbols duplicated from iwlwifi directory
      at76c50x-usb: fix warning caused by at76_mac80211_tx now returning void
      Merge branch 'wireless-next-2.6' of git://git.kernel.org/.../iwlwifi/iwlwifi-2.6
      Merge branch 'master' of git://git.kernel.org/.../padovan/bluetooth-next-2.6
      Merge branch 'for-linville' of git://git.kernel.org/.../luca/wl12xx
      Merge branch 'wireless-next-2.6' of git://git.kernel.org/.../iwlwifi/iwlwifi-2.6
      rtlwifi: usb parts should depend on CONFIG_USB
      Merge branch 'master' of git://git.kernel.org/.../linville/wireless-next-2.6 into for-davem
      ath5k: restrict AR5K_TX_QUEUE_ID_DATA_MAX to reflect the [0,3] range
      Merge branch 'master' of git://git.kernel.org/.../linville/wireless-next-2.6 into for-davem
      wireless: add support for ethtool_ops->{get,set}_ringparam
      mac80211: implement support for cfg80211_ops->{get,set}_ringparam
      ath5k: implement ieee80211_ops->{get,set}_ringparam
      Merge branch 'master' of git://git.kernel.org/.../linville/wireless-next-2.6 into for-davem

Jon Mason (4):
      vxge: cleanup probe error paths
      vxge: correct eprom version detection
      vxge: MSIX one shot mode
      vxge: update driver version

Jouni Malinen (3):
      mac80211: Remove obsolete TKIP flexibility
      mac80211: Add testing functionality for TKIP
      ath: Fix clearing of secondary key cache entry for TKIP

Jozsef Kadlecsik (14):
      netfilter: NFNL_SUBSYS_IPSET id and NLA_PUT_NET* macros
      netfilter: ipset: IP set core support
      netfilter: ipset: bitmap:ip set type support
      netfilter: ipset: bitmap:ip,mac type support
      netfilter: ipset; bitmap:port set type support
      netfilter: ipset: hash:ip set type support
      netfilter: ipset: hash:ip,port set type support
      netfilter: ipset: hash:ip,port,ip set type support
      netfilter: ipset: hash:ip,port,net set type support
      netfilter: ipset: hash:net set type support
      netfilter: ipset: hash:net,port set type support
      netfilter: ipset: list:set set type support
      netfilter: xtables: "set" match and "SET" target support
      netfilter: ipset: send error message manually

Julia Lawall (1):
      net/wireless/nl80211.c: Avoid call to genlmsg_cancel

Julian Anastasov (9):
      ipvs: remove extra lookups for ICMP packets
      ipvs: avoid lookup for fwmark 0
      ipvs: remove _bh from percpu stats reading
      ipvs: move struct netns_ipvs
      ipvs: reorganize tot_stats
      ipvs: properly zero stats and rates
      ipvs: remove unused seqcount stats
      ipvs: optimize rates reading
      ipvs: rename estimator functions

Jussi Kivilinna (25):
      zd1211rw: use urb anchors for tx and fix tx-queue disabling
      zd1211rw: cancel process_intr work on zd_chip_disable_int()
      zd1211rw: add locking for mac->process_intr
      zd1211rw: fix beacon interval setup
      zd1211rw: move set_multicast_hash and set_rx_filter from workers to configure_filter
      zd1211rw: move set_rts_cts_work to bss_info_changed
      zd1211rw: support setting BSSID for AP mode
      zd1211rw: fix ack_pending in filter_ack causing tx-packet ordering problem on monitor
      zd1211rw: let zd_set_beacon_interval() set dtim_period and add AP-beacon flag
      zd1211rw: implement beacon fetching and handling ieee80211_get_buffered_bc()
      zd1211rw: add beacon watchdog and setting HW beacon more failsafe
      zd1211rw: batch beacon config commands together
      zd1211rw: use stack and preallocated memory for small cmd-buffers
      zd1211rw: change interrupt URB buffer to DMA buffer
      zd1211rw: lower hw command timeouts
      zd1211rw: collect driver settings and add function to restore theim
      zd1211rw: add TX watchdog and device resetting
      zd1211rw: reset device when CR_BCN_FIFO_SEMAPHORE freezes in beacon setup
      zd1211rw: reset rx urbs after idle period of 30 seconds
      zd1211rw: enable NL80211_IFTYPE_AP
      zd1211rw: add useful debug output
      zd1211rw: correct use of usb_bulk_msg on interrupt endpoints
      zd1211rw: use async urb for write command
      zd1211rw: move async iowrite16v up to callers
      zd1211rw: add unlikely to ZD_ASSERT

Justin P. Mattock (1):
      drivers:net:ipw2100.c change a typo comamnd to command

Juuso Oikarinen (4):
      wl12xx: Cleanup PLT mode when module is removed
      wl12xx: Increase scan channel dwell time for passive scans
      cfg80211: Allow non-zero indexes for device specific pair-wise ciphers
      cfg80211: Fix power save state after interface type change

KOVACS Krisztian (1):
      netfilter: fix compilation when conntrack is disabled but tproxy is enabled

Larry Finger (15):
      rtlwifi: Modify core routines
      rtlwifi: rtl8192ce: Refactor rtl8192ce/dm
      rtlwifi: rtl8192ce: Refactor rtl8192ce/fw
      rtlwifi: rtl8192ce: Rework rtl8192ce/phy.c
      p54: Fix compile warning
      rtlwifi: Make changes in rtlwifi/rtl8192ce/reg.h to support rtl8192cu
      rtlwifi: Make changes in rtlwifi/rtl8192ce/def.h to support rtl8192cu
      rtlwifi: Modify some rtl8192ce routines for merging rtl8192cu
      rtlwifi: Modify wifi.h for rtl8192cu
      rtlwifi: Move common parts of rtl8192ce/phy.c
      rtlwifi: Modify build system for rtl8192cu
      rtlwifi: rtl8192ce: Fix endian warnings
      rtlwifi: Remove obsolete/unused macros
      rtlwifi: rtl8192ce: rtl8192cu: Fix multiple def errors for allyesconfig build
      rtl8187: Change rate-control feedback

Levi, Shahar (2):
      wl12xx: BA initiator support
      wl12xx: BA receiver support

Linus Lüssing (6):
      batman-adv: Remove duplicate types.h inclusions
      batman-adv: Disallow originator addressing within mesh layer
      batman-adv: Make bat_priv->curr_gw an rcu protected pointer
      batman-adv: Increase orig_node refcount before releasing rcu read lock
      batman-adv: Fix possible buffer overflow in softif neigh list output
      batman-adv: Remove unused hdr_size variable in route_unicast_packet()

Lior Levy (4):
      igbvf: remove Tx hang detection
      igb: add support for VF Transmit rate limit using iproute2
      ixgbevf: remove Tx hang detection
      ixgbe: add support for VF Transmit rate limit using iproute2

Luciano Coelho (7):
      mac80211: add hw configuration for max ampdu buffer size
      MAINTAINERS: update information for the wl12xx driver
      wl12xx: don't modify the global supported band structures
      wl12xx: lock the RCU when accessing sta via ieee80211_find_sta()
      wl12xx: add hw configuration for max supported AMDPU size
      wl12xx: fix warning due to missing arg in ampdu_action
      wl12xx: fix MODULE_AUTHOR email address

Marc Kleine-Budde (9):
      ax88796: fix codingstyle and checkpatch warnings
      ax88796: don't use magic ei_status to acces private data
      ax88796: remove memset of private data
      ax88796: remove first_init parameter from ax_init_dev()
      ax88796: use netdev_<LEVEL> instead of dev_<LEVEL> and pr_<LEVEL>
      ax88796: remove platform_device member from struct ax_device
      ax88796: make pointer to platform data const
      ax88796: clean up probe and remove function
      ax88796: use generic mdio_bitbang driver

Marek Lindner (22):
      batman-adv: Split combined variable declarations
      batman-adv: protect neighbor nodes with reference counters
      batman-adv: convert neighbor list to hlist
      batman-adv: protect neighbor list with rcu locks
      batman-adv: free neighbors when an interface is deactivated
      batman-adv: protect neigh_nodes used outside of rcu_locks with refcounting
      batman-adv: protect each hash row with rcu locks
      batman-adv: protect originator nodes with reference counters
      batman-adv: protect ogm counter arrays with spinlock
      batman-adv: Correct rcu refcounting for neigh_node
      batman-adv: Correct rcu refcounting for gw_node
      batman-adv: Correct rcu refcounting for softif_neigh
      batman-adv: Correct rcu refcounting for batman_if
      batman-adv: protect bit operations to count OGMs with spinlock
      batman-adv: make broadcast seqno operations atomic
      batman-adv: separate ethernet comparing calls from hash functions
      batman-adv: remove extra layer between hash and hash element - hash bucket
      batman-adv: Correct rcu refcounting for orig_node
      batman-adv: increase refcount in create_neighbor to be consistent
      batman-adv: remove orig_hash spinlock
      batman-adv: rename global if_list to hardif_list
      batman-adv: rename batman_if struct to hard_iface

Mario Schuknecht (1):
      tcp: ioctl type SIOCOUTQNSD returns amount of data not sent

Mark Einon (1):
      Trivial typo fix in comment

Mark Rustad (3):
      net: dcbnl: Update copyright dates
      net: dcbnl: Fix misspellings
      net: dcbnl: Add IEEE app selector value definitions

Matt Carlson (19):
      tg3: Revise 5719 internal FIFO overflow solution
      tg3: Fix 5719 A0 tx completion bug
      tg3: Use new VLAN code
      tg3: Disable multivec mode for 1 MSIX vector
      tg3: Restrict phy ioctl access
      tg3: Fix loopback tests
      tg3: Disable MAC loopback test for CPMU devices
      tg3: Disable EEE during loopback tests
      tg3: Fix EEE interoperability issue
      tg3: Fix eee preprocessor naming
      tg3: Update copyrights and update version to 3.117
      tg3: Expand 5719 workaround
      tg3: Add missed 5719 workaround change
      tg3: Fix NVRAM selftest
      tg3: Add code to verify RODATA checksum of VPD
      tg3: cleanup pci device table vars
      tg3: Refine VAux decision process
      tg3: Move tg3_init_link_config to tg3_phy_probe
      tg3: Remove 5750 PCI code

Meenakshi Venkataraman (1):
      iwlagn: Enable idle powersave mode in 1000 series

Michael Buesch (4):
      ssb: Make ssb_wait_bit multi-bit safe
      lib-average: Make config option selectable
      mac80211: Add log message to ieee80211_restart_hw()
      p54spi: Update kconfig help text

Michael Chan (1):
      bnx2: Update firmware and version

Michał Mirosław (16):
      net: Move check of checksum features to netdev_fix_features()
      net: change netdev->features to u32
      net: reduce and unify printk level in netdev_fix_features()
      ethtool: move EXPORT_SYMBOL(ethtool_op_set_tx_csum) to correct place
      ethtool: enable GSO and GRO by default
      ethtool: factorize ethtool_get_strings() and ethtool_get_sset_count()
      ethtool: factorize get/set_one_feature
      net: Introduce new feature setting ops
      net: ethtool: use ndo_fix_features for offload setting
      net: use ndo_fix_features for ethtool_ops->set_flags
      net: introduce NETIF_F_RXCSUM
      loopback: convert to hw_features
      Fix "(unregistered net_device): Features changed" message
      net: avoid initial "Features changed" message
      net: Fix ETHTOOL_GFEATURES compatibility
      net: Implement SFEATURES compatibility for not updated drivers

Michel Lespinasse (1):
      drivers/net: fix build warnings with CONFIG_PM_SLEEP disabled

Mohammed Shafi Shajakhan (4):
      ath9k: clean up enums and unused macros
      ath9k: Fix memory leak due to failed PAPRD frames
      mac80211: Update comments on radiotap MCS index
      ath9k: Update comments for not parsing DTIM period

Nick Kossifidis (1):
      ath5k: Fix fast channel switching

Nick Ledovskikh (1):
      mac80211:mesh_mpp_table_grow call should depend on MESH_WORK_GROW_MPP_TABLE flag.

Nicolas Dichtel (1):
      ipsec: allow to align IPv4 AH on 32 bits

Nicolas de Pesloüan (1):
      bonding: documentation update: mailing lists.

Nishant Sarmukadam (7):
      mwl8k: Modify add_dma_header to include pad parameters
      mwl8k: Add encapsulation of data packet for crypto
      mwl8k: Set mac80211 rx status flags appropriately when hw crypto is enabled
      mwl8k: Enable HW encryption for AP mode
      mwl8k: fix rf_antenna rx argument for AP
      mwl8k: Tell mac80211 we have rate adaptation in FW
      mwl8k: Invert tx queues for set_hw_spec and set_edca_params

Nobuhiro Iwamatsu (1):
      sh: sh_eth: Add support ethtool

Oliver Neukum (1):
      r8169: support control of advertising.

Pablo Neira Ayuso (2):
      netfilter: nf_conntrack_tstamp: add flow-based timestamp extension
      netfilter: nf_ct_tcp: fix out of sync scenario while in SYN_RECV

Padmanabh Ratnakar (8):
      be2net: Remove ERR compl workaround for Lancer
      be2net: Checksum field valid only for TCP/UDP
      be2net: Add error recovery during load for Lancer
      be2net: Change f/w command versions for Lancer
      be2net: Remove TX Queue stop in close
      be2net: Disarm CQ and EQ to disable interrupt in Lancer
      be2net: Add multicast filter capability for Lancer
      be2net: Fix UDP packet detected status in RX compl

Patrick McHardy (24):
      Merge branch 'for-patrick' of git://git.kernel.org/.../horms/lvs-test-2.6
      netfilter: xt_conntrack: support matching on port ranges
      netfilter: fix Kconfig dependencies
      Merge branch 'master' of git://1984.lsi.us.es/net-next-2.6
      netfilter: nf_conntrack: use is_vmalloc_addr()
      Merge branch 'master' of git://dev.medozas.de/linux
      netfilter: nf_conntrack: fix lifetime display for disabled connections
      Merge branch 'master' of /repos/git/net-next-2.6
      Merge branch 'connlimit' of git://dev.medozas.de/linux
      Merge branch 'connlimit' of git://dev.medozas.de/linux
      netfilter: nf_conntrack: fix linker error with NF_CONNTRACK_TIMESTAMP=n
      rtnetlink: fix link attribute validation with IFLA_GROUP
      Merge branch 'connlimit' of git://dev.medozas.de/linux
      netfilter: ipset: use nla_parse_nested()
      netfilter: ipset: remove unnecessary includes
      netfilter: ctnetlink: fix ctnetlink_parse_tuple() warning
      netfilter: ipset: install ipset related header files
      netfilter: ipset: add missing break statemtns in ip_set_get_ip_port()
      netfilter: ipset: fix linking with CONFIG_IPV6=n
      netfilter: xtables: add device group match
      netfilter: ipset: add dependency on CONFIG_NETFILTER_NETLINK
      netlink: kill loginuid/sessionid/sid members from struct netlink_skb_parms
      netlink: kill eff_cap from struct netlink_skb_parms
      netfilter: x_tables: return -ENOENT for non-existant matches/targets

Patrick Schaaf (1):
      ipvs: make "no destination available" message more informative

Paul Gortmaker (2):
      tipc: cosmetic - function names are not to be full sentences
      tipc: delete extra semicolon blocking node deletion

Peter Korsgaard (2):
      dsa/mv88e6060: support nonzero mii base address
      phylib: SIOCGMIIREG/SIOCSMIIREG: allow access to all mdio addresses

Phil Oester (3):
      bonding: Incorrect TX queue offset
      bonding: Call netif_carrier_off after register_netdevice
      bonding: Improve syslog message at device creation time

Po-Yu Chuang (1):
      net: add Faraday FTMAC100 10/100 Ethernet driver

RA-Jay Hung (5):
      rt2x00: Fix radio off hang issue for PCIE interface
      rt2x00: Fix and fine-tune rf registers for RT3070/RT3071/RT3090
      rt2x00: Correct initial value of US_CYC_CNT register for pcie interface
      rt2x00: Add antenna setting for RT3070/RT3090/RT3390 with RX antenna diversity support
      rt2x00: Fix rt2800 txpower setting to correct value

RA-Shiang Tu (1):
      rt2x00: Add support for RT5390 chip

Rafael J. Wysocki (3):
      tg3: Avoid setting power.can_wakeup for devices that cannot wake up
      atl1c: Do not call device_init_wakeup() in atl1c_probe()
      atl1: Do not use legacy PCI power management

Rafał Miłecki (14):
      ssb: extract boardflags2 for SPROMs rev 4 and 5
      ssb: trivial: fix SPROM extract warning formatting
      ssb: remove invalid define SSB_TMSLOW_PHYCLK
      ssb: when needed, reject IM input while disabling device
      ssb: reset device only if it was enabled
      b43: N-PHY: fix 0x2055 radio workaround condition
      b43: N-PHY: rev1: enable some gain ctl workarounds
      b43: N-PHY: rev1: restore PHY state after RSSI operations
      b43: fill PHY ctl word1 in TX header for N-PHY
      b43: N-PHY: rev3+: add static tables
      b43: N-PHY: rev3+: correct switching analog core
      b43: N-PHY: rev3+: add tables with gain ctl workarounds
      b43: N-PHY: rev3+: implement gain ctl workarounds
      b43: trivial: update B43_PHY_N description (PHY support)

Rajesh Borundia (1):
      qlcnic: Remove validation for max tx and max rx queues

Rajkumar Manoharan (13):
      ath9k: preserve caldata history buffer across scanning
      ath9k_htc: keep calibrated noise floor value for oper channel
      ath9k_hw: fix carrier leakage calibration for AR9271
      ath9k: use common API to avoid code duplication
      mac80211: disable power save if an infra AP vif exists
      ath9k_htc: cancel ani work in ath9k_htc_stop
      ath9k: use common get current channel function
      ath9k: move update tx power to common
      ath9k_htc: make use common of function to update txpower
      ath9k: do not access hw registers in FULL SLEEP
      ath9k: reserve a beacon slot on beaconing vif addition
      mac80211: do not restart ps timer during scan or offchannel
      ath9k: disable beaconing before stopping beacon queue

Randy Dunlap (1):
      wl12xx: fix sdio_test kconfig/build errors

Richard Weinberger (1):
      netfilter: xt_connlimit: use hotdrop jump mark

Rogério Brito (1):
      Bluetooth: ath3k: Avoid duplication of code

Roopa Prabhu (3):
      enic: Bug Fix: Dont reset ENIC_SET_APPLIED flag on port profile disassociate
      enic: Decouple mac address registration and deregistration from port profile set operation
      enic: Flush driver cache of registered addr lists during port profile disassociate

Rémi Denis-Courmont (15):
      Phonet: allow multiple listen() and fix small race condition
      Phonet: implement per-socket destination/peer address
      Phonet: use socket destination in pipe protocol
      Phonet: remove redumdant pep->pipe_state
      Phonet: don't bother with transaction IDs (especially for indications)
      Phonet: fix flawed "SYN/ACK" logic
      Phonet: fix NULL dereference on TX path with implicit source
      Phonet: return an error when packet TX fails
      Phonet: correct pipe backlog callback return values
      Phonet: factor common code to send control messages
      Phonet: allocate sock from accept syscall rather than soft IRQ
      Phonet: provide pipe socket option to retrieve the pipe identifier
      Phonet: support active connection without pipe controller on modem
      Phonet: kill the ST-Ericsson pipe controller Kconfig
      Phonet: fix aligned-mode pipe socket buffer header reserve

Sakari Ailus (3):
      tlan: Code cleanup: checkpatch.pl is relatively happy now.
      tlan: add suspend/resume support
      tlan: Fix bugs introduced by the last tlan cleanup patch

Sangtae Ha (2):
      tcp_cubic: make the delay threshold of HyStart less sensitive
      tcp_cubic: fix low utilization of CUBIC with HyStart

Sathya Perla (1):
      be2net: changes for BE3 native mode support

Scott James Remnant (1):
      net/wireless: add COUNTRY to to regulatory device uevent

Sebastien Jan (1):
      wl12xx: fix the path to the wl12xx firmwares

Senthil Balasubramanian (3):
      ath9k_hw: Fix incorrect macversion and macrev checks
      ath9k_hw: read and backup AR_WA register value even before chip reset on.
      ath9k: Fix incorrect GPIO LED pin for AR9485

Sergei Shtylyov (2):
      net: use pci_dev->revision, again
      sis900: use pci_dev->revision

Seth Forshee (1):
      rt2x00: Check for errors from skb_pad() calls

Shan Wei (10):
      net: cleanup unused macros in net directory
      dccp: clean up unused DCCP_STATE_MASK definition
      tcp: Remove debug macro of TCP_CHECK_TIMER
      sctp: fix compile warnings in sctp_tsnmap_num_gabs
      mac80211: remove unused macros
      wireless:ath: use resource_size() help function
      s2io: fix uninitialized compile warning
      netfilter: ipset: fix the compile warning in ip_set_create
      mwl8k: use kcalloc instead of kmalloc & memset
      netfilter:ipvs: use kmemdup

Shawn Lin (1):
      r6040: fix multicast operations

Shiang Tu (2):
      rt2x00: Add/Modify protection related register definitions
      rt2x00: Add/Modify the GPIO register definition

Shmulik Ravid (3):
      bnx2x: use dcb_setapp to manage negotiated application tlvs
      dcbnl: add support for retrieving peer configuration - ieee
      dcbnl: add support for retrieving peer configuration - cee

Simon Horman (28):
      IPVS: Add persistence engine to connection entry
      IPVS: Only match pe_data created by the same pe
      IPVS: Make the cp argument to ip_vs_sync_conn() static
      IPVS: Remove useless { } block from ip_vs_process_message()
      IPVS: buffer argument to ip_vs_process_message() should not be const
      ipvs: allow transmit of GRO aggregated skbs
      Merge branch 'master' of git://git.kernel.org/.../davem/net-next-2.6 into HEAD
      IPVS: Change sock_create_kernel() to __sock_create()
      IPVS: use z modifier for sizeof() argument
      IPVS: remove duplicate initialisation or rs_table
      IPVS: Remove unused variables
      IPVS: Allow compilation with CONFIG_SYSCTL disabled
      IPVS: Remove ip_vs_sync_cleanup from section __exit
      IPVS: Use correct lock in SCTP module
      IPVS: Add ip_vs_route_me_harder()
      IPVS: Add sysctl_snat_reroute()
      IPVS: Add sysctl_nat_icmp_send()
      IPVS: Add {sysctl_sync_threshold,period}()
      IPVS: Add sysctl_sync_ver()
      IPVS: Add sysctl_expire_nodest_conn()
      IPVS: Add expire_quiescent_template()
      IPVS: Conditinally use sysctl_lblc{r}_expiration
      IPVS: ip_vs_todrop() becomes a noop when CONFIG_SYSCTL is undefined
      IPVS: Conditional ip_vs_conntrack_enabled()
      IPVS: Minimise ip_vs_leave when CONFIG_SYSCTL is undefined
      IPVS: Conditionally define and use ip_vs_lblc{r}_table
      IPVS: Add __ip_vs_control_{init,cleanup}_sysctl()
      IPVS: Conditionally include sysctl members of struct netns_ipvs

Simon Wunderlich (2):
      batman-adv: remove unused parameters
      batman-adv: protect bonding with rcu locks

Sony Chacko (2):
      netxen: Notify firmware of Flex-10 interface down
      netxen: support for GbE port settings

Stanislaw Gruszka (22):
      iwlwifi: do not set tx power when channel is changing
      iwl3945: set STATUS_READY before commit_rxon
      iwlwifi: remove unneeded __packed
      iwlwifi: introduce iwl_advanced_bt_coexist()
      iwlwifi: remove unneeded disable_hw_scan check
      iwlwifi: introduce iwl_bt_statistics
      iwl3945: do not use agn specific IWL_RATE_COUNT
      iwlwifi: correct frequency settings
      iwlwifi: cleanup iwl_recover_from_statistics
      iwlwifi: cleanup iwl_good_ack_health
      iwlwifi: fix ack health for WiFi/BT combo devices
      iwlegacy: do not set tx power when channel is changing
      mac80211: better fix for conn_mon_timer running after disassociate
      iwlwifi: fix dma mappings and skbs leak
      iwlegacy: fix dma mappings and skbs leak
      iwlwifi: add {ack,plpc}_check module parameters
      iwlwifi: move check health code into iwl-rx.c
      iwlwifi: move remaining iwl-agn-rx.c code into iwl-rx.c
      iwlwifi: move rx handlers code to iwl-rx.c
      iwlwifi: cleanup iwl_good_plcp_health
      iwlwifi: avoid too frequent recover from statistics
      iwlwifi: fix iwl-rx.c compilation

Stefan Assmann (1):
      igb: warn if max_vfs limit is exceeded

Stefan Berger (2):
      netfilter: xt_connlimit: connlimit-above early loop termination
      Revert "netfilter: xt_connlimit: connlimit-above early loop termination"

Steffen Klassert (10):
      crypto: authencesn - Add algorithm to handle IPsec extended sequence numbers
      xfrm: Add basic infrastructure to support IPsec extended sequence numbers
      xfrm: Use separate low and high order bits of the sequence numbers in xfrm_skb_cb
      esp4: Add support for IPsec extended sequence numbers
      esp6: Add support for IPsec extended sequence numbers
      xfrm: Move IPsec replay detection functions to a separate file
      xfrm: Support anti-replay window size bigger than 32 packets
      xfrm: Add support for IPsec extended sequence numbers
      xfrm: Add user interface for esn and big anti-replay windows
      xfrm: Refcount destination entry on xfrm_lookup

Stephen Hemminger (4):
      pfkey: fix warning
      netfilter: x_tables: misuse of try_then_request_module
      tcp: mark tcp_congestion_ops read_mostly
      netfilter: nf_conntrack: fix sysctl memory leak

Steve Brown (1):
      ath9k: Remove redundant beacon_interval

Steve Hodgson (2):
      sfc: Reduce size of efx_rx_buffer by unionising skb and page
      sfc: Reduce size of efx_rx_buffer further by removing data member

Sujith Manoharan (28):
      ath9k_htc: Add multiple register read API
      ath9k_hw: Offload USB eeprom reading to target
      ath9k_hw: Fix opmode initialization
      ath9k_hw: Fix INI fixup
      ath9k_hw: Add RX filters
      ath9k_hw: Fix power on reset
      ath9k_htc: Handle storage devices
      ath9k_htc: Allow upto two simultaneous interfaces
      ath9k_htc: Unify target capability updating
      ath9k_htc: Fix error handling in add_interface
      ath9k_htc: Remove OP_PREAMBLE_SHORT
      ath9k_htc: Remove OP_PROTECT_ENABLE
      ath9k_htc: Remove OP_ASSOCIATED variable
      ath9k_htc: Set the BSSID mask for multiple interfaces
      ath9k_htc: Make sequence number calculation per-VIF
      ath9k_htc: Use VIF from the packet's control data
      ath9k_htc: Protect ampdu_action with a mutex
      ath9k_htc: Maintain individual counters for interfaces
      ath9k_htc: Allow AP interface to be created
      ath9k_htc: Calculate and set the HW opmode
      ath9k_htc: Add ANI for AP mode
      ath9k_htc: Configure beacon timers in AP mode
      ath9k_htc: Fix TBTT calculation for IBSS mode
      ath9k_htc: Fix host RX initialization
      ath9k_htc: Fix RX filters
      ath9k_htc: Add debug code to print endpoint mapping
      ath9k_htc: Fix error path in URB allocation
      ath9k_htc: Handle BSSID/AID for multiple interfaces

Sven Eckelmann (10):
      batman-adv: Create roughly equal sized fragments
      batman-adv: Calculate correct size for merged packets
      batman-adv: Remove dangling declaration of hash_remove_element
      batman-adv: Remove unused definitions
      batman-adv: Remove declaration of batman_skb_recv
      batman-adv: Remove unused variables
      batman-adv: Update copyright years
      batman-adv: Merge README of v2011.0.0 release
      batman-adv: Use successive sequence numbers for fragments
      batman-adv: Disallow regular interface as mesh device

Szymon Janc (13):
      Bluetooth: Use #include <linux/uaccess.h> instead of <asm/uaccess.h>
      Bluetooth: Clean up hci_sniff_subrate_evt function
      Bluetooth: Fix some code style issues in hci_core.h
      Bluetooth: Fix some code style issues in hci_core.c
      Bluetooth: Fix some code style issues in hci_event.c
      Bluetooth: Use proper command structure in remove_uuid
      Bluetooth: Move index to common header in management interface
      Bluetooth: Validate data size before accessing mgmt commands
      Bluetooth: Fix possible NULL pointer dereference in cmd_complete
      Bluetooth: Log all parameters in cmd_status for easier debugging
      Bluetooth: Remove unused code from get_connections
      Bluetooth: Use variable name instead of type in sizeof()
      Bluetooth: Fix some small code style issues in mgmt.c

Thomas Chou (1):
      smc91x: add devicetree support

Thomas Gleixner (1):
      genirq: Fix affinity notifier fallout

Thomas Graf (3):
      netfilter: audit target to record accepted/dropped packets
      netfilter: create audit records for x_tables replaces
      netfilter ebtables: fix xt_AUDIT to work with ebtables

Thomas Jacob (2):
      netfilter: xt_iprange: typo in IPv4 match debug print code
      netfilter: xt_iprange: add IPv6 match debug print code

Thomas Lange (1):
      Davinci: Do not reset EMAC TX overruns counter on read

Tinggong Wang (1):
      ipvs: fix timer in get_curr_sync_buff

Tom Herbert (1):
      bnx2x: Support for managing RX indirection table

Ursula Braun (1):
      qeth: remove needless IPA-commands in offline

Uwe Kleine-König (15):
      net/fec: no need to cast arguments for memcpy
      net/fec: release mem_region requested in probe in error path and remove
      net/fec: don't free an irq that failed to be requested
      net/fec: no need to check for validity of ndev in suspend and resume
      net/fec: no need to memzero private data
      net/fec: put the ioremap cookie immediately into a void __iomem pointer
      net/fec: consolidate all i.MX options to CONFIG_ARM
      net/fec: add phy_stop to fec_enet_close
      net/fec: consistenly name struct net_device pointers "ndev"
      net/fec: some whitespace cleanup
      net/fec: reorder functions a bit allows removing forward declarations
      net/fec: provide device for dma functions and matching sizes for map and unmap
      net/fec: postpone unsetting driver data until the hardware is stopped
      net/fec: enable flow control and length check on enet-mac
      net/fec: remove unused driver data

Vasanthakumar Thiagarajan (3):
      ath9k: Implement op_flush()
      ath9k: Add a debugfs interface to dump chip registers
      ath9k_hw: Read noise floor only for available chains for AR9003

Vasanthy Kolluri (9):
      enic: Clean up: Organize devcmd wrapper routines
      enic: Bug Fix: Fix return values of enic_add/del_station_addr routines
      enic: Bug Fix: Reorder firmware devcmds - CMD_INIT and CMD_IG_VLAN_REWRITE_MODE
      enic: Clean up: Remove support for an older version of hardware
      enic: Update MAINTAINERS
      enic: Bug fix: Reset driver count of registered unicast addresses to zero during device reset
      enic: Clean up: Remove a not needed #ifdef
      enic: Always use single transmit and single receive hardware queues per device
      enic: Support newer version of firmware devcmd CMD_MCPU_FW_INFO

Vasiliy Kulikov (7):
      Bluetooth: l2cap: fix 1 byte infoleak to userspace
      Bluetooth: bnep: fix buffer overflow
      Bluetooth: sco: fix information leak to userspace
      bridge: netfilter: fix information leak
      netfilter: arp_tables: fix infoleak to userspace
      netfilter: ip_tables: fix infoleak to userspace
      ipv6: netfilter: ip6_tables: fix infoleak to userspace

Vasily Khoruzhick (2):
      libertas_spi: Use workqueue in hw_host_to_card
      libertas: Prepare stuff for if_spi.c pm support

Ville Tervo (10):
      Bluetooth: Add low energy commands and events
      Bluetooth: Add LE connect support
      Bluetooth: Use LE buffers for LE traffic
      Bluetooth: Add LE connection support to L2CAP
      Bluetooth: Add server socket support for LE connection
      Bluetooth: Do not send disconn comand over LE links
      Bluetooth: Treat LE and ACL links separately on timeout
      Bluetooth: Add SMP command structures
      Bluetooth: Use proper timer for hci command timout
      Bluetooth: Use ERR_PTR as return error from hci_connect

Vinicius Costa Gomes (1):
      Bluetooth: Fix initiated LE connections

Vivek Natarajan (15):
      ath9k_hw: Add a function to read sqsum_dvc.
      ath9k: Fix a PLL hang issue observed with AR9485.
      ath9k_hw: DDR_PLL and BB_PLL need correct setting.
      ath9k: Fix a locking related issue.
      ath9k_hw: Update PMU setting to improve ripple issue for AR9485.
      ath9k_htc: Fix a compilation warning.
      ath9k_hw: Updates for AR9485 1.1 chipsets.
      mac80211: Clear PS related flag on disabling power save.
      mac80211: Fix a race on enabling power save.
      ath9k_hw: Fix pcie_serdes setting for AR9485 1.1 version.
      ath9k: Cancel pll_work while disabling radio.
      ath9k: Fix compilation warning.
      ath9k_hw: Improve idle power consumption for AR9485.
      ath9k_hw: Fix PLL initialization for AR9485.
      ath9k_hw: Increase the wait count for nf load.

Vlad Dogaru (4):
      net_device: add support for network device groups
      netlink: support setting devgroup parameters
      net: add sysfs entry for device group
      netdevice: make initial group visible to userspace

Vladislav Zolotarov (3):
      bnx2x, cnic: Consolidate iSCSI/FCoE shared mem logic in bnx2x
      bnx2x: MTU for FCoE L2 ring
      bnx2x: Proper netdev->ndo_set_rx_mode() implementation.

Wey-Yi Guy (32):
      mac80211: mesh only parameter mppath maybe unused
      iwlwifi: use mac80211 throughput trigger
      iwlagn: remove reference to gen2a and gen2b
      iwlagn: add 2000 series EEPROM version
      iwlagn: 2000 series devices support
      iwlagn: add 2000 series pci id
      iwlagn: add 2000 series to Kconfig
      iwlagn: remove Gen2 from Kconfig
      iwlwifi: remove g2 from csr hw rev
      iwlwifi: add hw rev for 2000 series devices
      iwlwifi: initial P2P support
      iwlwifi: check ucode loading error and restart
      iwlagn: adjust rate table
      iwlagn: add IQ inversion support for 2000 series devices
      iwlwifi: always support idle mode for agn devices
      iwlagn: use 2030 macro for 2030 devices
      iwlagn: remove unsupported BT SCO command
      iiwlagn: remove unused parameter
      iwlwifi: fix compiling error with different configuration
      iwlagn: donot process bt update when bt coex disable
      iwlagn: handle bt defer work in 2000 series
      iwlwifi: Limit number of firmware reload
      iwlwifi: Loading correct uCode again when fail to load
      iwlwifi: enable 2-wire bt coex support for non-combo device
      iwlwifi: split the drivers for agn and legacy devices 3945/4965
      Revert "iwlwifi: split the drivers for agn and legacy devices 3945/4965"
      iwlwifi: split the drivers for agn and legacy devices 3945/4965
      iwlagn: name change for BT config command
      iwlagn: add bt config structure support for 2000 series
      iwlagn: add BT Session Activity 2 UART message (BT -> WiFi)
      iwlagn: split BT page and inquiry UART msg
      iwlagn: enable BT session 2 type UART for 2000 series

Willy Tarreau (4):
      rtlwifi: Fix build when RTL8192CU is selected, but RTL8192CE is not
      rtl8192cu: fix build error (vmalloc/vfree undefined)
      rtlwifi: Let rtlwifi build when PCI is not enabled
      rtlwifi: Eliminate udelay calls with too large values

Wojciech Dubowik (2):
      ath5k: Fix return codes for eeprom read functions.
      ath5k: Enable AR2315 chipset recognition

Xiaotian Feng (1):
      net: rename group sysfs entry to netdev_group

Yaniv Rosner (10):
      bnx2x: Fix line indentation
      bnx2x: Rename CL45 macro
      bnx2x: Set comments according to preferred Linux style
      bnx2x: Fix compilation warning messages
      bnx2x: Add and change some net_dev messages
      bnx2x: Enhance SFP+ module control
      bnx2x: Add support for new PHY BCM84833
      bnx2x: Add CMS functionality for 848x3
      bnx2x: Remove support for emulation/FPGA
      bnx2x: Update bnx2x version to 1.62.11-0

Yi Zou (4):
      net: add ndo_fcoe_ddp_target() to support FCoE DDP in target mode
      vlan: add support to ndo_fcoe_ddp_target()
      ixgbe: add support to FCoE DDP in target mode
      net: add proper documentation for previously added net_device_ops for FCoE

Yoshihiro Shimoda (6):
      net: sh_eth: modify the definitions of register
      net: sh_eth: remove the SH_TSU_ADDR
      net: sh_eth: remove almost #ifdef of SH7763
      net: sh_eth: modify the PHY_INTERFACE_MODE
      net: sh_eth: add support for SH7757's GETHER
      net: sh_eth: add set_mdio_gate in bb_info

amit salecha (1):
      qlcnic: fix checks for auto_fw_reset

françois romieu (3):
      atl1c: remove private #define.
      atl1e: remove private #define.
      via-velocity: fix the WOL bug on 1000M full duplex forced mode.

hartleys (1):
      phy: Remove unneeded depends on PHYLIB

roel kluin (1):
      can: wrong index used in inner loop

stephen hemminger (23):
      sfq: deadlock in error path
      sched: CHOKe flow scheduler
      cls_u32: fix sparse warnings
      socket: suppress sparse warnings
      atl1[ce]: fix sparse warnings
      afkey: add sparse annotation about rcu
      mqprio: cleanups
      em_meta: fix sparse warning
      netem: cleanup dump code
      netem: use vmalloc for distribution table
      netem: define NETEM_DIST_MAX
      Revert "sch_netem: Remove classful functionality"
      netem: revised correlated loss generator
      netem: update version and cleanup
      bonding: fix sparse warning
      qla3xxx: add missing __iomem annotation
      bridge: control carrier based on ports online
      bridge: skip forwarding delay if not using STP
      tcp: fix RTT for quick packets in congestion control
      tcp_cubic: fix comparison of jiffies
      tcp_cubic: make ack train delta value a parameter
      tcp_cubic: fix clock dependency
      tcp_cubic: enable high resolution ack time if needed

 Documentation/feature-removal-schedule.txt         |   27 +
 Documentation/networking/batman-adv.txt            |   16 +-
 Documentation/networking/bonding.txt               |   26 +-
 Documentation/networking/ip-sysctl.txt             |   11 +
 Documentation/networking/phonet.txt                |   67 +-
 MAINTAINERS                                        |   10 +-
 arch/sh/include/asm/sh_eth.h                       |   10 +
 crypto/Makefile                                    |    2 +-
 crypto/authencesn.c                                |  835 ++++
 drivers/block/drbd/drbd_nl.c                       |    2 +-
 drivers/bluetooth/ath3k.c                          |  287 ++-
 drivers/bluetooth/btusb.c                          |   13 +-
 drivers/bluetooth/hci_ldisc.c                      |    1 +
 drivers/infiniband/core/addr.c                     |   31 +-
 drivers/infiniband/hw/cxgb3/iwch_cm.c              |   22 +-
 drivers/infiniband/hw/cxgb4/cm.c                   |   22 +-
 drivers/infiniband/hw/nes/nes.c                    |    3 +-
 drivers/infiniband/hw/nes/nes_cm.c                 |    8 +-
 drivers/md/dm-log-userspace-transfer.c             |    2 +-
 drivers/net/Kconfig                                |   90 +-
 drivers/net/Makefile                               |    2 +
 drivers/net/atl1c/atl1c_hw.c                       |   15 +-
 drivers/net/atl1c/atl1c_hw.h                       |   43 +-
 drivers/net/atl1c/atl1c_main.c                     |    5 +-
 drivers/net/atl1e/atl1e_ethtool.c                  |   12 +-
 drivers/net/atl1e/atl1e_hw.c                       |   34 +-
 drivers/net/atl1e/atl1e_hw.h                       |  111 +-
 drivers/net/atl1e/atl1e_main.c                     |   10 +-
 drivers/net/atlx/atl1.c                            |   77 +-
 drivers/net/atlx/atl2.c                            |    2 +-
 drivers/net/ax88796.c                              |  810 ++--
 drivers/net/benet/be.h                             |   55 +-
 drivers/net/benet/be_cmds.c                        |  202 +-
 drivers/net/benet/be_cmds.h                        |   96 +-
 drivers/net/benet/be_ethtool.c                     |   87 +-
 drivers/net/benet/be_hw.h                          |  110 +-
 drivers/net/benet/be_main.c                        |  620 ++--
 drivers/net/bna/bnad.c                             |  108 +-
 drivers/net/bna/bnad.h                             |    2 +-
 drivers/net/bnx2.c                                 |   16 +-
 drivers/net/bnx2.h                                 |    6 +-
 drivers/net/bnx2x/bnx2x.h                          |   35 +-
 drivers/net/bnx2x/bnx2x_cmn.c                      |   70 +-
 drivers/net/bnx2x/bnx2x_cmn.h                      |    6 +-
 drivers/net/bnx2x/bnx2x_dcb.c                      |  137 +-
 drivers/net/bnx2x/bnx2x_dcb.h                      |    5 +-
 drivers/net/bnx2x/bnx2x_ethtool.c                  |   58 +-
 drivers/net/bnx2x/bnx2x_hsi.h                      |  114 +-
 drivers/net/bnx2x/bnx2x_link.c                     | 2527 ++++++-----
 drivers/net/bnx2x/bnx2x_link.h                     |   34 +-
 drivers/net/bnx2x/bnx2x_main.c                     |  600 ++-
 drivers/net/bnx2x/bnx2x_reg.h                      |    1 +
 drivers/net/bonding/Makefile                       |    3 +
 drivers/net/bonding/bond_3ad.c                     |    2 +-
 drivers/net/bonding/bond_alb.c                     |    2 +-
 drivers/net/bonding/bond_main.c                    |  638 +--
 drivers/net/bonding/bond_procfs.c                  |  275 ++
 drivers/net/bonding/bond_sysfs.c                   |   23 +-
 drivers/net/bonding/bonding.h                      |  111 +-
 drivers/net/can/Kconfig                            |    2 +
 drivers/net/can/Makefile                           |    1 +
 drivers/net/can/c_can/Kconfig                      |   15 +
 drivers/net/can/c_can/Makefile                     |    8 +
 drivers/net/can/c_can/c_can.c                      | 1158 +++++
 drivers/net/can/c_can/c_can.h                      |   86 +
 drivers/net/can/c_can/c_can_platform.c             |  215 +
 drivers/net/can/usb/esd_usb2.c                     |    6 +-
 drivers/net/cnic.c                                 |  209 +-
 drivers/net/cnic.h                                 |    2 +-
 drivers/net/cnic_if.h                              |    8 +-
 drivers/net/cs89x0.c                               |   19 +-
 drivers/net/cxgb3/cxgb3_offload.c                  |    5 +-
 drivers/net/cxgb4/cxgb4_main.c                     |    1 -
 drivers/net/davinci_emac.c                         |    2 +-
 drivers/net/dm9000.c                               |    7 +-
 drivers/net/e1000e/defines.h                       |    1 +
 drivers/net/e1000e/e1000.h                         |    5 +-
 drivers/net/e1000e/ethtool.c                       |   92 +-
 drivers/net/e1000e/hw.h                            |    5 +-
 drivers/net/e1000e/ich8lan.c                       |   48 +-
 drivers/net/e1000e/lib.c                           |    4 +-
 drivers/net/e1000e/netdev.c                        |  129 +-
 drivers/net/e1000e/phy.c                           |    8 +-
 drivers/net/enic/Makefile                          |    2 +-
 drivers/net/enic/enic.h                            |   11 +-
 drivers/net/enic/enic_dev.c                        |  221 +
 drivers/net/enic/enic_dev.h                        |   41 +
 drivers/net/enic/enic_main.c                       |  326 +--
 drivers/net/enic/vnic_dev.c                        |   26 +-
 drivers/net/enic/vnic_dev.h                        |    8 -
 drivers/net/enic/vnic_devcmd.h                     |   38 +-
 drivers/net/enic/vnic_rq.h                         |    5 -
 drivers/net/eql.c                                  |   10 +-
 drivers/net/fec.c                                  |  650 ++--
 drivers/net/forcedeth.c                            |    8 +-
 drivers/net/ftmac100.c                             | 1198 +++++
 drivers/net/ftmac100.h                             |  180 +
 drivers/net/hamradio/bpqether.c                    |    5 +-
 drivers/net/igb/e1000_82575.c                      |  296 ++-
 drivers/net/igb/e1000_82575.h                      |    1 +
 drivers/net/igb/e1000_defines.h                    |   52 +-
 drivers/net/igb/e1000_hw.h                         |    9 +-
 drivers/net/igb/e1000_mbx.c                        |   38 +-
 drivers/net/igb/e1000_nvm.c                        |   64 +-
 drivers/net/igb/e1000_nvm.h                        |    1 +
 drivers/net/igb/e1000_regs.h                       |   27 +
 drivers/net/igb/igb.h                              |    8 +
 drivers/net/igb/igb_ethtool.c                      |   30 +-
 drivers/net/igb/igb_main.c                         |  232 +-
 drivers/net/igbvf/ethtool.c                        |    6 +-
 drivers/net/igbvf/igbvf.h                          |    3 -
 drivers/net/igbvf/netdev.c                         |   63 +-
 drivers/net/ipg.c                                  |    4 +-
 drivers/net/ixgb/ixgb.h                            |    2 +-
 drivers/net/ixgb/ixgb_ethtool.c                    |   39 +
 drivers/net/ixgb/ixgb_main.c                       |   54 +-
 drivers/net/ixgbe/ixgbe.h                          |   16 +-
 drivers/net/ixgbe/ixgbe_82598.c                    |  102 +-
 drivers/net/ixgbe/ixgbe_82599.c                    |  228 +-
 drivers/net/ixgbe/ixgbe_common.c                   |  947 ++--
 drivers/net/ixgbe/ixgbe_common.h                   |    8 +-
 drivers/net/ixgbe/ixgbe_dcb.c                      |  160 +-
 drivers/net/ixgbe/ixgbe_dcb.h                      |   12 +-
 drivers/net/ixgbe/ixgbe_dcb_82598.c                |  138 +-
 drivers/net/ixgbe/ixgbe_dcb_82598.h                |   25 +-
 drivers/net/ixgbe/ixgbe_dcb_82599.c                |  176 +-
 drivers/net/ixgbe/ixgbe_dcb_82599.h                |   29 +-
 drivers/net/ixgbe/ixgbe_dcb_nl.c                   |  429 ++-
 drivers/net/ixgbe/ixgbe_ethtool.c                  |   57 +-
 drivers/net/ixgbe/ixgbe_fcoe.c                     |  103 +-
 drivers/net/ixgbe/ixgbe_fcoe.h                     |    6 +-
 drivers/net/ixgbe/ixgbe_main.c                     |  481 ++-
 drivers/net/ixgbe/ixgbe_mbx.c                      |   37 +-
 drivers/net/ixgbe/ixgbe_mbx.h                      |    4 +-
 drivers/net/ixgbe/ixgbe_phy.c                      |  594 ++-
 drivers/net/ixgbe/ixgbe_phy.h                      |    7 +-
 drivers/net/ixgbe/ixgbe_sriov.c                    |  116 +-
 drivers/net/ixgbe/ixgbe_sriov.h                    |    3 +-
 drivers/net/ixgbe/ixgbe_type.h                     |   65 +-
 drivers/net/ixgbe/ixgbe_x540.c                     |   43 +-
 drivers/net/ixgbevf/defines.h                      |    2 +
 drivers/net/ixgbevf/ethtool.c                      |    4 +-
 drivers/net/ixgbevf/ixgbevf.h                      |    1 -
 drivers/net/ixgbevf/ixgbevf_main.c                 |   98 +-
 drivers/net/ixgbevf/regs.h                         |    2 +-
 drivers/net/jme.c                                  |  306 +-
 drivers/net/jme.h