Netdev Archive on lore.kernel.org
 help / color / Atom feed
* [GIT] Networking
@ 2010-08-12 23:10 David Miller
  2010-08-14 18:05 ` Linus Torvalds
  0 siblings, 1 reply; 1456+ messages in thread
From: David Miller @ 2010-08-12 23:10 UTC (permalink / raw)
  To: torvalds; +Cc: akpm, netdev, linux-kernel


1) qlcnic driver using way too much stack space during probe, fix
   from Dan Carpenter.

2) sfq was oops'able during config because it only partially provided
   the classful qdisc interfaces.  Fix this, and also add validation
   code during qdisc registry so that we can catch this ahead of time
   in the future.  From Jarek Poplawski.

3) Properly undo pci_enable_device() when PCI driver probe fails in
   ISDN.  From Kulikov Vasiliy.

4) Buffer overflow fix in CAN protocol from Oliver Kartkopp.

5) kernel-doc and Kconfig dependency fixups from Randy Dunlap.

6) s390 driver use macros named READ/WRITE, fix to avoid namespace
   conflicts.  From Heiko Carstens and Ursula Braun.

7) Minor fixes to CAIF protocol stack from Sjur Braendeland.

8) The usual assortment of wireless fixes via John Linville and co.

Please pull, thanks a lot.

The following changes since commit ad41a1e0cab07c5125456e8d38e5b1ab148d04aa:

  Merge branch 'io_remap_pfn_range' of git://www.jni.nu/cris (2010-08-12 10:17:19 -0700)

are available in the git repository at:

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

Ben Greear (1):
      net: Use NET_XMIT_SUCCESS where possible.

Dan Carpenter (2):
      qlcnic: clean up qlcnic_init_pci_info()
      qlcnic: using too much stack

David S. Miller (3):
      farsync: Fix compile warnings.
      usbnet: rx_submit() should return an error code.
      Merge branch 'master' of git://git.kernel.org/.../linville/wireless-2.6

Heiko Carstens (1):
      claw: rename READ/WRITE defines to avoid redefinitions

Jarek Poplawski (4):
      pkt_sched: sch_sfq: Add dummy unbind_tcf and put handles. Was: [PATCH] sfq: add dummy bind/unbind handles
      pkt_sched: Add some basic qdisc class ops verification. Was: [PATCH] sfq: add dummy bind/unbind handles
      pkt_sched: Fix sch_sfq vs tc_modify_qdisc oops
      pkt_sched: Check .walk and .leaf class handlers

Johannes Berg (2):
      cfg80211: fix locking in action frame TX
      iwlagn: fix rts cts protection

John W. Linville (4):
      Revert "p54pci: Add PCI ID for SMC2802W"
      libertas: fix build break by including linux/sched.h
      Merge branch 'master' of git://git.kernel.org/.../holtmann/bluetooth-2.6
      net: make netpoll_rx return bool for !CONFIG_NETPOLL

Kulikov Vasiliy (3):
      isdn: avm: call pci_disable_device() if pci_probe() failed
      isdn: avm: call pci_disable_device() if pci_probe() failed
      isdn: mISDN: call pci_disable_device() if pci_probe() failed

Mat Martineau (4):
      Bluetooth: Fix endianness issue with L2CAP MPS configuration
      Bluetooth: Change default L2CAP ERTM retransmit timeout
      Bluetooth: Fix incorrect setting of remote_tx_win for L2CAP ERTM
      Bluetooth: Use 3-DH5 payload size for default ERTM max PDU size

Oliver Hartkopp (1):
      can: add limit for nframes and clean up signed/unsigned variables

Randy Dunlap (4):
      etherdevice.h: fix kernel-doc typo
      net/sock.h: add missing kernel-doc notation
      phy.c: fix kernel-doc warnings
      phylib: available for any speed ethernet

Sjur Braendeland (2):
      caif: Bugfix - Increase default headroom size for control channel.
      caif-spi: Bugfix SPI_DATA_POS settings were inverted.

Ursula Braun (1):
      ctcm: rename READ/WRITE defines to avoid redefinitions

 drivers/isdn/hardware/avm/c4.c              |    1 +
 drivers/isdn/hardware/avm/t1pci.c           |    1 +
 drivers/isdn/hardware/mISDN/mISDNinfineon.c |    5 +-
 drivers/net/caif/caif_spi_slave.c           |    4 +-
 drivers/net/phy/Kconfig                     |    2 +-
 drivers/net/phy/phy.c                       |    2 +-
 drivers/net/qlcnic/qlcnic_main.c            |   72 ++++++++++-------
 drivers/net/usb/usbnet.c                    |   22 ++++--
 drivers/net/wan/farsync.c                   |   15 ++--
 drivers/net/wireless/iwlwifi/iwl-1000.c     |    2 +-
 drivers/net/wireless/iwlwifi/iwl-3945.c     |   18 +----
 drivers/net/wireless/iwlwifi/iwl-4965.c     |    2 +-
 drivers/net/wireless/iwlwifi/iwl-5000.c     |   10 +-
 drivers/net/wireless/iwlwifi/iwl-6000.c     |   16 ++--
 drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c |   19 ++++-
 drivers/net/wireless/iwlwifi/iwl-agn-tx.c   |   20 +-----
 drivers/net/wireless/iwlwifi/iwl-agn.c      |   85 +++++---------------
 drivers/net/wireless/iwlwifi/iwl-core.c     |   29 ++++++-
 drivers/net/wireless/iwlwifi/iwl-core.h     |   14 ++--
 drivers/net/wireless/iwlwifi/iwl3945-base.c |    5 +-
 drivers/net/wireless/libertas/cfg.c         |    1 +
 drivers/net/wireless/p54/p54pci.c           |    2 -
 drivers/s390/net/claw.c                     |  118 +++++++++++++-------------
 drivers/s390/net/claw.h                     |    4 +-
 drivers/s390/net/ctcm_fsms.c                |   60 +++++++-------
 drivers/s390/net/ctcm_main.c                |   80 +++++++++---------
 drivers/s390/net/ctcm_main.h                |    4 +-
 drivers/s390/net/ctcm_mpc.c                 |   64 ++++++++-------
 drivers/s390/net/ctcm_sysfs.c               |   20 +++---
 include/linux/etherdevice.h                 |    2 +-
 include/linux/netpoll.h                     |    2 +-
 include/net/bluetooth/l2cap.h               |    4 +-
 include/net/sock.h                          |    4 +-
 net/bluetooth/l2cap.c                       |   11 +--
 net/caif/cfpkt_skbuff.c                     |    2 +-
 net/can/bcm.c                               |   41 ++++++---
 net/dsa/Kconfig                             |    2 +-
 net/sched/sch_api.c                         |   22 ++++-
 net/sched/sch_atm.c                         |    4 +-
 net/sched/sch_sfq.c                         |   14 +++-
 net/sched/sch_tbf.c                         |    4 +-
 net/sched/sch_teql.c                        |    2 +-
 net/wireless/mlme.c                         |    8 ++-
 43 files changed, 428 insertions(+), 391 deletions(-)

^ permalink raw reply	[flat|nested] 1456+ messages in thread
* [GIT] Networking
@ 2011-01-04 19:56 David Miller
  0 siblings, 0 replies; 1456+ 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] 1456+ messages in thread
* [GIT] Networking
@ 2011-01-06 20:20 David Miller
  2011-01-07 18:46 ` Linus Torvalds
  0 siblings, 1 reply; 1456+ 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] 1456+ messages in thread
* [GIT] Networking
@ 2011-01-12  0:24 David Miller
  0 siblings, 0 replies; 1456+ 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] 1456+ messages in thread
* [GIT] Networking
@ 2011-01-14 21:03 David Miller
  0 siblings, 0 replies; 1456+ 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] 1456+ messages in thread
* [GIT] Networking
@ 2011-01-20  2:04 David Miller
  2011-01-20 21:12 ` Linus Torvalds
  0 siblings, 1 reply; 1456+ 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] 1456+ messages in thread
* [GIT] Networking
@ 2011-01-26 23:13 David Miller
  0 siblings, 0 replies; 1456+ 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] 1456+ messages in thread
* [GIT] Networking
@ 2011-02-04 21:18 David Miller
  0 siblings, 0 replies; 1456+ 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] 1456+ messages in thread
* [GIT] Networking
@ 2011-02-10 19:33 David Miller
  0 siblings, 0 replies; 1456+ 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] 1456+ messages in thread
* [GIT] Networking
@ 2011-02-18 21:52 David Miller
  0 siblings, 0 replies; 1456+ 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] 1456+ messages in thread
* [GIT] Networking
@ 2011-02-23 23:57 David Miller
  0 siblings, 0 replies; 1456+ 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] 1456+ messages in thread
* [GIT] Networking
@ 2011-03-03 22:34 David Miller
  0 siblings, 0 replies; 1456+ 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] 1456+ messages in thread
* [GIT] Networking
@ 2011-03-10 23:34 David Miller
  2011-03-10 23:49 ` Linus Torvalds
  0 siblings, 1 reply; 1456+ 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] 1456+ messages in thread
* [GIT] Networking
@ 2011-03-16 21:21 David Miller
  0 siblings, 0 replies; 1456+ 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                                  |   87 +-
 drivers/net/loopback.c                             |    9 +-
 drivers/net/macvlan.c                              |   14 +-
 drivers/net/macvtap.c                              |   18 +-
 drivers/net/mii.c                                  |   14 +-
 drivers/net/mv643xx_eth.c                          |   74 +-
 drivers/net/myri10ge/myri10ge.c                    |    4 +-
 drivers/net/netxen/netxen_nic.h                    |    6 +-
 drivers/net/netxen/netxen_nic_ctx.c                |   15 +
 drivers/net/netxen/netxen_nic_ethtool.c            |   62 +-
 drivers/net/netxen/netxen_nic_main.c               |    3 +
 drivers/net/phy/Kconfig                            |    1 -
 drivers/net/phy/micrel.c                           |   24 +-
 drivers/net/phy/phy.c                              |    8 +-
 drivers/net/ppp_generic.c                          |  148 +-
 drivers/net/pptp.c                                 |   45 +-
 drivers/net/qla3xxx.c                              |   10 +-
 drivers/net/qlcnic/qlcnic.h                        |    5 -
 drivers/net/qlcnic/qlcnic_main.c                   |   15 +-
 drivers/net/r8169.c                                |  272 +-
 drivers/net/s2io.c                                 |    2 +-
 drivers/net/sfc/efx.c                              |   86 +-
 drivers/net/sfc/efx.h                              |   19 +-
 drivers/net/sfc/ethtool.c                          |   37 +-
 drivers/net/sfc/falcon.c                           |   22 +-
 drivers/net/sfc/falcon_boards.c                    |    2 +-
 drivers/net/sfc/falcon_xmac.c                      |    2 +-
 drivers/net/sfc/filter.c                           |  117 +-
 drivers/net/sfc/io.h                               |   15 +-
 drivers/net/sfc/mcdi.c                             |   32 +-
 drivers/net/sfc/mcdi.h                             |    4 +-
 drivers/net/sfc/mcdi_mac.c                         |    2 +-
 drivers/net/sfc/mcdi_pcol.h                        |    2 +-
 drivers/net/sfc/mcdi_phy.c                         |    2 +-
 drivers/net/sfc/mdio_10g.c                         |   34 +-
 drivers/net/sfc/mdio_10g.h                         |    5 +-
 drivers/net/sfc/mtd.c                              |    2 +-
 drivers/net/sfc/net_driver.h                       |   83 +-
 drivers/net/sfc/nic.c                              |   73 +-
 drivers/net/sfc/nic.h                              |    9 +-
 drivers/net/sfc/phy.h                              |    2 +-
 drivers/net/sfc/qt202x_phy.c                       |    2 +-
 drivers/net/sfc/regs.h                             |    8 +-
 drivers/net/sfc/rx.c                               |  144 +-
 drivers/net/sfc/selftest.c                         |    4 +-
 drivers/net/sfc/selftest.h                         |    2 +-
 drivers/net/sfc/siena.c                            |   24 +-
 drivers/net/sfc/spi.h                              |    2 +-
 drivers/net/sfc/tenxpress.c                        |    4 +-
 drivers/net/sfc/tx.c                               |   92 +-
 drivers/net/sfc/txc43128_phy.c                     |    4 +-
 drivers/net/sfc/workarounds.h                      |    2 +-
 drivers/net/sh_eth.c                               |  737 +++-
 drivers/net/sh_eth.h                               |  654 ++--
 drivers/net/sis900.c                               |    4 +-
 drivers/net/sky2.c                                 |    2 +-
 drivers/net/smc91x.c                               |   13 +
 drivers/net/smsc911x.c                             |    4 +-
 drivers/net/sungem.c                               |   58 +-
 drivers/net/sungem.h                               |    1 -
 drivers/net/tg3.c                                  |  335 +-
 drivers/net/tg3.h                                  |   13 +-
 drivers/net/tlan.c                                 | 3840 ++++++++--------
 drivers/net/tlan.h                                 |  192 +-
 drivers/net/tun.c                                  |   85 +-
 drivers/net/typhoon.c                              |    3 +-
 drivers/net/usb/cdc-phonet.c                       |   10 +-
 drivers/net/veth.c                                 |   12 -
 drivers/net/via-velocity.c                         |    9 +
 drivers/net/via-velocity.h                         |    8 +-
 drivers/net/vxge/vxge-config.c                     |   32 +-
 drivers/net/vxge/vxge-config.h                     |   10 +
 drivers/net/vxge/vxge-main.c                       |  234 +-
 drivers/net/vxge/vxge-main.h                       |   23 +-
 drivers/net/vxge/vxge-traffic.c                    |  116 +-
 drivers/net/vxge/vxge-traffic.h                    |   14 +-
 drivers/net/vxge/vxge-version.h                    |    4 +-
 drivers/net/wireless/Kconfig                       |    1 +
 drivers/net/wireless/Makefile                      |    5 +-
 drivers/net/wireless/adm8211.c                     |    4 +-
 drivers/net/wireless/at76c50x-usb.c                |   10 +-
 drivers/net/wireless/at76c50x-usb.h                |    2 +-
 drivers/net/wireless/ath/ar9170/Kconfig            |    4 +-
 drivers/net/wireless/ath/ar9170/ar9170.h           |    2 +-
 drivers/net/wireless/ath/ar9170/main.c             |    8 +-
 drivers/net/wireless/ath/ath.h                     |    2 +
 drivers/net/wireless/ath/ath5k/Kconfig             |   11 +
 drivers/net/wireless/ath/ath5k/ahb.c               |    9 +-
 drivers/net/wireless/ath/ath5k/ath5k.h             |   40 +-
 drivers/net/wireless/ath/ath5k/attach.c            |    7 +-
 drivers/net/wireless/ath/ath5k/base.c              |  176 +-
 drivers/net/wireless/ath/ath5k/base.h              |   17 +-
 drivers/net/wireless/ath/ath5k/caps.c              |   48 +-
 drivers/net/wireless/ath/ath5k/debug.c             |   20 -
 drivers/net/wireless/ath/ath5k/debug.h             |   10 -
 drivers/net/wireless/ath/ath5k/eeprom.c            |   24 +-
 drivers/net/wireless/ath/ath5k/eeprom.h            |   28 +-
 drivers/net/wireless/ath/ath5k/mac80211-ops.c      |   94 +-
 drivers/net/wireless/ath/ath5k/pci.c               |    9 +-
 drivers/net/wireless/ath/ath5k/qcu.c               |   46 +-
 drivers/net/wireless/ath/ath5k/reg.h               |   15 +-
 drivers/net/wireless/ath/ath5k/trace.h             |  107 +
 drivers/net/wireless/ath/ath9k/Makefile            |    1 -
 drivers/net/wireless/ath/ath9k/ahb.c               |   15 +-
 drivers/net/wireless/ath/ath9k/ar9002_calib.c      |    5 +-
 drivers/net/wireless/ath/ath9k/ar9003_eeprom.c     |   26 +-
 drivers/net/wireless/ath/ath9k/ar9003_hw.c         |  112 +-
 drivers/net/wireless/ath/ath9k/ar9003_mac.c        |    8 +-
 drivers/net/wireless/ath/ath9k/ar9003_phy.c        |   37 +-
 drivers/net/wireless/ath/ath9k/ar9003_phy.h        |    2 +
 drivers/net/wireless/ath/ath9k/ar9485_initvals.h   | 1143 +++++
 drivers/net/wireless/ath/ath9k/ath9k.h             |  157 +-
 drivers/net/wireless/ath/ath9k/beacon.c            |   93 +-
 drivers/net/wireless/ath/ath9k/calib.c             |    9 +-
 drivers/net/wireless/ath/ath9k/common.c            |   11 +
 drivers/net/wireless/ath/ath9k/common.h            |    4 +-
 drivers/net/wireless/ath/ath9k/debug.c             |  494 ++-
 drivers/net/wireless/ath/ath9k/debug.h             |   17 +-
 drivers/net/wireless/ath/ath9k/eeprom.c            |   32 +
 drivers/net/wireless/ath/ath9k/eeprom.h            |    2 +
 drivers/net/wireless/ath/ath9k/eeprom_4k.c         |   41 +-
 drivers/net/wireless/ath/ath9k/eeprom_9287.c       |   45 +-
 drivers/net/wireless/ath/ath9k/eeprom_def.c        |   38 +-
 drivers/net/wireless/ath/ath9k/gpio.c              |  169 +-
 drivers/net/wireless/ath/ath9k/hif_usb.c           |   78 +-
 drivers/net/wireless/ath/ath9k/htc.h               |   80 +-
 drivers/net/wireless/ath/ath9k/htc_drv_beacon.c    |  170 +-
 drivers/net/wireless/ath/ath9k/htc_drv_gpio.c      |    3 +-
 drivers/net/wireless/ath/ath9k/htc_drv_init.c      |   48 +-
 drivers/net/wireless/ath/ath9k/htc_drv_main.c      |  485 ++-
 drivers/net/wireless/ath/ath9k/htc_drv_txrx.c      |   84 +-
 drivers/net/wireless/ath/ath9k/hw.c                |   65 +-
 drivers/net/wireless/ath/ath9k/hw.h                |    8 +-
 drivers/net/wireless/ath/ath9k/init.c              |   57 +-
 drivers/net/wireless/ath/ath9k/mac.c               |  103 +-
 drivers/net/wireless/ath/ath9k/mac.h               |    5 +-
 drivers/net/wireless/ath/ath9k/main.c              |  754 ++--
 drivers/net/wireless/ath/ath9k/pci.c               |   20 +-
 drivers/net/wireless/ath/ath9k/rc.c                |    3 +-
 drivers/net/wireless/ath/ath9k/recv.c              |  177 +-
 drivers/net/wireless/ath/ath9k/reg.h               |   22 +
 drivers/net/wireless/ath/ath9k/virtual.c           |  717 ---
 drivers/net/wireless/ath/ath9k/wmi.c               |    4 -
 drivers/net/wireless/ath/ath9k/xmit.c              |  308 +-
 drivers/net/wireless/ath/carl9170/carl9170.h       |    3 +-
 drivers/net/wireless/ath/carl9170/fw.c             |   15 +
 drivers/net/wireless/ath/carl9170/fwcmd.h          |    1 +
 drivers/net/wireless/ath/carl9170/fwdesc.h         |   28 +-
 drivers/net/wireless/ath/carl9170/hw.h             |   25 +
 drivers/net/wireless/ath/carl9170/main.c           |    9 +-
 drivers/net/wireless/ath/carl9170/tx.c             |    8 +-
 drivers/net/wireless/ath/carl9170/version.h        |    8 +-
 drivers/net/wireless/ath/carl9170/wlan.h           |   20 +-
 drivers/net/wireless/ath/key.c                     |    5 +-
 drivers/net/wireless/ath/regd.c                    |    7 +
 drivers/net/wireless/ath/regd.h                    |    1 +
 drivers/net/wireless/b43/Kconfig                   |    2 +-
 drivers/net/wireless/b43/main.c                    |    6 +-
 drivers/net/wireless/b43/phy_n.c                   |  207 +-
 drivers/net/wireless/b43/tables_nphy.c             | 1209 +++++-
 drivers/net/wireless/b43/tables_nphy.h             |   52 +
 drivers/net/wireless/b43/xmit.c                    |   75 +-
 drivers/net/wireless/b43/xmit.h                    |    6 +
 drivers/net/wireless/b43legacy/main.c              |    5 +-
 drivers/net/wireless/b43legacy/xmit.c              |    2 +-
 drivers/net/wireless/ipw2x00/ipw2100.c             |    2 +-
 drivers/net/wireless/ipw2x00/ipw2200.h             |    2 +-
 drivers/net/wireless/iwlegacy/Kconfig              |  116 +
 drivers/net/wireless/iwlegacy/Makefile             |   25 +
 .../{iwlwifi => iwlegacy}/iwl-3945-debugfs.c       |   11 +-
 .../{iwlwifi => iwlegacy}/iwl-3945-debugfs.h       |    4 +-
 .../wireless/{iwlwifi => iwlegacy}/iwl-3945-fh.h   |    5 +-
 .../wireless/{iwlwifi => iwlegacy}/iwl-3945-hw.h   |    9 +-
 .../wireless/{iwlwifi => iwlegacy}/iwl-3945-led.c  |   31 +-
 .../wireless/{iwlwifi => iwlegacy}/iwl-3945-led.h  |    2 +-
 .../wireless/{iwlwifi => iwlegacy}/iwl-3945-rs.c   |   41 +-
 .../net/wireless/{iwlwifi => iwlegacy}/iwl-3945.c  |  267 +-
 .../net/wireless/{iwlwifi => iwlegacy}/iwl-3945.h  |   12 +-
 drivers/net/wireless/iwlegacy/iwl-4965-calib.c     |  967 ++++
 .../iwl-legacy.h => iwlegacy/iwl-4965-calib.h}     |   30 +-
 drivers/net/wireless/iwlegacy/iwl-4965-debugfs.c   |  774 +++
 .../iwl-4965-debugfs.h}                            |   35 +-
 .../iwl-legacy.h => iwlegacy/iwl-4965-eeprom.c}    |  107 +-
 .../wireless/{iwlwifi => iwlegacy}/iwl-4965-hw.h   |   26 +-
 .../iwl-3945-led.c => iwlegacy/iwl-4965-led.c}     |   49 +-
 .../iwl-3945-led.h => iwlegacy/iwl-4965-led.h}     |   11 +-
 drivers/net/wireless/iwlegacy/iwl-4965-lib.c       | 1260 +++++
 drivers/net/wireless/iwlegacy/iwl-4965-rs.c        | 2870 +++++++++++
 .../iwl-agn-rx.c => iwlegacy/iwl-4965-rx.c}        |  177 +-
 drivers/net/wireless/iwlegacy/iwl-4965-sta.c       |  721 +++
 drivers/net/wireless/iwlegacy/iwl-4965-tx.c        | 1369 ++++++
 drivers/net/wireless/iwlegacy/iwl-4965-ucode.c     |  166 +
 .../net/wireless/{iwlwifi => iwlegacy}/iwl-4965.c  |  815 +---
 drivers/net/wireless/iwlegacy/iwl-4965.h           |  282 ++
 drivers/net/wireless/iwlegacy/iwl-commands.h       | 3405 +++++++++++++
 drivers/net/wireless/iwlegacy/iwl-core.c           | 2674 +++++++++++
 drivers/net/wireless/iwlegacy/iwl-core.h           |  646 +++
 drivers/net/wireless/iwlegacy/iwl-csr.h            |  422 ++
 drivers/net/wireless/iwlegacy/iwl-debug.h          |  198 +
 drivers/net/wireless/iwlegacy/iwl-debugfs.c        | 1467 ++++++
 drivers/net/wireless/iwlegacy/iwl-dev.h            | 1426 ++++++
 .../iwl-3945-led.h => iwlegacy/iwl-devtrace.c}     |   23 +-
 drivers/net/wireless/iwlegacy/iwl-devtrace.h       |  270 ++
 drivers/net/wireless/iwlegacy/iwl-eeprom.c         |  561 +++
 drivers/net/wireless/iwlegacy/iwl-eeprom.h         |  344 ++
 drivers/net/wireless/iwlegacy/iwl-fh.h             |  513 ++
 drivers/net/wireless/iwlegacy/iwl-hcmd.c           |  271 ++
 drivers/net/wireless/iwlegacy/iwl-helpers.h        |  181 +
 drivers/net/wireless/iwlegacy/iwl-io.h             |  545 +++
 drivers/net/wireless/iwlegacy/iwl-led.c            |  188 +
 .../{iwlwifi/iwl-3945-led.h => iwlegacy/iwl-led.h} |   34 +-
 drivers/net/wireless/iwlegacy/iwl-legacy-rs.h      |  456 ++
 drivers/net/wireless/iwlegacy/iwl-power.c          |  165 +
 drivers/net/wireless/iwlegacy/iwl-power.h          |   55 +
 drivers/net/wireless/iwlegacy/iwl-prph.h           |  523 ++
 drivers/net/wireless/iwlegacy/iwl-rx.c             |  302 ++
 drivers/net/wireless/iwlegacy/iwl-scan.c           |  625 +++
 drivers/net/wireless/iwlegacy/iwl-spectrum.h       |   92 +
 drivers/net/wireless/iwlegacy/iwl-sta.c            |  816 ++++
 drivers/net/wireless/iwlegacy/iwl-sta.h            |  148 +
 drivers/net/wireless/iwlegacy/iwl-tx.c             |  660 +++
 .../wireless/{iwlwifi => iwlegacy}/iwl3945-base.c  |  566 ++--
 drivers/net/wireless/iwlegacy/iwl4965-base.c       | 3632 ++++++++++++++
 drivers/net/wireless/iwlwifi/Kconfig               |  132 +-
 drivers/net/wireless/iwlwifi/Makefile              |   40 +-
 drivers/net/wireless/iwlwifi/iwl-1000.c            |    4 +-
 drivers/net/wireless/iwlwifi/iwl-2000.c            |  560 +++
 drivers/net/wireless/iwlwifi/iwl-5000.c            |    4 -
 drivers/net/wireless/iwlwifi/iwl-6000.c            |   59 +-
 drivers/net/wireless/iwlwifi/iwl-agn-calib.c       |    9 +-
 drivers/net/wireless/iwlwifi/iwl-agn-debugfs.c     |   12 +-
 drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c        |   18 +-
 drivers/net/wireless/iwlwifi/iwl-agn-led.c         |   14 +-
 drivers/net/wireless/iwlwifi/iwl-agn-led.h         |    1 +
 drivers/net/wireless/iwlwifi/iwl-agn-lib.c         |  539 +--
 drivers/net/wireless/iwlwifi/iwl-agn-rs.c          |   29 +-
 drivers/net/wireless/iwlwifi/iwl-agn-rs.h          |    1 +
 drivers/net/wireless/iwlwifi/iwl-agn-rxon.c        |  101 +-
 drivers/net/wireless/iwlwifi/iwl-agn-tx.c          |   21 +-
 drivers/net/wireless/iwlwifi/iwl-agn-ucode.c       |    8 -
 drivers/net/wireless/iwlwifi/iwl-agn.c             |  582 ++--
 drivers/net/wireless/iwlwifi/iwl-agn.h             |   49 +-
 drivers/net/wireless/iwlwifi/iwl-commands.h        |  130 +-
 drivers/net/wireless/iwlwifi/iwl-core.c            |  166 +-
 drivers/net/wireless/iwlwifi/iwl-core.h            |   66 +-
 drivers/net/wireless/iwlwifi/iwl-csr.h             |   16 +-
 drivers/net/wireless/iwlwifi/iwl-debugfs.c         |  119 +-
 drivers/net/wireless/iwlwifi/iwl-dev.h             |   90 +-
 drivers/net/wireless/iwlwifi/iwl-eeprom.c          |    8 -
 drivers/net/wireless/iwlwifi/iwl-eeprom.h          |   26 +-
 drivers/net/wireless/iwlwifi/iwl-hcmd.c            |    6 +-
 drivers/net/wireless/iwlwifi/iwl-led.c             |  199 +-
 drivers/net/wireless/iwlwifi/iwl-led.h             |   16 +-
 drivers/net/wireless/iwlwifi/iwl-legacy.c          |  662 ---
 drivers/net/wireless/iwlwifi/iwl-power.c           |   12 +-
 drivers/net/wireless/iwlwifi/iwl-rx.c              |  880 ++++-
 drivers/net/wireless/iwlwifi/iwl-scan.c            |   54 +-
 drivers/net/wireless/iwlwifi/iwl-sta.c             |   11 -
 drivers/net/wireless/iwlwifi/iwl-tx.c              |   78 +-
 drivers/net/wireless/iwmc3200wifi/cfg80211.c       |    3 +-
 drivers/net/wireless/iwmc3200wifi/rx.c             |    7 +-
 drivers/net/wireless/libertas/cfg.c                |    6 +-
 drivers/net/wireless/libertas/cmd.c                |   10 +-
 drivers/net/wireless/libertas/dev.h                |    2 +
 drivers/net/wireless/libertas/host.h               |    2 +-
 drivers/net/wireless/libertas/if_spi.c             |  368 +-
 drivers/net/wireless/libertas/main.c               |   77 +-
 drivers/net/wireless/libertas/mesh.c               |   11 +-
 drivers/net/wireless/libertas_tf/main.c            |    3 +-
 drivers/net/wireless/mac80211_hwsim.c              |    8 +-
 drivers/net/wireless/mwl8k.c                       |  516 ++-
 drivers/net/wireless/orinoco/scan.c                |    5 +
 drivers/net/wireless/p54/Kconfig                   |    5 +-
 drivers/net/wireless/p54/eeprom.c                  |  211 +-
 drivers/net/wireless/p54/eeprom.h                  |    7 +
 drivers/net/wireless/p54/fwio.c                    |   21 +-
 drivers/net/wireless/p54/lmac.h                    |    3 +-
 drivers/net/wireless/p54/main.c                    |   61 +-
 drivers/net/wireless/p54/p54.h                     |    7 +-
 drivers/net/wireless/p54/p54spi_eeprom.h           |    9 +-
 drivers/net/wireless/p54/txrx.c                    |   19 +-
 drivers/net/wireless/rt2x00/Kconfig                |   12 +
 drivers/net/wireless/rt2x00/rt2400pci.c            |  183 +-
 drivers/net/wireless/rt2x00/rt2500pci.c            |  179 +-
 drivers/net/wireless/rt2x00/rt2500usb.c            |   17 +-
 drivers/net/wireless/rt2x00/rt2800.h               |  139 +-
 drivers/net/wireless/rt2x00/rt2800lib.c            |  917 +++-
 drivers/net/wireless/rt2x00/rt2800lib.h            |    4 +-
 drivers/net/wireless/rt2x00/rt2800pci.c            |  239 +-
 drivers/net/wireless/rt2x00/rt2800usb.c            |    4 +-
 drivers/net/wireless/rt2x00/rt2x00.h               |   67 +-
 drivers/net/wireless/rt2x00/rt2x00dev.c            |   74 +-
 drivers/net/wireless/rt2x00/rt2x00ht.c             |   29 +-
 drivers/net/wireless/rt2x00/rt2x00lib.h            |   24 +-
 drivers/net/wireless/rt2x00/rt2x00link.c           |    7 +-
 drivers/net/wireless/rt2x00/rt2x00mac.c            |   75 +-
 drivers/net/wireless/rt2x00/rt2x00pci.c            |    7 +-
 drivers/net/wireless/rt2x00/rt2x00queue.c          |  178 +-
 drivers/net/wireless/rt2x00/rt2x00queue.h          |   29 +-
 drivers/net/wireless/rt2x00/rt2x00reg.h            |    2 -
 drivers/net/wireless/rt2x00/rt2x00usb.c            |    8 +-
 drivers/net/wireless/rt2x00/rt61pci.c              |  251 +-
 drivers/net/wireless/rt2x00/rt73usb.c              |   75 +-
 drivers/net/wireless/rtl818x/rtl8180/dev.c         |   10 +-
 drivers/net/wireless/rtl818x/rtl8187/dev.c         |   33 +-
 drivers/net/wireless/rtl818x/rtl8187/rtl8187.h     |    2 +
 drivers/net/wireless/rtlwifi/Kconfig               |   24 +-
 drivers/net/wireless/rtlwifi/Makefile              |   15 +-
 drivers/net/wireless/rtlwifi/base.c                |   91 +-
 drivers/net/wireless/rtlwifi/base.h                |   39 +-
 drivers/net/wireless/rtlwifi/core.c                |   26 +-
 drivers/net/wireless/rtlwifi/debug.h               |    1 +
 drivers/net/wireless/rtlwifi/efuse.c               |   18 -
 drivers/net/wireless/rtlwifi/efuse.h               |    3 -
 drivers/net/wireless/rtlwifi/pci.c                 |  152 +-
 drivers/net/wireless/rtlwifi/pci.h                 |   12 +-
 drivers/net/wireless/rtlwifi/ps.c                  |   58 +-
 drivers/net/wireless/rtlwifi/rtl8192c/Makefile     |    9 +
 drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c  | 1398 ++++++
 drivers/net/wireless/rtlwifi/rtl8192c/dm_common.h  |  204 +
 .../{rtl8192ce/fw.c => rtl8192c/fw_common.c}       |   72 +-
 .../{rtl8192ce/fw.h => rtl8192c/fw_common.h}       |    0
 .../iwl-3945-led.h => rtlwifi/rtl8192c/main.c}     |   21 +-
 drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c | 2042 ++++++++
 drivers/net/wireless/rtlwifi/rtl8192c/phy_common.h |  246 +
 drivers/net/wireless/rtlwifi/rtl8192ce/Makefile    |    3 +-
 drivers/net/wireless/rtlwifi/rtl8192ce/def.h       |  144 +
 drivers/net/wireless/rtlwifi/rtl8192ce/dm.c        | 1364 +------
 drivers/net/wireless/rtlwifi/rtl8192ce/dm.h        |    1 +
 drivers/net/wireless/rtlwifi/rtl8192ce/hw.c        |  158 +-
 drivers/net/wireless/rtlwifi/rtl8192ce/hw.h        |   11 +
 drivers/net/wireless/rtlwifi/rtl8192ce/led.c       |    6 +-
 drivers/net/wireless/rtlwifi/rtl8192ce/phy.c       | 2095 +--------
 drivers/net/wireless/rtlwifi/rtl8192ce/phy.h       |   35 +-
 drivers/net/wireless/rtlwifi/rtl8192ce/reg.h       |   73 +-
 drivers/net/wireless/rtlwifi/rtl8192ce/rf.c        |   10 +-
 drivers/net/wireless/rtlwifi/rtl8192ce/rf.h        |    5 +-
 drivers/net/wireless/rtlwifi/rtl8192ce/sw.c        |   22 +-
 drivers/net/wireless/rtlwifi/rtl8192ce/sw.h        |   14 +
 drivers/net/wireless/rtlwifi/rtl8192ce/trx.c       |  183 +-
 drivers/net/wireless/rtlwifi/rtl8192ce/trx.h       |  464 +-
 drivers/net/wireless/rtlwifi/rtl8192cu/Makefile    |   14 +
 drivers/net/wireless/rtlwifi/rtl8192cu/def.h       |   62 +
 drivers/net/wireless/rtlwifi/rtl8192cu/dm.c        |  113 +
 .../iwl-3945-led.h => rtlwifi/rtl8192cu/dm.h}      |   16 +-
 drivers/net/wireless/rtlwifi/rtl8192cu/hw.c        | 2504 ++++++++++
 drivers/net/wireless/rtlwifi/rtl8192cu/hw.h        |  116 +
 drivers/net/wireless/rtlwifi/rtl8192cu/led.c       |  142 +
 .../iwl-3945-led.h => rtlwifi/rtl8192cu/led.h}     |   19 +-
 drivers/net/wireless/rtlwifi/rtl8192cu/mac.c       | 1144 +++++
 drivers/net/wireless/rtlwifi/rtl8192cu/mac.h       |  180 +
 drivers/net/wireless/rtlwifi/rtl8192cu/phy.c       |  607 +++
 .../iwl-3945-led.h => rtlwifi/rtl8192cu/phy.h}     |   20 +-
 .../iwl-3945-led.h => rtlwifi/rtl8192cu/reg.h}     |   16 +-
 drivers/net/wireless/rtlwifi/rtl8192cu/rf.c        |  493 ++
 .../iwl-3945-led.h => rtlwifi/rtl8192cu/rf.h}      |   29 +-
 drivers/net/wireless/rtlwifi/rtl8192cu/sw.c        |  336 ++
 drivers/net/wireless/rtlwifi/rtl8192cu/sw.h        |   53 +
 drivers/net/wireless/rtlwifi/rtl8192cu/table.c     | 1888 ++++++++
 drivers/net/wireless/rtlwifi/rtl8192cu/table.h     |   71 +
 drivers/net/wireless/rtlwifi/rtl8192cu/trx.c       |  687 +++
 drivers/net/wireless/rtlwifi/rtl8192cu/trx.h       |  430 ++
 drivers/net/wireless/rtlwifi/usb.c                 | 1035 ++++
 drivers/net/wireless/rtlwifi/usb.h                 |  164 +
 drivers/net/wireless/rtlwifi/wifi.h                |  680 ++-
 drivers/net/wireless/wl1251/acx.c                  |   53 +
 drivers/net/wireless/wl1251/acx.h                  |   72 +
 drivers/net/wireless/wl1251/event.c                |   18 +
 drivers/net/wireless/wl1251/main.c                 |   22 +-
 drivers/net/wireless/wl1251/ps.c                   |   52 +-
 drivers/net/wireless/wl1251/rx.c                   |   51 +-
 drivers/net/wireless/wl1251/tx.c                   |   74 +-
 drivers/net/wireless/wl1251/wl1251.h               |    7 +
 drivers/net/wireless/wl1251/wl12xx_80211.h         |    3 +-
 drivers/net/wireless/wl12xx/Kconfig                |    2 +-
 drivers/net/wireless/wl12xx/acx.c                  |  277 +-
 drivers/net/wireless/wl12xx/acx.h                  |  141 +-
 drivers/net/wireless/wl12xx/boot.c                 |   38 +-
 drivers/net/wireless/wl12xx/boot.h                 |    5 +
 drivers/net/wireless/wl12xx/cmd.c                  |  319 ++-
 drivers/net/wireless/wl12xx/cmd.h                  |  161 +-
 drivers/net/wireless/wl12xx/conf.h                 |  125 +-
 drivers/net/wireless/wl12xx/debugfs.c              |   51 +-
 drivers/net/wireless/wl12xx/event.c                |   21 +-
 drivers/net/wireless/wl12xx/event.h                |   10 +-
 drivers/net/wireless/wl12xx/init.c                 |  400 ++-
 drivers/net/wireless/wl12xx/init.h                 |    2 +-
 drivers/net/wireless/wl12xx/io.h                   |    1 +
 drivers/net/wireless/wl12xx/main.c                 | 1462 +++++--
 drivers/net/wireless/wl12xx/ps.c                   |   90 +-
 drivers/net/wireless/wl12xx/ps.h                   |    4 +-
 drivers/net/wireless/wl12xx/rx.c                   |   37 +-
 drivers/net/wireless/wl12xx/rx.h                   |   17 +-
 drivers/net/wireless/wl12xx/scan.c                 |   20 +-
 drivers/net/wireless/wl12xx/sdio.c                 |   43 +-
 drivers/net/wireless/wl12xx/spi.c                  |   21 +-
 drivers/net/wireless/wl12xx/tx.c                   |  365 ++-
 drivers/net/wireless/wl12xx/tx.h                   |   15 +-
 drivers/net/wireless/wl12xx/wl12xx.h               |  211 +-
 drivers/net/wireless/wl12xx/wl12xx_80211.h         |   14 +-
 drivers/net/wireless/zd1211rw/zd_chip.c            |  169 +-
 drivers/net/wireless/zd1211rw/zd_chip.h            |    5 +-
 drivers/net/wireless/zd1211rw/zd_def.h             |    2 +-
 drivers/net/wireless/zd1211rw/zd_mac.c             |  453 ++-
 drivers/net/wireless/zd1211rw/zd_mac.h             |   24 +-
 drivers/net/wireless/zd1211rw/zd_usb.c             |  597 ++-
 drivers/net/wireless/zd1211rw/zd_usb.h             |   37 +-
 drivers/net/xen-netback/Makefile                   |    3 +
 drivers/net/xen-netback/common.h                   |  161 +
 drivers/net/xen-netback/interface.c                |  424 ++
 drivers/net/xen-netback/netback.c                  | 1745 +++++++
 drivers/net/xen-netback/xenbus.c                   |  490 ++
 drivers/net/xen-netfront.c                         |   24 +-
 drivers/s390/net/qeth_core.h                       |    4 +-
 drivers/s390/net/qeth_core_main.c                  |   57 +-
 drivers/s390/net/qeth_l2_main.c                    |   45 +-
 drivers/s390/net/qeth_l3_main.c                    |   60 +-
 drivers/scsi/cxgbi/cxgb3i/Kconfig                  |    4 +-
 drivers/scsi/cxgbi/cxgb4i/Kconfig                  |    4 +-
 drivers/scsi/cxgbi/libcxgbi.c                      |   21 +-
 drivers/scsi/fcoe/fcoe.c                           |    4 +-
 drivers/ssb/main.c                                 |   44 +-
 drivers/ssb/pci.c                                  |    6 +-
 drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c   |    4 +-
 drivers/staging/brcm80211/sys/wl_mac80211.c        |   28 +-
 drivers/staging/brcm80211/sys/wlc_mac80211.c       |    5 +-
 drivers/staging/pohmelfs/config.c                  |    2 +-
 drivers/staging/winbond/wbusb.c                    |    7 +-
 drivers/video/uvesafb.c                            |    2 +-
 drivers/xen/events.c                               |   38 +
 firmware/Makefile                                  |    2 +-
 firmware/WHENCE                                    |    2 +-
 ...9-6.2.1.fw.ihex => bnx2-mips-09-6.2.1a.fw.ihex} | 5006 ++++++++++----------
 include/linux/audit.h                              |    2 +
 include/linux/cpu_rmap.h                           |   73 +
 include/linux/dcbnl.h                              |  113 +-
 include/linux/dccp.h                               |    2 -
 include/linux/ethtool.h                            |   91 +-
 include/linux/icmpv6.h                             |    4 +-
 include/linux/ieee80211.h                          |    3 +
 include/linux/if.h                                 |    9 +-
 include/linux/if_link.h                            |    1 +
 include/linux/igmp.h                               |    2 +-
 include/linux/inetdevice.h                         |    1 +
 include/linux/interrupt.h                          |   33 +-
 include/linux/ip_vs.h                              |    8 +
 include/linux/irqdesc.h                            |    3 +
 include/linux/micrel_phy.h                         |   16 +
 include/linux/net.h                                |    3 +-
 include/linux/netdevice.h                          |  305 ++-
 include/linux/netfilter.h                          |   27 +-
 include/linux/netfilter/Kbuild                     |    7 +
 include/linux/netfilter/ipset/Kbuild               |    4 +
 include/linux/netfilter/ipset/ip_set.h             |  452 ++
 include/linux/netfilter/ipset/ip_set_ahash.h       | 1074 +++++
 include/linux/netfilter/ipset/ip_set_bitmap.h      |   31 +
 include/linux/netfilter/ipset/ip_set_getport.h     |   21 +
 include/linux/netfilter/ipset/ip_set_hash.h        |   26 +
 include/linux/netfilter/ipset/ip_set_list.h        |   27 +
 include/linux/netfilter/ipset/ip_set_timeout.h     |  127 +
 include/linux/netfilter/ipset/pfxlen.h             |   35 +
 include/linux/netfilter/nf_conntrack_snmp.h        |    9 +
 include/linux/netfilter/nfnetlink.h                |    3 +-
 include/linux/netfilter/nfnetlink_conntrack.h      |    9 +
 include/linux/netfilter/x_tables.h                 |    3 +-
 include/linux/netfilter/xt_AUDIT.h                 |   30 +
 include/linux/netfilter/xt_CT.h                    |   12 +-
 include/linux/netfilter/xt_NFQUEUE.h               |    6 +
 include/linux/netfilter/xt_TCPOPTSTRIP.h           |    4 +-
 include/linux/netfilter/xt_TPROXY.h                |   10 +-
 include/linux/netfilter/xt_addrtype.h              |   44 +
 include/linux/netfilter/xt_cluster.h               |   10 +-
 include/linux/netfilter/xt_comment.h               |    2 +-
 include/linux/netfilter/xt_connlimit.h             |   16 +-
 include/linux/netfilter/xt_conntrack.h             |   15 +
 include/linux/netfilter/xt_devgroup.h              |   21 +
 include/linux/netfilter/xt_quota.h                 |    8 +-
 include/linux/netfilter/xt_set.h                   |   56 +
 include/linux/netfilter/xt_socket.h                |    2 +
 include/linux/netfilter/xt_time.h                  |   16 +-
 include/linux/netfilter/xt_u32.h                   |   18 +-
 include/linux/netfilter_bridge/ebt_802_3.h         |   26 +-
 include/linux/netfilter_bridge/ebt_among.h         |    4 +-
 include/linux/netfilter_bridge/ebt_arp.h           |    6 +-
 include/linux/netfilter_bridge/ebt_ip.h            |   14 +-
 include/linux/netfilter_bridge/ebt_ip6.h           |   25 +-
 include/linux/netfilter_bridge/ebt_limit.h         |   10 +-
 include/linux/netfilter_bridge/ebt_log.h           |    8 +-
 include/linux/netfilter_bridge/ebt_mark_m.h        |    6 +-
 include/linux/netfilter_bridge/ebt_nflog.h         |   12 +-
 include/linux/netfilter_bridge/ebt_pkttype.h       |    6 +-
 include/linux/netfilter_bridge/ebt_stp.h           |   26 +-
 include/linux/netfilter_bridge/ebt_ulog.h          |    4 +-
 include/linux/netfilter_bridge/ebt_vlan.h          |   10 +-
 include/linux/netfilter_ipv4/ipt_CLUSTERIP.h       |   16 +-
 include/linux/netfilter_ipv4/ipt_ECN.h             |    8 +-
 include/linux/netfilter_ipv4/ipt_SAME.h            |    8 +-
 include/linux/netfilter_ipv4/ipt_TTL.h             |    6 +-
 include/linux/netfilter_ipv4/ipt_addrtype.h        |   16 +-
 include/linux/netfilter_ipv4/ipt_ah.h              |    6 +-
 include/linux/netfilter_ipv4/ipt_ecn.h             |   10 +-
 include/linux/netfilter_ipv4/ipt_ttl.h             |    6 +-
 include/linux/netfilter_ipv6/ip6t_HL.h             |    6 +-
 include/linux/netfilter_ipv6/ip6t_REJECT.h         |    4 +-
 include/linux/netfilter_ipv6/ip6t_ah.h             |   10 +-
 include/linux/netfilter_ipv6/ip6t_frag.h           |   10 +-
 include/linux/netfilter_ipv6/ip6t_hl.h             |    6 +-
 include/linux/netfilter_ipv6/ip6t_ipv6header.h     |    8 +-
 include/linux/netfilter_ipv6/ip6t_mh.h             |    6 +-
 include/linux/netfilter_ipv6/ip6t_opts.h           |   12 +-
 include/linux/netfilter_ipv6/ip6t_rt.h             |   13 +-
 include/linux/netlink.h                            |    4 -
 include/linux/nl80211.h                            |    3 +
 include/linux/pci.h                                |    1 +
 include/linux/phonet.h                             |    4 +-
 include/linux/pkt_sched.h                          |  107 +
 include/linux/security.h                           |    7 +-
 include/linux/skbuff.h                             |   16 +-
 include/linux/sockios.h                            |    4 +-
 include/linux/ssb/ssb_regs.h                       |    7 +-
 include/linux/tipc.h                               |    8 +-
 include/linux/tipc_config.h                        |   38 +-
 include/linux/xfrm.h                               |   13 +
 include/net/bluetooth/bluetooth.h                  |   33 +
 include/net/bluetooth/hci.h                        |  139 +
 include/net/bluetooth/hci_core.h                   |  173 +-
 include/net/bluetooth/l2cap.h                      |   53 +-
 include/net/bluetooth/mgmt.h                       |  171 +-
 include/net/bluetooth/smp.h                        |   76 +
 include/net/cfg80211.h                             |   16 +-
 include/net/dcbnl.h                                |    9 +
 include/net/dn.h                                   |    6 +-
 include/net/dn_fib.h                               |    8 +-
 include/net/dn_route.h                             |    8 +-
 include/net/dst.h                                  |  142 +-
 include/net/dst_ops.h                              |    1 +
 include/net/flow.h                                 |  204 +-
 include/net/icmp.h                                 |    3 -
 include/net/ieee80211_radiotap.h                   |   25 +
 include/net/inet_sock.h                            |   31 +-
 include/net/inetpeer.h                             |   44 +-
 include/net/ip.h                                   |   16 +
 include/net/ip6_fib.h                              |    5 +-
 include/net/ip6_route.h                            |    2 +-
 include/net/ip_fib.h                               |   43 +-
 include/net/ip_vs.h                                |  477 ++-
 include/net/ipv6.h                                 |   28 +-
 include/net/mac80211.h                             |  106 +-
 include/net/net_namespace.h                        |    2 +
 include/net/netevent.h                             |    1 -
 include/net/netfilter/nf_conntrack.h               |   23 +-
 include/net/netfilter/nf_conntrack_ecache.h        |   12 +-
 include/net/netfilter/nf_conntrack_extend.h        |   10 +
 include/net/netfilter/nf_conntrack_helper.h        |    6 +
 include/net/netfilter/nf_conntrack_l3proto.h       |    2 +-
 include/net/netfilter/nf_conntrack_timestamp.h     |   65 +
 include/net/netfilter/nf_nat.h                     |    6 +
 include/net/netfilter/nf_nat_core.h                |    4 +-
 include/net/netlink.h                              |    9 +
 include/net/netns/conntrack.h                      |    4 +-
 include/net/netns/ipv4.h                           |    1 -
 include/net/phonet/pep.h                           |   23 +-
 include/net/phonet/phonet.h                        |    1 +
 include/net/protocol.h                             |    4 +-
 include/net/route.h                                |  164 +-
 include/net/sch_generic.h                          |   60 +-
 include/net/sock.h                                 |    9 +-
 include/net/tcp.h                                  |   16 +-
 include/net/transp_v6.h                            |    4 +-
 include/net/udp.h                                  |   13 +-
 include/net/udplite.h                              |   12 +
 include/net/xfrm.h                                 |  213 +-
 include/xen/events.h                               |    6 +
 include/xen/interface/io/netif.h                   |   80 +-
 kernel/audit.c                                     |    8 +-
 kernel/auditfilter.c                               |   10 +-
 kernel/irq/manage.c                                |   82 +
 lib/Kconfig                                        |   13 +-
 lib/Makefile                                       |    2 +
 lib/cpu_rmap.c                                     |  269 ++
 net/8021q/vlan.c                                   |    2 +-
 net/8021q/vlan_dev.c                               |   14 +
 net/9p/trans_rdma.c                                |    1 -
 net/Kconfig                                        |    6 +
 net/atm/clip.c                                     |    8 +-
 net/batman-adv/Makefile                            |    2 +-
 net/batman-adv/aggregation.c                       |   10 +-
 net/batman-adv/aggregation.h                       |    6 +-
 net/batman-adv/bat_debugfs.c                       |    6 +-
 net/batman-adv/bat_debugfs.h                       |    2 +-
 net/batman-adv/bat_sysfs.c                         |   53 +-
 net/batman-adv/bat_sysfs.h                         |    2 +-
 net/batman-adv/bitarray.c                          |    2 +-
 net/batman-adv/bitarray.h                          |    2 +-
 net/batman-adv/gateway_client.c                    |  142 +-
 net/batman-adv/gateway_client.h                    |    2 +-
 net/batman-adv/gateway_common.c                    |    2 +-
 net/batman-adv/gateway_common.h                    |    2 +-
 net/batman-adv/hard-interface.c                    |  420 +-
 net/batman-adv/hard-interface.h                    |   21 +-
 net/batman-adv/hash.c                              |   28 +-
 net/batman-adv/hash.h                              |  119 +-
 net/batman-adv/icmp_socket.c                       |   43 +-
 net/batman-adv/icmp_socket.h                       |    4 +-
 net/batman-adv/main.c                              |   16 +-
 net/batman-adv/main.h                              |   29 +-
 net/batman-adv/originator.c                        |  254 +-
 net/batman-adv/originator.h                        |   52 +-
 net/batman-adv/packet.h                            |    3 +-
 net/batman-adv/ring_buffer.c                       |    2 +-
 net/batman-adv/ring_buffer.h                       |    2 +-
 net/batman-adv/routing.c                           | 1000 +++--
 net/batman-adv/routing.h                           |   30 +-
 net/batman-adv/send.c                              |  110 +-
 net/batman-adv/send.h                              |   12 +-
 net/batman-adv/soft-interface.c                    |   77 +-
 net/batman-adv/soft-interface.h                    |    5 +-
 net/batman-adv/translation-table.c                 |  208 +-
 net/batman-adv/translation-table.h                 |    4 +-
 net/batman-adv/types.h                             |   50 +-
 net/batman-adv/unicast.c                           |  121 +-
 net/batman-adv/unicast.h                           |   27 +-
 net/batman-adv/vis.c                               |  194 +-
 net/batman-adv/vis.h                               |    2 +-
 net/bluetooth/Kconfig                              |   20 +-
 net/bluetooth/Makefile                             |    4 +-
 net/bluetooth/af_bluetooth.c                       |   51 +-
 net/bluetooth/bnep/core.c                          |    2 -
 net/bluetooth/bnep/sock.c                          |    1 +
 net/bluetooth/cmtp/capi.c                          |    3 +-
 net/bluetooth/cmtp/core.c                          |   11 +-
 net/bluetooth/hci_conn.c                           |   80 +-
 net/bluetooth/hci_core.c                           |  345 ++-
 net/bluetooth/hci_event.c                          |  691 +++-
 net/bluetooth/hci_sock.c                           |    8 +-
 net/bluetooth/hci_sysfs.c                          |   58 +-
 net/bluetooth/hidp/core.c                          |   11 +-
 net/bluetooth/{l2cap.c => l2cap_core.c}            | 1723 ++-----
 net/bluetooth/l2cap_sock.c                         | 1156 +++++
 net/bluetooth/mgmt.c                               | 1585 ++++++-
 net/bluetooth/rfcomm/core.c                        |    2 -
 net/bluetooth/sco.c                                |   24 +-
 net/bridge/br_device.c                             |   21 +
 net/bridge/br_if.c                                 |   15 +-
 net/bridge/br_input.c                              |   25 +-
 net/bridge/br_netfilter.c                          |   14 +-
 net/bridge/br_private.h                            |    4 +-
 net/bridge/br_stp.c                                |   39 +-
 net/bridge/br_stp_timer.c                          |    1 +
 net/bridge/netfilter/ebt_ip6.c                     |   46 +-
 net/bridge/netfilter/ebtables.c                    |    3 +
 net/caif/cfcnfg.c                                  |    2 -
 net/caif/cfdgml.c                                  |    1 -
 net/caif/cfserl.c                                  |    1 -
 net/caif/cfutill.c                                 |    2 +-
 net/caif/cfveil.c                                  |    2 +-
 net/core/dev.c                                     |  463 ++-
 net/core/dst.c                                     |   43 +-
 net/core/ethtool.c                                 |  604 ++-
 net/core/fib_rules.c                               |    6 +-
 net/core/filter.c                                  |    6 +-
 net/core/flow.c                                    |   14 +-
 net/core/neighbour.c                               |   13 +-
 net/core/net-sysfs.c                               |   17 +-
 net/core/netpoll.c                                 |   13 +-
 net/core/pktgen.c                                  |  233 +-
 net/core/rtnetlink.c                               |   86 +-
 net/core/skbuff.c                                  |    8 +-
 net/dcb/dcbnl.c                                    |  148 +-
 net/dccp/ccids/ccid2.c                             |    9 +
 net/dccp/ipv4.c                                    |   50 +-
 net/dccp/ipv6.c                                    |  188 +-
 net/decnet/af_decnet.c                             |   16 +-
 net/decnet/dn_fib.c                                |   23 +-
 net/decnet/dn_nsp_out.c                            |   16 +-
 net/decnet/dn_route.c                              |  300 +-
 net/decnet/dn_rules.c                              |   17 +-
 net/decnet/dn_table.c                              |    7 +-
 net/dsa/mv88e6060.c                                |    7 +-
 net/ipv4/Kconfig                                   |   42 +-
 net/ipv4/Makefile                                  |    4 +-
 net/ipv4/af_inet.c                                 |   46 +-
 net/ipv4/ah4.c                                     |   27 +-
 net/ipv4/arp.c                                     |   25 +-
 net/ipv4/datagram.c                                |   11 +-
 net/ipv4/devinet.c                                 |   78 +
 net/ipv4/esp4.c                                    |  104 +-
 net/ipv4/fib_frontend.c                            |  105 +-
 net/ipv4/fib_hash.c                                | 1133 -----
 net/ipv4/fib_lookup.h                              |   10 +-
 net/ipv4/fib_rules.c                               |   25 +-
 net/ipv4/fib_semantics.c                           |  257 +-
 net/ipv4/fib_trie.c                                |  272 +-
 net/ipv4/icmp.c                                    |  240 +-
 net/ipv4/igmp.c                                    |   45 +-
 net/ipv4/inet_connection_sock.c                    |   27 +-
 net/ipv4/inetpeer.c                                |  148 +-
 net/ipv4/ip_gre.c                                  |   56 +-
 net/ipv4/ip_input.c                                |    2 +-
 net/ipv4/ip_output.c                               |  345 +-
 net/ipv4/ipip.c                                    |   39 +-
 net/ipv4/ipmr.c                                    |   79 +-
 net/ipv4/netfilter.c                               |   36 +-
 net/ipv4/netfilter/Kconfig                         |   13 +-
 net/ipv4/netfilter/Makefile                        |    1 -
 net/ipv4/netfilter/arp_tables.c                    |    5 +
 net/ipv4/netfilter/ip_tables.c                     |    5 +
 net/ipv4/netfilter/ipt_CLUSTERIP.c                 |    7 +-
 net/ipv4/netfilter/ipt_LOG.c                       |    3 +-
 net/ipv4/netfilter/ipt_addrtype.c                  |  134 -
 net/ipv4/netfilter/iptable_mangle.c                |    2 +-
 .../netfilter/nf_conntrack_l3proto_ipv4_compat.c   |   17 +-
 net/ipv4/netfilter/nf_nat_amanda.c                 |    8 +-
 net/ipv4/netfilter/nf_nat_core.c                   |   33 +-
 net/ipv4/netfilter/nf_nat_snmp_basic.c             |    9 +-
 net/ipv4/netfilter/nf_nat_standalone.c             |    9 +-
 net/ipv4/raw.c                                     |   39 +-
 net/ipv4/route.c                                   | 1181 +++---
 net/ipv4/syncookies.c                              |   25 +-
 net/ipv4/tcp.c                                     |   20 +-
 net/ipv4/tcp_bic.c                                 |    2 +-
 net/ipv4/tcp_cubic.c                               |   47 +-
 net/ipv4/tcp_highspeed.c                           |    2 +-
 net/ipv4/tcp_htcp.c                                |    2 +-
 net/ipv4/tcp_hybla.c                               |    2 +-
 net/ipv4/tcp_illinois.c                            |    2 +-
 net/ipv4/tcp_input.c                               |    4 +-
 net/ipv4/tcp_ipv4.c                                |   37 +-
 net/ipv4/tcp_lp.c                                  |    2 +-
 net/ipv4/tcp_scalable.c                            |    2 +-
 net/ipv4/tcp_timer.c                               |    3 -
 net/ipv4/tcp_vegas.c                               |    2 +-
 net/ipv4/tcp_veno.c                                |    2 +-
 net/ipv4/tcp_westwood.c                            |    2 +-
 net/ipv4/tcp_yeah.c                                |    2 +-
 net/ipv4/udp.c                                     |  139 +-
 net/ipv4/xfrm4_policy.c                            |   74 +-
 net/ipv4/xfrm4_state.c                             |   20 +-
 net/ipv6/addrconf.c                                |    3 -
 net/ipv6/af_inet6.c                                |   49 +-
 net/ipv6/ah6.c                                     |    2 +-
 net/ipv6/datagram.c                                |   88 +-
 net/ipv6/esp6.c                                    |  109 +-
 net/ipv6/exthdrs.c                                 |   12 +-
 net/ipv6/fib6_rules.c                              |   19 +-
 net/ipv6/icmp.c                                    |  226 +-
 net/ipv6/inet6_connection_sock.c                   |   81 +-
 net/ipv6/ip6_fib.c                                 |    4 +-
 net/ipv6/ip6_flowlabel.c                           |    6 +-
 net/ipv6/ip6_output.c                              |  156 +-
 net/ipv6/ip6_tunnel.c                              |   82 +-
 net/ipv6/ip6mr.c                                   |   56 +-
 net/ipv6/ipv6_sockglue.c                           |   10 +-
 net/ipv6/mcast.c                                   |   27 +-
 net/ipv6/mip6.c                                    |   16 +-
 net/ipv6/ndisc.c                                   |   22 +-
 net/ipv6/netfilter.c                               |   19 +-
 net/ipv6/netfilter/ip6_tables.c                    |    5 +
 net/ipv6/netfilter/ip6t_LOG.c                      |    3 +-
 net/ipv6/netfilter/ip6t_REJECT.c                   |   21 +-
 net/ipv6/netfilter/nf_conntrack_reasm.c            |    3 +-
 net/ipv6/raw.c                                     |  106 +-
 net/ipv6/route.c                                   |  186 +-
 net/ipv6/sit.c                                     |   56 +-
 net/ipv6/syncookies.c                              |   31 +-
 net/ipv6/tcp_ipv6.c                                |  169 +-
 net/ipv6/udp.c                                     |   91 +-
 net/ipv6/xfrm6_policy.c                            |   49 +-
 net/ipv6/xfrm6_state.c                             |   20 +-
 net/key/af_key.c                                   |  243 +-
 net/l2tp/l2tp_ip.c                                 |   36 +-
 net/llc/llc_input.c                                |   25 +-
 net/mac80211/Kconfig                               |    4 +-
 net/mac80211/agg-rx.c                              |    7 +-
 net/mac80211/agg-tx.c                              |   23 +-
 net/mac80211/cfg.c                                 |  116 +-
 net/mac80211/chan.c                                |    3 +
 net/mac80211/debugfs.c                             |    6 +
 net/mac80211/debugfs_netdev.c                      |  122 +-
 net/mac80211/driver-ops.h                          |   67 +-
 net/mac80211/driver-trace.h                        |  274 +-
 net/mac80211/ht.c                                  |    5 +-
 net/mac80211/ibss.c                                |   21 +-
 net/mac80211/ieee80211_i.h                         |   17 +-
 net/mac80211/iface.c                               |    9 +-
 net/mac80211/key.h                                 |    1 -
 net/mac80211/main.c                                |   88 +-
 net/mac80211/mesh.c                                |    4 +-
 net/mac80211/mlme.c                                |  144 +-
 net/mac80211/offchannel.c                          |   68 +-
 net/mac80211/rc80211_minstrel_ht.c                 |   60 +-
 net/mac80211/rc80211_pid.h                         |    3 -
 net/mac80211/rx.c                                  |  130 +-
 net/mac80211/scan.c                                |  138 +-
 net/mac80211/sta_info.c                            |    3 +-
 net/mac80211/sta_info.h                            |    6 +
 net/mac80211/status.c                              |   10 +-
 net/mac80211/tx.c                                  |  194 +-
 net/mac80211/util.c                                |    6 -
 net/mac80211/work.c                                |  122 +-
 net/mac80211/wpa.c                                 |   39 +-
 net/netfilter/Kconfig                              |   77 +-
 net/netfilter/Makefile                             |   10 +
 net/netfilter/core.c                               |   20 +-
 net/netfilter/ipset/Kconfig                        |  122 +
 net/netfilter/ipset/Makefile                       |   24 +
 net/netfilter/ipset/ip_set_bitmap_ip.c             |  587 +++
 net/netfilter/ipset/ip_set_bitmap_ipmac.c          |  652 +++
 net/netfilter/ipset/ip_set_bitmap_port.c           |  515 ++
 net/netfilter/ipset/ip_set_core.c                  | 1671 +++++++
 net/netfilter/ipset/ip_set_getport.c               |  141 +
 net/netfilter/ipset/ip_set_hash_ip.c               |  464 ++
 net/netfilter/ipset/ip_set_hash_ipport.c           |  544 +++
 net/netfilter/ipset/ip_set_hash_ipportip.c         |  562 +++
 net/netfilter/ipset/ip_set_hash_ipportnet.c        |  628 +++
 net/netfilter/ipset/ip_set_hash_net.c              |  458 ++
 net/netfilter/ipset/ip_set_hash_netport.c          |  578 +++
 net/netfilter/ipset/ip_set_list_set.c              |  584 +++
 net/netfilter/ipset/pfxlen.c                       |  291 ++
 net/netfilter/ipvs/ip_vs_app.c                     |   98 +-
 net/netfilter/ipvs/ip_vs_conn.c                    |  248 +-
 net/netfilter/ipvs/ip_vs_core.c                    |  456 ++-
 net/netfilter/ipvs/ip_vs_ctl.c                     | 1002 +++--
 net/netfilter/ipvs/ip_vs_est.c                     |  171 +-
 net/netfilter/ipvs/ip_vs_ftp.c                     |   61 +-
 net/netfilter/ipvs/ip_vs_lblc.c                    |   99 +-
 net/netfilter/ipvs/ip_vs_lblcr.c                   |  114 +-
 net/netfilter/ipvs/ip_vs_lc.c                      |   20 +-
 net/netfilter/ipvs/ip_vs_nfct.c                    |    6 +-
 net/netfilter/ipvs/ip_vs_nq.c                      |    2 +-
 net/netfilter/ipvs/ip_vs_pe.c                      |   17 +-
 net/netfilter/ipvs/ip_vs_pe_sip.c                  |   12 +-
 net/netfilter/ipvs/ip_vs_proto.c                   |  129 +-
 net/netfilter/ipvs/ip_vs_proto_ah_esp.c            |   45 +-
 net/netfilter/ipvs/ip_vs_proto_sctp.c              |  153 +-
 net/netfilter/ipvs/ip_vs_proto_tcp.c               |  142 +-
 net/netfilter/ipvs/ip_vs_proto_udp.c               |  110 +-
 net/netfilter/ipvs/ip_vs_rr.c                      |    2 +-
 net/netfilter/ipvs/ip_vs_sched.c                   |   25 +
 net/netfilter/ipvs/ip_vs_sed.c                     |    2 +-
 net/netfilter/ipvs/ip_vs_sh.c                      |    2 +-
 net/netfilter/ipvs/ip_vs_sync.c                    | 1238 ++++-
 net/netfilter/ipvs/ip_vs_wlc.c                     |   22 +-
 net/netfilter/ipvs/ip_vs_wrr.c                     |   14 +-
 net/netfilter/ipvs/ip_vs_xmit.c                    |  117 +-
 net/netfilter/nf_conntrack_broadcast.c             |   82 +
 net/netfilter/nf_conntrack_core.c                  |   58 +-
 net/netfilter/nf_conntrack_expect.c                |   34 +-
 net/netfilter/nf_conntrack_extend.c                |   11 +-
 net/netfilter/nf_conntrack_h323_main.c             |   32 +-
 net/netfilter/nf_conntrack_helper.c                |   20 +-
 net/netfilter/nf_conntrack_netbios_ns.c            |   74 +-
 net/netfilter/nf_conntrack_netlink.c               |   49 +-
 net/netfilter/nf_conntrack_proto.c                 |   24 +-
 net/netfilter/nf_conntrack_proto_dccp.c            |    3 +
 net/netfilter/nf_conntrack_proto_sctp.c            |    1 +
 net/netfilter/nf_conntrack_proto_tcp.c             |   18 +-
 net/netfilter/nf_conntrack_snmp.c                  |   77 +
 net/netfilter/nf_conntrack_standalone.c            |   45 +-
 net/netfilter/nf_conntrack_timestamp.c             |  120 +
 net/netfilter/nf_log.c                             |    6 +-
 net/netfilter/nf_queue.c                           |   82 +-
 net/netfilter/nfnetlink_log.c                      |    9 +-
 net/netfilter/nfnetlink_queue.c                    |   22 +-
 net/netfilter/x_tables.c                           |  124 +-
 net/netfilter/xt_AUDIT.c                           |  222 +
 net/netfilter/xt_CLASSIFY.c                        |   36 +-
 net/netfilter/xt_IDLETIMER.c                       |    2 +
 net/netfilter/xt_LED.c                             |    2 +
 net/netfilter/xt_NFQUEUE.c                         |   34 +-
 net/netfilter/xt_TCPMSS.c                          |   15 +-
 net/netfilter/xt_TEE.c                             |   27 +-
 net/netfilter/xt_addrtype.c                        |  229 +
 net/netfilter/xt_connlimit.c                       |   99 +-
 net/netfilter/xt_conntrack.c                       |   80 +-
 net/netfilter/xt_cpu.c                             |    2 +
 net/netfilter/xt_devgroup.c                        |   82 +
 net/netfilter/xt_iprange.c                         |   18 +-
 net/netfilter/xt_ipvs.c                            |    2 +-
 net/netfilter/xt_set.c                             |  359 ++
 net/netlabel/netlabel_user.h                       |    6 +-
 net/netlink/af_netlink.c                           |    9 -
 net/packet/af_packet.c                             |   41 +-
 net/phonet/Kconfig                                 |   12 -
 net/phonet/af_phonet.c                             |   32 +-
 net/phonet/pep.c                                   |  834 ++--
 net/phonet/socket.c                                |  126 +-
 net/rds/rds.h                                      |    1 -
 net/rose/af_rose.c                                 |    7 -
 net/rose/rose_route.c                              |   28 +-
 net/rxrpc/ar-peer.c                                |   28 +-
 net/sched/Kconfig                                  |   39 +-
 net/sched/Makefile                                 |    4 +
 net/sched/act_api.c                                |   46 +-
 net/sched/act_csum.c                               |    2 +-
 net/sched/act_gact.c                               |    8 +-
 net/sched/act_ipt.c                                |   16 +-
 net/sched/act_mirred.c                             |    4 +-
 net/sched/act_nat.c                                |    2 +-
 net/sched/act_pedit.c                              |   10 +-
 net/sched/act_police.c                             |    9 +-
 net/sched/act_simple.c                             |   10 +-
 net/sched/act_skbedit.c                            |    8 +-
 net/sched/cls_api.c                                |   33 +-
 net/sched/cls_basic.c                              |   17 +-
 net/sched/cls_cgroup.c                             |    8 +-
 net/sched/cls_flow.c                               |    6 +-
 net/sched/cls_fw.c                                 |   38 +-
 net/sched/cls_route.c                              |  126 +-
 net/sched/cls_rsvp.h                               |   95 +-
 net/sched/cls_tcindex.c                            |    2 +-
 net/sched/cls_u32.c                                |   89 +-
 net/sched/em_cmp.c                                 |   47 +-
 net/sched/em_meta.c                                |   48 +-
 net/sched/em_nbyte.c                               |    3 +-
 net/sched/em_text.c                                |    3 +-
 net/sched/em_u32.c                                 |    2 +-
 net/sched/ematch.c                                 |   37 +-
 net/sched/sch_api.c                                |  173 +-
 net/sched/sch_atm.c                                |   16 +-
 net/sched/sch_cbq.c                                |  362 +-
 net/sched/sch_choke.c                              |  688 +++
 net/sched/sch_dsmark.c                             |   21 +-
 net/sched/sch_fifo.c                               |   50 +-
 net/sched/sch_generic.c                            |   58 +-
 net/sched/sch_gred.c                               |   85 +-
 net/sched/sch_hfsc.c                               |   37 +-
 net/sched/sch_htb.c                                |  106 +-
 net/sched/sch_mq.c                                 |    1 -
 net/sched/sch_mqprio.c                             |  418 ++
 net/sched/sch_multiq.c                             |    8 +-
 net/sched/sch_netem.c                              |  411 ++-
 net/sched/sch_prio.c                               |   34 +-
 net/sched/sch_red.c                                |   61 +-
 net/sched/sch_sfb.c                                |  709 +++
 net/sched/sch_sfq.c                                |   67 +-
 net/sched/sch_tbf.c                                |   39 +-
 net/sched/sch_teql.c                               |   36 +-
 net/sctp/associola.c                               |    2 -
 net/sctp/input.c                                   |    3 -
 net/sctp/ipv6.c                                    |   42 +-
 net/sctp/outqueue.c                                |    2 -
 net/sctp/protocol.c                                |   33 +-
 net/sctp/sm_make_chunk.c                           |    3 -
 net/sctp/socket.c                                  |   11 +-
 net/sctp/tsnmap.c                                  |    2 +-
 net/sctp/ulpqueue.c                                |    7 +-
 net/socket.c                                       |   31 +-
 net/sunrpc/svcsock.c                               |   32 +-
 net/tipc/Kconfig                                   |   12 -
 net/tipc/addr.c                                    |   15 +-
 net/tipc/addr.h                                    |   17 +-
 net/tipc/bcast.c                                   |   47 +-
 net/tipc/bcast.h                                   |    3 +-
 net/tipc/bearer.c                                  |  116 +-
 net/tipc/bearer.h                                  |   73 +-
 net/tipc/config.c                                  |   31 +-
 net/tipc/core.c                                    |    9 +-
 net/tipc/core.h                                    |    4 +-
 net/tipc/discover.c                                |  140 +-
 net/tipc/discover.h                                |    9 +-
 net/tipc/link.c                                    |  130 +-
 net/tipc/link.h                                    |   29 +-
 net/tipc/msg.c                                     |   41 +-
 net/tipc/msg.h                                     |   64 +-
 net/tipc/name_distr.c                              |   18 +-
 net/tipc/net.c                                     |   32 +-
 net/tipc/net.h                                     |   19 +-
 net/tipc/node.c                                    |  125 +-
 net/tipc/node.h                                    |   36 +-
 net/tipc/node_subscr.c                             |   21 +-
 net/tipc/node_subscr.h                             |    3 +-
 net/tipc/port.c                                    |  306 +-
 net/tipc/port.h                                    |   73 +-
 net/tipc/socket.c                                  |   76 +-
 net/tipc/subscr.c                                  |   13 +-
 net/unix/af_unix.c                                 |   72 +-
 net/wanrouter/wanmain.c                            |    2 -
 net/wireless/core.c                                |   20 +-
 net/wireless/ethtool.c                             |   33 +
 net/wireless/nl80211.c                             |   62 +-
 net/wireless/reg.c                                 |   45 +-
 net/wireless/reg.h                                 |    1 +
 net/wireless/util.c                                |   47 +-
 net/wireless/wext-compat.c                         |    5 +-
 net/xfrm/Makefile                                  |    2 +-
 net/xfrm/xfrm_algo.c                               |    8 +-
 net/xfrm/xfrm_hash.h                               |   32 +-
 net/xfrm/xfrm_input.c                              |   13 +-
 net/xfrm/xfrm_output.c                             |   15 +-
 net/xfrm/xfrm_policy.c                             |  218 +-
 net/xfrm/xfrm_replay.c                             |  534 +++
 net/xfrm/xfrm_state.c                              |  175 +-
 net/xfrm/xfrm_user.c                               |  209 +-
 security/capability.c                              |    2 +-
 security/commoncap.c                               |    3 +-
 security/security.c                                |    7 +-
 security/selinux/hooks.c                           |    8 +-
 security/selinux/include/xfrm.h                    |    2 +-
 security/selinux/xfrm.c                            |    6 +-
 1146 files changed, 118995 insertions(+), 38180 deletions(-)
 create mode 100644 crypto/authencesn.c
 create mode 100644 drivers/net/bonding/bond_procfs.c
 create mode 100644 drivers/net/can/c_can/Kconfig
 create mode 100644 drivers/net/can/c_can/Makefile
 create mode 100644 drivers/net/can/c_can/c_can.c
 create mode 100644 drivers/net/can/c_can/c_can.h
 create mode 100644 drivers/net/can/c_can/c_can_platform.c
 create mode 100644 drivers/net/enic/enic_dev.c
 create mode 100644 drivers/net/enic/enic_dev.h
 create mode 100644 drivers/net/ftmac100.c
 create mode 100644 drivers/net/ftmac100.h
 create mode 100644 drivers/net/wireless/ath/ath5k/trace.h
 delete mode 100644 drivers/net/wireless/ath/ath9k/virtual.c
 create mode 100644 drivers/net/wireless/iwlegacy/Kconfig
 create mode 100644 drivers/net/wireless/iwlegacy/Makefile
 rename drivers/net/wireless/{iwlwifi => iwlegacy}/iwl-3945-debugfs.c (99%)
 copy drivers/net/wireless/{iwlwifi => iwlegacy}/iwl-3945-debugfs.h (95%)
 rename drivers/net/wireless/{iwlwifi => iwlegacy}/iwl-3945-fh.h (98%)
 rename drivers/net/wireless/{iwlwifi => iwlegacy}/iwl-3945-hw.h (96%)
 copy drivers/net/wireless/{iwlwifi => iwlegacy}/iwl-3945-led.c (73%)
 copy drivers/net/wireless/{iwlwifi => iwlegacy}/iwl-3945-led.h (95%)
 rename drivers/net/wireless/{iwlwifi => iwlegacy}/iwl-3945-rs.c (96%)
 rename drivers/net/wireless/{iwlwifi => iwlegacy}/iwl-3945.c (92%)
 rename drivers/net/wireless/{iwlwifi => iwlegacy}/iwl-3945.h (97%)
 create mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-calib.c
 copy drivers/net/wireless/{iwlwifi/iwl-legacy.h => iwlegacy/iwl-4965-calib.h} (80%)
 create mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-debugfs.c
 rename drivers/net/wireless/{iwlwifi/iwl-3945-debugfs.h => iwlegacy/iwl-4965-debugfs.h} (61%)
 rename drivers/net/wireless/{iwlwifi/iwl-legacy.h => iwlegacy/iwl-4965-eeprom.c} (53%)
 rename drivers/net/wireless/{iwlwifi => iwlegacy}/iwl-4965-hw.h (97%)
 rename drivers/net/wireless/{iwlwifi/iwl-3945-led.c => iwlegacy/iwl-4965-led.c} (65%)
 copy drivers/net/wireless/{iwlwifi/iwl-3945-led.h => iwlegacy/iwl-4965-led.h} (81%)
 create mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-lib.c
 create mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-rs.c
 rename drivers/net/wireless/{iwlwifi/iwl-agn-rx.c => iwlegacy/iwl-4965-rx.c} (59%)
 create mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-sta.c
 create mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-tx.c
 create mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-ucode.c
 rename drivers/net/wireless/{iwlwifi => iwlegacy}/iwl-4965.c (71%)
 create mode 100644 drivers/net/wireless/iwlegacy/iwl-4965.h
 create mode 100644 drivers/net/wireless/iwlegacy/iwl-commands.h
 create mode 100644 drivers/net/wireless/iwlegacy/iwl-core.c
 create mode 100644 drivers/net/wireless/iwlegacy/iwl-core.h
 create mode 100644 drivers/net/wireless/iwlegacy/iwl-csr.h
 create mode 100644 drivers/net/wireless/iwlegacy/iwl-debug.h
 create mode 100644 drivers/net/wireless/iwlegacy/iwl-debugfs.c
 create mode 100644 drivers/net/wireless/iwlegacy/iwl-dev.h
 copy drivers/net/wireless/{iwlwifi/iwl-3945-led.h => iwlegacy/iwl-devtrace.c} (59%)
 create mode 100644 drivers/net/wireless/iwlegacy/iwl-devtrace.h
 create mode 100644 drivers/net/wireless/iwlegacy/iwl-eeprom.c
 create mode 100644 drivers/net/wireless/iwlegacy/iwl-eeprom.h
 create mode 100644 drivers/net/wireless/iwlegacy/iwl-fh.h
 create mode 100644 drivers/net/wireless/iwlegacy/iwl-hcmd.c
 create mode 100644 drivers/net/wireless/iwlegacy/iwl-helpers.h
 create mode 100644 drivers/net/wireless/iwlegacy/iwl-io.h
 create mode 100644 drivers/net/wireless/iwlegacy/iwl-led.c
 copy drivers/net/wireless/{iwlwifi/iwl-3945-led.h => iwlegacy/iwl-led.h} (59%)
 create mode 100644 drivers/net/wireless/iwlegacy/iwl-legacy-rs.h
 create mode 100644 drivers/net/wireless/iwlegacy/iwl-power.c
 create mode 100644 drivers/net/wireless/iwlegacy/iwl-power.h
 create mode 100644 drivers/net/wireless/iwlegacy/iwl-prph.h
 create mode 100644 drivers/net/wireless/iwlegacy/iwl-rx.c
 create mode 100644 drivers/net/wireless/iwlegacy/iwl-scan.c
 create mode 100644 drivers/net/wireless/iwlegacy/iwl-spectrum.h
 create mode 100644 drivers/net/wireless/iwlegacy/iwl-sta.c
 create mode 100644 drivers/net/wireless/iwlegacy/iwl-sta.h
 create mode 100644 drivers/net/wireless/iwlegacy/iwl-tx.c
 rename drivers/net/wireless/{iwlwifi => iwlegacy}/iwl3945-base.c (89%)
 create mode 100644 drivers/net/wireless/iwlegacy/iwl4965-base.c
 create mode 100644 drivers/net/wireless/iwlwifi/iwl-2000.c
 delete mode 100644 drivers/net/wireless/iwlwifi/iwl-legacy.c
 create mode 100644 drivers/net/wireless/rtlwifi/rtl8192c/Makefile
 create mode 100644 drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
 create mode 100644 drivers/net/wireless/rtlwifi/rtl8192c/dm_common.h
 rename drivers/net/wireless/rtlwifi/{rtl8192ce/fw.c => rtl8192c/fw_common.c} (94%)
 rename drivers/net/wireless/rtlwifi/{rtl8192ce/fw.h => rtl8192c/fw_common.h} (100%)
 copy drivers/net/wireless/{iwlwifi/iwl-3945-led.h => rtlwifi/rtl8192c/main.c} (61%)
 create mode 100644 drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c
 create mode 100644 drivers/net/wireless/rtlwifi/rtl8192c/phy_common.h
 create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/Makefile
 create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/def.h
 create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/dm.c
 copy drivers/net/wireless/{iwlwifi/iwl-3945-led.h => rtlwifi/rtl8192cu/dm.h} (74%)
 create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
 create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/hw.h
 create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/led.c
 copy drivers/net/wireless/{iwlwifi/iwl-3945-led.h => rtlwifi/rtl8192cu/led.h} (61%)
 create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/mac.c
 create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/mac.h
 create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/phy.c
 copy drivers/net/wireless/{iwlwifi/iwl-3945-led.h => rtlwifi/rtl8192cu/phy.h} (63%)
 copy drivers/net/wireless/{iwlwifi/iwl-3945-led.h => rtlwifi/rtl8192cu/reg.h} (74%)
 create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/rf.c
 rename drivers/net/wireless/{iwlwifi/iwl-3945-led.h => rtlwifi/rtl8192cu/rf.h} (53%)
 create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
 create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/sw.h
 create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/table.c
 create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/table.h
 create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/trx.c
 create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/trx.h
 create mode 100644 drivers/net/wireless/rtlwifi/usb.c
 create mode 100644 drivers/net/wireless/rtlwifi/usb.h
 create mode 100644 drivers/net/xen-netback/Makefile
 create mode 100644 drivers/net/xen-netback/common.h
 create mode 100644 drivers/net/xen-netback/interface.c
 create mode 100644 drivers/net/xen-netback/netback.c
 create mode 100644 drivers/net/xen-netback/xenbus.c
 rename firmware/bnx2/{bnx2-mips-09-6.2.1.fw.ihex => bnx2-mips-09-6.2.1a.fw.ihex} (62%)
 create mode 100644 include/linux/cpu_rmap.h
 create mode 100644 include/linux/micrel_phy.h
 create mode 100644 include/linux/netfilter/ipset/Kbuild
 create mode 100644 include/linux/netfilter/ipset/ip_set.h
 create mode 100644 include/linux/netfilter/ipset/ip_set_ahash.h
 create mode 100644 include/linux/netfilter/ipset/ip_set_bitmap.h
 create mode 100644 include/linux/netfilter/ipset/ip_set_getport.h
 create mode 100644 include/linux/netfilter/ipset/ip_set_hash.h
 create mode 100644 include/linux/netfilter/ipset/ip_set_list.h
 create mode 100644 include/linux/netfilter/ipset/ip_set_timeout.h
 create mode 100644 include/linux/netfilter/ipset/pfxlen.h
 create mode 100644 include/linux/netfilter/nf_conntrack_snmp.h
 create mode 100644 include/linux/netfilter/xt_AUDIT.h
 create mode 100644 include/linux/netfilter/xt_addrtype.h
 create mode 100644 include/linux/netfilter/xt_devgroup.h
 create mode 100644 include/linux/netfilter/xt_set.h
 create mode 100644 include/net/bluetooth/smp.h
 create mode 100644 include/net/netfilter/nf_conntrack_timestamp.h
 create mode 100644 lib/cpu_rmap.c
 rename net/bluetooth/{l2cap.c => l2cap_core.c} (76%)
 create mode 100644 net/bluetooth/l2cap_sock.c
 delete mode 100644 net/ipv4/fib_hash.c
 delete mode 100644 net/ipv4/netfilter/ipt_addrtype.c
 create mode 100644 net/netfilter/ipset/Kconfig
 create mode 100644 net/netfilter/ipset/Makefile
 create mode 100644 net/netfilter/ipset/ip_set_bitmap_ip.c
 create mode 100644 net/netfilter/ipset/ip_set_bitmap_ipmac.c
 create mode 100644 net/netfilter/ipset/ip_set_bitmap_port.c
 create mode 100644 net/netfilter/ipset/ip_set_core.c
 create mode 100644 net/netfilter/ipset/ip_set_getport.c
 create mode 100644 net/netfilter/ipset/ip_set_hash_ip.c
 create mode 100644 net/netfilter/ipset/ip_set_hash_ipport.c
 create mode 100644 net/netfilter/ipset/ip_set_hash_ipportip.c
 create mode 100644 net/netfilter/ipset/ip_set_hash_ipportnet.c
 create mode 100644 net/netfilter/ipset/ip_set_hash_net.c
 create mode 100644 net/netfilter/ipset/ip_set_hash_netport.c
 create mode 100644 net/netfilter/ipset/ip_set_list_set.c
 create mode 100644 net/netfilter/ipset/pfxlen.c
 create mode 100644 net/netfilter/nf_conntrack_broadcast.c
 create mode 100644 net/netfilter/nf_conntrack_snmp.c
 create mode 100644 net/netfilter/nf_conntrack_timestamp.c
 create mode 100644 net/netfilter/xt_AUDIT.c
 create mode 100644 net/netfilter/xt_addrtype.c
 create mode 100644 net/netfilter/xt_devgroup.c
 create mode 100644 net/netfilter/xt_set.c
 create mode 100644 net/sched/sch_choke.c
 create mode 100644 net/sched/sch_mqprio.c
 create mode 100644 net/sched/sch_sfb.c
 create mode 100644 net/xfrm/xfrm_replay.c

^ permalink raw reply	[flat|nested] 1456+ messages in thread
* [GIT] Networking
@ 2011-03-21  2:51 David Miller
  2011-03-21 19:24 ` Linus Torvalds
  0 siblings, 1 reply; 1456+ messages in thread
From: David Miller @ 2011-03-21  2:51 UTC (permalink / raw)
  To: torvalds; +Cc: akpm, netdev, linux-kernel


1) The R8169 PHY fix from Eric Dumazet, which I see you've added to
   your tree too. :-)

2) NIU driver broken by OF layer changes, fix by eliminating platform
   device name conflict.

3) Fix VHOST receive queue locking, from Michael S. Tsirkin.

4) Some gianfar chips are buggy wrt. checksums for certain packet
   buffer alignments, fall back to sw checksumming in those cases.
   From Alex Dubov.

5) ECONET leaks 4 uninitialized bytes to the network, fix from Vasiliy
   Kulikov.

6) Fix blind deref of ethtool_ops->set_sg(), fix from Roger Luethi.

7) ethtool_rxnfc needs syscall compat handling, from Ben Hutchings.

8) VLAN broken over gre tunnels because it does not take
   ->needed_headroom into account.  Fix from Eric Dumazet.

9) Bridging netfilter needs to init IPCB() of skb before injecting
   packet into the IP stack, fix from Herbert Xu.

10) ftmac100 has off-by-one error, fix by using resource_size().  Fix
    from Dan Carpenter.

11) IPSET fixes from Jozsef Kadlecsik.

12) Netfilter xtables has some reentrancy issues, fix from Eric Dumazet.

13) CLUSTERIP netfilter iptablesm module needs to check user buffer size
    more carefully, fix from Vasiliy Kulikov.

Please pull, thanks a lot!

The following changes since commit a44f99c7efdb88fa41128065c9a9445c19894e34:

  Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 (2011-03-20 18:14:55 -0700)

are available in the git repository at:

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

Alex Dubov (1):
      gianfar: Fall back to software tcp/udp checksum on older controllers

Ben Hutchings (1):
      ethtool: Compat handling for struct ethtool_rxnfc

Dan Carpenter (1):
      ftmac100: use resource_size()

David S. Miller (3):
      niu: Rename NIU parent platform device name to fix conflict.
      Merge branch 'master' of git://git.kernel.org/.../kaber/nf-2.6
      Merge branch 'vhost-net-next' of git://git.kernel.org/.../mst/vhost

Eric Dumazet (3):
      vlan: should take into account needed_headroom
      r8169: fix a bug in rtl8169_init_phy()
      netfilter: xtables: fix reentrancy

Herbert Xu (1):
      bridge: Reset IPCB when entering IP stack on NF_FORWARD

Jason Wang (3):
      vhost-net: check the support of mergeable buffer outside the receive loop
      vhost-net: Unify the code of mergeable and big buffer handling
      vhost: lock receive queue, not the socket

Jozsef Kadlecsik (2):
      netfilter: ipset: fix address ranges at hash:*port* types
      netfilter: ipset: fix checking the type revision at create command

Krishna Kumar (1):
      vhost: Cleanup vhost.c and net.c

Michael S. Tsirkin (2):
      vhost: copy_from_user -> __copy_from_user
      vhost-net: remove unlocked use of receive_queue

Mike Frysinger (1):
      headers: use __aligned_xx types for userspace

Nicolas de Pesloüan (1):
      bonding: fix a typo in a comment

Roger Luethi (1):
      ethtool: __ethtool_set_sg: check for function pointer before using it

Vasiliy Kulikov (2):
      econet: 4 byte infoleak to the network
      netfilter: ipt_CLUSTERIP: fix buffer overflow

 drivers/net/bonding/bond_main.c                |    2 +-
 drivers/net/ftmac100.c                         |    2 +-
 drivers/net/gianfar.c                          |   16 ++-
 drivers/net/gianfar.h                          |    1 +
 drivers/net/niu.c                              |    2 +-
 drivers/net/r8169.c                            |    4 +-
 drivers/vhost/net.c                            |  159 ++++--------------------
 drivers/vhost/vhost.c                          |   55 ++++++---
 include/linux/ethtool.h                        |   34 +++++
 include/linux/if_ppp.h                         |   16 ++--
 include/linux/netfilter/ipset/ip_set_getport.h |   10 ++
 include/linux/netfilter/nfnetlink_log.h        |    4 +-
 include/linux/netfilter/nfnetlink_queue.h      |    4 +-
 include/linux/netfilter/xt_connbytes.h         |    4 +-
 include/linux/netfilter/xt_quota.h             |    2 +-
 net/8021q/vlan_dev.c                           |    1 +
 net/bridge/br_netfilter.c                      |    3 +
 net/core/ethtool.c                             |    3 +
 net/econet/af_econet.c                         |    2 +-
 net/ipv4/netfilter/ip_tables.c                 |    4 +-
 net/ipv4/netfilter/ipt_CLUSTERIP.c             |    5 +-
 net/ipv6/netfilter/ip6_tables.c                |    4 +-
 net/netfilter/ipset/ip_set_core.c              |   22 +++-
 net/netfilter/ipset/ip_set_hash_ipport.c       |   34 ++----
 net/netfilter/ipset/ip_set_hash_ipportip.c     |   34 ++----
 net/netfilter/ipset/ip_set_hash_ipportnet.c    |   34 ++----
 net/netfilter/ipset/ip_set_hash_netport.c      |   30 ++----
 net/socket.c                                   |  114 ++++++++++++++++-
 28 files changed, 321 insertions(+), 284 deletions(-)

^ permalink raw reply	[flat|nested] 1456+ messages in thread
* [GIT] Networking
@ 2011-03-25 21:02 David Miller
  0 siblings, 0 replies; 1456+ messages in thread
From: David Miller @ 2011-03-25 21:02 UTC (permalink / raw)
  To: torvalds; +Cc: akpm, netdev, linux-kernel


This should be the final round, and I believe all known major
regressions added by the routing rework are cured now.

1) Route insert compares metrics incorrectly, fix from Eric Dumazet.

2) Cache route source addresses need to rechecked in more circumstances,
   and need to use the correct scope when they are being calculated.
   With help from Julian Anastasov.

3) ip_route_newports() uses the wrong source and destination addresses
   in lookup key.  Fix from Steffen Klassert.

4) Fix race in qdisc throttling, from Eric Dumazet.

5) Fix rmmod crash in myri10ge, NAPI instances are not deleted.  From
   Stanislaw Gruszka.

6) Bonding rx_handle locking still allows races, fix from Jiri Pirko.

7) mlx4 driver updates from Yevgeny Petrilin.

8) iwlwifi forgets mutex unlock on error, from Dan Carpenter.

9) orinoco needs to hold scan_lock over a larger section of code, from
   Joe Gunn.

10) Add some device IDs to rt2x00 wireless driver.  From Peter Lemenkov.

11) rtlwifi uses wrong memset() arg order, fix from Ilia Mirkin.

12) Fix panic on AR2427 ath9k chips when connecting with AP, from
    Mohammed Shafi Shajakhan.

13) When an IP address is assigned multiple times to an interface,
    using different prefixes, we sometimes leave stale subnet routes
    in the routing table when those addresses are deleted.  Fix from
    Julian Anastasov.

14) Bridge ipv6 multicast code needs to set destination address before
    using it.  Fix from Linus Lüssing.

15) TCP moderates congestion window during undo when it need not do
    so, since undo means that recovery was false.  Fix from Yuchung
    Cheng.

16) __ip_dev_find() needs to handle to obscure case of allowing any
    IP address on a loopback device subnet, fix by adding fallback
    code which searches the local FIB table when an explicit device
    address is not found in the hash table.

17) ip_rt_update_pmtu() does one too many inet_putpeer()'s resulting
    in memory corruption and other problems.  Fix from Eric Dumazet.

Please pull, thanks a lot!

The following changes since commit 40471856f2e38e9bfa8d605295e8234421110dd6:

  Merge branch 'nfs-for-2.6.39' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 (2011-03-25 10:03:28 -0700)

are available in the git repository at:

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

Dan Carpenter (1):
      iwlwifi: missing unlock on error path

David S. Miller (7):
      Merge branch 'master' of git://git.kernel.org/.../linville/wireless-2.6
      tcp: Make undo_ssthresh arg to tcp_undo_cwr() a bool.
      ipv4: Fallback to FIB local table in __ip_dev_find().
      Merge branch 'sfc-2.6.39' of git://git.kernel.org/.../bwh/sfc-2.6
      Merge branch 'master' of git://git.kernel.org/.../linville/wireless-2.6
      ipv4: Invalidate nexthop cache nh_saddr more correctly.
      ipv4: Fix nexthop caching wrt. scoping.

Eli Cohen (3):
      mlx4: Add blue flame support for kernel consumers
      mlx4_core: maintain available field in bitmap allocator
      mlx4_core: reserve UARs for userspace consumers

Eric Dumazet (3):
      ipv4: fix ip_rt_update_pmtu()
      net_sched: fix THROTTLED/RUNNING race
      ipv4: fix fib metrics

Felix Fietkau (1):
      mac80211: initialize sta->last_rx in sta_info_alloc

Florian Westphal (1):
      ipv6: ip6_route_output does not modify sk parameter, so make it const

Ilia Mirkin (1):
      rtlwifi: Fix memset argument order

Jiri Pirko (1):
      bonding: fix rx_handler locking

Joe Gunn (1):
      orinoco: Maintain lock until entry removed from list

Johannes Berg (1):
      iwlagn: fix error in command waiting

Julia Lawall (2):
      drivers/net/ariadne.c: Convert release_resource to release_region/release_mem_region
      drivers/net/a2065.c: Convert release_resource to release_region/release_mem_region

Julian Anastasov (4):
      ipv4: match prefsrc when deleting routes
      ipv4: fix route deletion for IPs on many subnets
      ipv4: remove the routes on secondary promotion
      ipv4: optimize route adding on secondary promotion

Linus Lüssing (1):
      bridge: Fix possibly wrong MLD queries' ethernet source address

Marc Zyngier (1):
      NET: smsc95xx: don't use stack for async writes to the device

Michał Mirosław (1):
      net: implement dev_disable_lro() hw_features compatibility

Mohammed Shafi Shajakhan (1):
      ath9k: Fix kernel panic in AR2427

Peter Lemenkov (4):
      rt2x00: Add rt2870 device id
      rt2x00: Add Planex Communications, Inc. RT8070
      rt2x00: Add 2L Central Europe BV 8070
      rt2x00: Add unknown Toshiba device

Randy Dunlap (2):
      wireless: fix 80211 kernel-doc warnings
      net: fix pch_gbe section mismatch warning

Senthil Balasubramanian (2):
      ath9k: Fix kernel panic caused by invalid rate index access.
      ath9k: Fix TX queue stuck issue.

Sriram (1):
      net: davinci_emac:Fix translation logic for buffer descriptor

Stanislaw Gruszka (1):
      myri10ge: fix rmmod crash

Steffen Klassert (1):
      route: Take the right src and dst addresses in ip_route_newports

Steve Hodgson (1):
      sfc: Siena: Disable write-combining when SR-IOV is enabled

Tõnu Samuel (1):
      zd1211rw: TrendNet TEW-509UB id added

Yevgeny Petrilin (14):
      mlx4_en: going out of range of TX rings when reporting stats
      mlx4_en: moderation parameters are not reseted.
      mlx4_en: optimize adaptive moderation algorithm for better latency
      mlx4_en: bringing link up when registering netdevice
      mlx4: Changing interrupt scheme
      mlx4_en: using new mlx4 interrupt scheme
      mlx4: Wake on LAN support
      mlx4_en: Reporting HW revision in ethtool -i
      mlx4: generalization of multicast steering.
      mlx4: Add support for promiscuous mode in the new steering model.
      mlx4_en: Enabling new steering
      mlx4_en: Using blue flame support
      mlx4_en: updated driver version to 1.5.4.1
      mlx4_en: Removing HW info from ethtool -i report.

Yuchung Cheng (1):
      tcp: avoid cwnd moderation in undo

armadefuego@gmail.com (1):
      orinoco: Clear dangling pointer on hardware busy

 drivers/infiniband/hw/mlx4/main.c          |   11 +-
 drivers/net/a2065.c                        |   10 +-
 drivers/net/ariadne.c                      |   10 +-
 drivers/net/bonding/bond_main.c            |   56 ++--
 drivers/net/bonding/bonding.h              |    1 +
 drivers/net/davinci_cpdma.c                |   11 +-
 drivers/net/davinci_cpdma.h                |    1 +
 drivers/net/davinci_emac.c                 |    5 +-
 drivers/net/mlx4/alloc.c                   |   13 +
 drivers/net/mlx4/cq.c                      |    2 +-
 drivers/net/mlx4/en_cq.c                   |   38 ++-
 drivers/net/mlx4/en_ethtool.c              |   66 +++-
 drivers/net/mlx4/en_main.c                 |   22 +-
 drivers/net/mlx4/en_netdev.c               |  199 +++++++--
 drivers/net/mlx4/en_port.c                 |   13 +-
 drivers/net/mlx4/en_port.h                 |   19 +-
 drivers/net/mlx4/en_rx.c                   |   11 +-
 drivers/net/mlx4/en_tx.c                   |   72 +++-
 drivers/net/mlx4/eq.c                      |  107 +++++-
 drivers/net/mlx4/fw.c                      |   25 ++
 drivers/net/mlx4/fw.h                      |    3 +
 drivers/net/mlx4/main.c                    |  119 +++++-
 drivers/net/mlx4/mcg.c                     |  646 ++++++++++++++++++++++++++--
 drivers/net/mlx4/mlx4.h                    |   50 +++
 drivers/net/mlx4/mlx4_en.h                 |   27 +-
 drivers/net/mlx4/pd.c                      |  102 +++++
 drivers/net/mlx4/port.c                    |  165 +++++++-
 drivers/net/mlx4/profile.c                 |    4 +-
 drivers/net/myri10ge/myri10ge.c            |    1 +
 drivers/net/pch_gbe/pch_gbe_main.c         |    6 +-
 drivers/net/sfc/efx.c                      |   18 +-
 drivers/net/sfc/workarounds.h              |    2 +
 drivers/net/usb/smsc95xx.c                 |   17 +-
 drivers/net/wireless/ath/ath9k/main.c      |    2 +
 drivers/net/wireless/ath/ath9k/rc.c        |    2 +-
 drivers/net/wireless/ath/ath9k/xmit.c      |    4 +-
 drivers/net/wireless/iwlwifi/iwl-agn-lib.c |    2 +-
 drivers/net/wireless/iwlwifi/iwl-agn.c     |    7 +-
 drivers/net/wireless/orinoco/cfg.c         |    3 +
 drivers/net/wireless/orinoco/main.c        |    2 +-
 drivers/net/wireless/rt2x00/rt2800usb.c    |    7 +-
 drivers/net/wireless/rtlwifi/efuse.c       |   31 +-
 drivers/net/wireless/zd1211rw/zd_usb.c     |    1 +
 include/linux/davinci_emac.h               |    1 +
 include/linux/ethtool.h                    |    3 +
 include/linux/mlx4/device.h                |   51 ++-
 include/linux/mlx4/qp.h                    |    1 +
 include/net/cfg80211.h                     |    3 +-
 include/net/ip6_route.h                    |    2 +-
 include/net/ip_fib.h                       |   18 +-
 include/net/mac80211.h                     |    2 +-
 include/net/netns/ipv4.h                   |    1 +
 include/net/route.h                        |    5 +-
 include/net/sch_generic.h                  |    8 +-
 net/bridge/br_multicast.c                  |    2 +-
 net/core/dev.c                             |   19 +-
 net/core/ethtool.c                         |    2 +-
 net/ipv4/devinet.c                         |   30 ++-
 net/ipv4/fib_frontend.c                    |  112 ++++-
 net/ipv4/fib_lookup.h                      |    3 +-
 net/ipv4/fib_semantics.c                   |   47 +--
 net/ipv4/fib_trie.c                        |   14 +-
 net/ipv4/route.c                           |    8 +-
 net/ipv4/tcp_input.c                       |   22 +-
 net/ipv6/route.c                           |    2 +-
 net/mac80211/sta_info.c                    |    1 +
 66 files changed, 1906 insertions(+), 364 deletions(-)

^ permalink raw reply	[flat|nested] 1456+ messages in thread
* [GIT] Networking
@ 2011-03-29  7:49 David Miller
  0 siblings, 0 replies; 1456+ messages in thread
From: David Miller @ 2011-03-29  7:49 UTC (permalink / raw)
  To: torvalds; +Cc: akpm, netdev, linux-kernel


1) Fix oops in RAW ipv4 when route doesn't exist.

2) Heap corruptions, missing length checks, in IRDA and ROSE.  From
   Dan Rosenberg and Ben Hutchings.

3) Fix FIB error return code checking regression, fix from Julian Anastasov.

4) Fix refression in ethtool ->set_flags() error returns for some
   network drivers, from Stanislaw Gruszka.

5) When we do async crypto, we don't take a reference while the transaction
   is "in flight" and thus can crash if the object is release meanwhile.
   Fix from Steffen Klassert.

6) Bug fixes to the new IPSEC extended replay window support, also
   from Steffen Klassert.

7) Bridge forgets to send out notifier when device address changes, from
   Stephen Hemminger.

8) Conver jme driver away from legacy PCI power management, from Rafael J.
   Wysocki.

9) GRO is ineffective on large page size configs because we don't put
   enough scatter gather elements into the SKB, from Anton Blanchard.

10) cxgb3 erroneously only applies irq coalescing settings to one queue,
    fix also from Anton Blanchard.

11) CAN fixes from Jan Altenberg, Marc Kleine-Budde, and Oliver Hartkopp.

12) mlx4_en driver loses promiscuous setting, fix from Herbert Xu.

Please pull, thanks a lot!

The following changes since commit 89078d572eb9ce8d4c04264b8b0ba86de0d74c8f:

  md: Fix integrity registration error when no devices are capable (2011-03-28 17:53:29 -0700)

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

Amerigo Wang (1):
      net: remove useless comments in net/core/dev.c

Anton Blanchard (2):
      net: Always allocate at least 16 skb frags regardless of page size
      cxgb3: Apply interrupt coalescing settings to all queues

Balaji G (1):
      drivers net: Fix declaration ordering in inline functions.

Ben Hutchings (1):
      rose: Add length checks to CALL_REQUEST parsing

Cesar Eduardo Barros (1):
      net: use CHECKSUM_NONE instead of magic number

Dan Rosenberg (3):
      irda: prevent heap corruption on invalid nickname
      irda: validate peer name and attribute lengths
      ROSE: prevent heap corruption with bad facilities

David S. Miller (1):
      ipv4: Don't ip_rt_put() an error pointer in RAW sockets.

Herbert Xu (1):
      mlx4_en: Fix loss of promiscuity

Jan Altenberg (1):
      can: c_can: Fix tx_bytes accounting

Jan Luebbe (1):
      ipv4: Fix IP timestamp option (IPOPT_TS_PRESPEC) handling in ip_options_echo()

Javier Martinez Canillas (2):
      tg3: use <linux/io.h> and <linux/uaccess.h> instead <asm/io.h> and <asm/uaccess.h>
      tg3: Fix inline keyword usage

Julian Anastasov (1):
      ipv4: do not ignore route errors

Marc Kleine-Budde (2):
      can: c_can: disable one shot mode until driver is fixed
      can: c_can_platform: fix irq check in probe

Mike Frysinger (1):
      netdev: bfin_mac: document TE setting in RMII modes

Oliver Hartkopp (1):
      can: make struct proto const

Rafael J. Wysocki (1):
      Net / jme: Do not use legacy PCI power management

Stanislaw Gruszka (2):
      myri10ge: small rx_done refactoring
      net: fix ethtool->set_flags not intended -EINVAL return value

Steffen Klassert (6):
      xfrm: Force a dst refcount before entering the xfrm type handlers
      dst: Clone child entry in skb_dst_pop
      xfrm: Move the test on replay window size into the replay check functions
      xfrm: Assign esn pointers when cloning a state
      xfrm: Check for esn buffer len in xfrm_new_ae
      xfrm: Restrict extended sequence numbers to esp

stephen hemminger (1):
      bridge: notify applications if address of bridge device changes

 drivers/net/bfin_mac.c                  |   13 ++++-
 drivers/net/bnx2.c                      |    2 +-
 drivers/net/can/c_can/c_can.c           |   16 ++----
 drivers/net/can/c_can/c_can_platform.c  |    9 ++-
 drivers/net/cxgb3/cxgb3_main.c          |   14 +++-
 drivers/net/jme.c                       |   30 +++++----
 drivers/net/ksz884x.c                   |    2 +-
 drivers/net/mlx4/en_netdev.c            |    3 +
 drivers/net/myri10ge/myri10ge.c         |   37 +++++++----
 drivers/net/netxen/netxen_nic_ethtool.c |    2 +-
 drivers/net/qlcnic/qlcnic_ethtool.c     |    2 +-
 drivers/net/s2io.c                      |    2 +-
 drivers/net/tg3.c                       |    6 +-
 drivers/net/vmxnet3/vmxnet3_ethtool.c   |    4 +-
 drivers/net/vxge/vxge-ethtool.c         |    4 +-
 include/linux/can/core.h                |    9 ++-
 include/linux/ethtool.h                 |    1 +
 include/linux/skbuff.h                  |    8 ++-
 include/net/dst.h                       |    2 +-
 include/net/rose.h                      |    8 ++-
 include/net/xfrm.h                      |   22 +++++++
 net/bridge/br_if.c                      |    6 ++-
 net/bridge/br_private.h                 |    2 +-
 net/bridge/br_stp_if.c                  |    9 ++-
 net/can/af_can.c                        |    9 +--
 net/can/bcm.c                           |    4 +-
 net/can/raw.c                           |    4 +-
 net/core/dev.c                          |   55 +----------------
 net/core/ethtool.c                      |   17 +++++-
 net/ipv4/fib_trie.c                     |    4 +-
 net/ipv4/ip_options.c                   |    6 +-
 net/ipv4/raw.c                          |    1 +
 net/ipv6/ip6mr.c                        |    2 +-
 net/irda/iriap.c                        |    6 ++
 net/irda/irnet/irnet_ppp.c              |    3 +
 net/rose/af_rose.c                      |    8 +-
 net/rose/rose_loopback.c                |   13 ++++-
 net/rose/rose_route.c                   |   20 ++++--
 net/rose/rose_subr.c                    |  101 +++++++++++++++++++++----------
 net/xfrm/xfrm_input.c                   |    4 +-
 net/xfrm/xfrm_output.c                  |    4 +-
 net/xfrm/xfrm_replay.c                  |   17 +++++-
 net/xfrm/xfrm_state.c                   |    6 ++
 net/xfrm/xfrm_user.c                    |   24 +++++++
 44 files changed, 329 insertions(+), 192 deletions(-)

^ permalink raw reply	[flat|nested] 1456+ messages in thread
* [GIT] Networking
@ 2011-04-01  6:31 David Miller
  0 siblings, 0 replies; 1456+ messages in thread
From: David Miller @ 2011-04-01  6:31 UTC (permalink / raw)
  To: torvalds; +Cc: akpm, netdev, linux-kernel


1) Regression, GRE tunnels stopped working properly with multicast.
   Fix from Timo Teräs.

2) Fix DMA mapping bugs in via-ircc IRDA driver, from Ben Hutchings.

3) Header length calc wrong in br_multicast_ipv6_rcv(), from Linus
   Lüssing.

4) phy_init_hw() failures not handled, from Marc Kleine-Budde.

5) Support LG-VL600 4G modems properly, from Andrzej Zaborowski.

6) dev_forward_skb() needs to take TSO into account, from Daniel
   Lezcano and Eric W. Biederman.

7) Memory leaks in atl2 driver, from Jesper Juhl.

8) Solos-PCI ATM driver fixes from Philip A. Prindeville

9) Missing RTNL locking in ip_fib_net_exit(), from Eric Dumazet.

10) Regression in connector, all netlink requests must be processed
    synchronously now.  From Patrick McHardy.

11) Fix erroneous memory failure kernel messages in SCTP hash table
    allocation, reported by Dave Jones.

12) MLX4 driver use-after-free and event queue sizing fix from
    Yevgeny Petrilin.

13) Fix another regression in atalk_release() added by the kernel
    lock removal.  Reported by Dave Jones.

The following changes since commit ecb78ab6f30106ab72a575a25b1cdfd1633b7ca2:

  Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 (2011-03-30 12:22:15 -0700)

are available in the git repository at:

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

Andrzej Zaborowski (1):
      net/usb: Ethernet quirks for the LG-VL600 4G modem

Balaji G (1):
      bridge: Fix compilation warning in function br_stp_recalculate_bridge_id()

Ben Hutchings (2):
      via-ircc: Use pci_{get, set}_drvdata() instead of static pointer variable
      via-ircc: Pass PCI device pointer to dma_{alloc, free}_coherent()

Daniel Lezcano (1):
      netdev: fix mtu check when TSO is enabled

David S. Miller (3):
      net: Fix warnings caused by MAX_SKB_FRAGS change.
      sctp: Pass __GFP_NOWARN to hash table allocation attempts.
      appletalk: Fix OOPS in atalk_release().

Eric Dumazet (1):
      fib: add rtnl locking in ip_fib_net_exit

Jesper Juhl (1):
      Atheros, atl2: Fix mem leaks in error paths of atl2_set_eeprom

Linus Lüssing (1):
      bridge: mcast snooping, fix length check of snooped MLDv1/2

Marc Kleine-Budde (1):
      phylib: phy_attach_direct: phy_init_hw can fail, add cleanup

Patrick McHardy (1):
      connector: convert to synchronous netlink message processing

Peter Pan(潘卫平) (1):
      bonding:typo in comment

Philip A. Prindeville (3):
      atm/solos-pci: Use VPI.VCI notation uniformly.
      atm/solos-pci: Don't include frame pseudo-header on transmit hex-dump
      atm/solos-pci: Don't flap VCs when carrier state changes

Timo Teräs (1):
      net: gre: provide multicast mappings for ipv4 and ipv6

Yevgeny Petrilin (2):
      mlx4: Fixing use after free
      mlx4: Fixing bad size of event queue buffer

 drivers/atm/solos-pci.c        |   39 ++----
 drivers/connector/cn_queue.c   |   58 ++-----
 drivers/connector/connector.c  |   47 ++----
 drivers/net/atlx/atl2.c        |   22 ++-
 drivers/net/bonding/bond_alb.h |    2 +-
 drivers/net/irda/via-ircc.c    |   94 +++---------
 drivers/net/mlx4/eq.c          |    4 +-
 drivers/net/mlx4/mcg.c         |    3 +-
 drivers/net/phy/phy_device.c   |    8 +-
 drivers/net/usb/Kconfig        |   15 ++
 drivers/net/usb/Makefile       |    1 +
 drivers/net/usb/cdc_ether.c    |   21 ++-
 drivers/net/usb/lg-vl600.c     |  346 ++++++++++++++++++++++++++++++++++++++++
 drivers/net/usb/usbnet.c       |   10 +-
 include/linux/atmdev.h         |    1 +
 include/linux/connector.h      |   16 +--
 include/linux/skbuff.h         |    2 +-
 include/linux/usb/usbnet.h     |    3 +
 include/net/if_inet6.h         |   16 ++
 include/net/ip.h               |    8 +
 net/appletalk/ddp.c            |   11 +-
 net/atm/common.c               |    1 +
 net/bridge/br_multicast.c      |    2 +-
 net/bridge/br_stp_if.c         |    2 +-
 net/core/dev.c                 |   24 +++-
 net/ipv4/arp.c                 |    3 +
 net/ipv4/fib_frontend.c        |    2 +
 net/ipv6/ndisc.c               |    2 +
 net/sctp/protocol.c            |    4 +-
 29 files changed, 543 insertions(+), 224 deletions(-)
 create mode 100644 drivers/net/usb/lg-vl600.c

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


1) TCP ipv6 mis-interprets error pointer, from Boris Ostrovsky.

2) Ease a BUG() into a warning in TCP, from Ilpo Järvinen.

3) SCTP under-allocates asconf-ack chunks, from Wei Yongjun.

4) fix dev_ethtool_get_rx_csum() NETIF_F_RXCSUM handling, from
   Michał Mirosław.

5) Add some device IDs to rt2x00, from Xose Vazquez Perez.

6) starfire dma_addr_t size test no longer needs to be a mess, from
   FUJITA Tomonori.

Please pull, thanks a lot!

The following changes since commit d7c764c4c7b782c660b4600b0bff2e3509892a4d:

  Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip (2011-04-04 08:37:45 -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: delete hanging L2CAP channel

Arnd Bergmann (1):
      usbnet: use eth%d name for known ethernet devices

Boris Ostrovsky (1):
      ipv6: Don't pass invalid dst_entry pointer to dst_release().

Christian Lamparter (1):
      carl9170: Fix tx aggregation problems with some clients

Daniel Halperin (1):
      mac80211: fix aggregation frame release during timeout

David S. Miller (1):
      Merge branch 'master' of git://git.kernel.org/.../linville/wireless-2.6

FUJITA Tomonori (1):
      starfire: clean up dma_addr_t size test

Felix Fietkau (2):
      mac80211: fix a crash in minstrel_ht in HT mode with no supported MCS rates
      ath9k: fix a chip wakeup related crash in ath9k_start

Gustavo F. Padovan (1):
      Bluetooth: Fix HCI_RESET command synchronization

Ilpo Järvinen (1):
      tcp: len check is unnecessarily devastating, change to WARN_ON

Johan Hedberg (1):
      Bluetooth: Fix missing hci_dev_lock_bh in user_confirm_reply

Johannes Berg (1):
      iwlegacy: fix bugs in change_interface

Juuso Oikarinen (1):
      cfg80211: fix BSS double-unlinking (continued)

Marc-Antoine Perennou (1):
      Bluetooth: add support for Apple MacBook Pro 8,2

Mariusz Kozlowski (3):
      mac80211: fix possible NULL pointer dereference
      cfg80211:: fix possible NULL pointer dereference
      mlx4: fix kfree on error path in new_steering_entry()

Michał Mirosław (1):
      net: Fix dev dev_ethtool_get_rx_csum() for forced NETIF_F_RXCSUM

Petr Štetiar (1):
      mac80211: fix NULL pointer dereference in ieee80211_key_alloc()

Stanislaw Gruszka (2):
      iwl3945: do not deprecate software scan
      iwl3945: disable hw scan by default

Suraj Sumangala (1):
      Bluetooth: Increment unacked_frames count only the first transmit

Thomas Gleixner (1):
      Bluetooth: Fix warning with hci_cmd_timer

Vinicius Costa Gomes (1):
      Bluetooth: Fix sending LE data over USB

Wei Yongjun (2):
      sctp: fix auth_hmacs field's length of struct sctp_cookie
      sctp: malloc enough room for asconf-ack chunk

Xose Vazquez Perez (1):
      wireless: rt2x00: rt2800usb.c add and identify ids

 drivers/bluetooth/btusb.c                    |    6 ++++-
 drivers/net/mlx4/mcg.c                       |    4 +-
 drivers/net/starfire.c                       |    6 +----
 drivers/net/usb/cdc_eem.c                    |    2 +-
 drivers/net/usb/cdc_ether.c                  |    2 +-
 drivers/net/usb/cdc_ncm.c                    |    2 +-
 drivers/net/usb/cdc_subset.c                 |    8 ++++++
 drivers/net/usb/gl620a.c                     |    2 +-
 drivers/net/usb/net1080.c                    |    2 +-
 drivers/net/usb/plusb.c                      |    2 +-
 drivers/net/usb/rndis_host.c                 |    2 +-
 drivers/net/usb/usbnet.c                     |    3 +-
 drivers/net/usb/zaurus.c                     |    8 +++---
 drivers/net/wireless/ath/ath9k/main.c        |    4 +++
 drivers/net/wireless/ath/carl9170/carl9170.h |    1 +
 drivers/net/wireless/ath/carl9170/main.c     |    1 +
 drivers/net/wireless/ath/carl9170/tx.c       |    7 ++++++
 drivers/net/wireless/iwlegacy/iwl-core.c     |   10 ++++++++
 drivers/net/wireless/iwlegacy/iwl3945-base.c |    7 ++---
 drivers/net/wireless/rt2x00/rt2800usb.c      |   10 ++++++--
 include/linux/netdevice.h                    |    4 +-
 include/linux/usb/usbnet.h                   |    2 +
 include/net/bluetooth/hci.h                  |    2 +
 include/net/sctp/structs.h                   |    2 +-
 net/bluetooth/hci_core.c                     |   10 ++++++-
 net/bluetooth/hci_event.c                    |    4 ++-
 net/bluetooth/l2cap_core.c                   |    4 ++-
 net/bluetooth/l2cap_sock.c                   |    5 ++-
 net/bluetooth/mgmt.c                         |    2 +
 net/ipv4/tcp_output.c                        |    3 +-
 net/ipv6/tcp_ipv6.c                          |    1 +
 net/mac80211/key.c                           |    7 +++--
 net/mac80211/rc80211_minstrel_ht.c           |   25 +++++++++++++++------
 net/mac80211/rx.c                            |    3 +-
 net/sctp/sm_make_chunk.c                     |    4 +-
 net/wireless/scan.c                          |   31 +++++++++++++++++--------
 36 files changed, 138 insertions(+), 60 deletions(-)

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


There is going to be a merge conflict to resolve, due to the tree
wide spelling fixes that went in last week, but it's trivial to
resolve.

1) ipset bug fixes from Jozsef Kadlecsik.

2) Fix regression in rt_iif management in ipv4 routes, reported
   and fixed by OGAWA Hirofumi.

3) Link sensing and RX ring buffer corruption fixes in mlx4 driver,
   from Yevgeny Petrilin.

4) Add some IDs to smsc95xx driver, from Steve Glendinning.

5) Add some IDs to mv88e6131 driver, from Peter Korsgaard.

6) Fix dead loop in pppoe driver, from Ulrich Weber.

7) Fix suspend/resume in be2net driver, from Padmanabh Ratnakar and
   Sarveswara Rao Mygapula.

8) B43 wireless doesn't allocate large enough RX buffers, from John
   W. Linville.

9) Array missing entry for 9485 revisions in ath9k driver, fix from
   Senthil Balasubramanian.

10) Fix duplicate wireless frames on cooked monitor, from Helmut
    Schaa.

11) Validate NVS file struct descriptor length given by the user,
    fix from Luciano Coelho.

12) Add IDs to p54usb driver, from Christian Lamparter.

13) Don't try to cancel work that never was created in rt2x00 driver,
    from Stanislaw Gruszka.

14) Fix mac_lock handling in smsc911x driver, from Enric Balletbo i Serra.

15) Handle firmware heartbeat failure properly in bnx driver, from
    Rasesh Mody and Debashis Dutt.

16) Fix shutdown crash in be2net driver, from Ajit Khaparde.

17) Missed setting rxhash of socket in ipv6 code, from Neil Horman.

Please pull, thanks a lot!

The following changes since commit 4263a2f1dad8c8e7ce2352a0cbc882c2b0c044a9:

  Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 (2011-04-10 09:56:10 -0700)

are available in the git repository at:

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

Ajit Khaparde (1):
      be2net: Fix a potential crash during shutdown.

Christian Lamparter (1):
      p54usb: IDs for two new devices

David S. Miller (2):
      Merge branch 'master' of git://git.kernel.org/.../kaber/nf-2.6
      Merge branch 'master' of git://git.kernel.org/.../linville/wireless-2.6

David Sterba (1):
      netfilter: h323: bug in parsing of ASN1 SEQOF field

Enric Balletbo i Serra (2):
      smsc911x: fix mac_lock acquision before calling smsc911x_mac_read
      can: mcp251x: Allow pass IRQ flags through platform data.

Florian Westphal (4):
      netfilter: af_info: add network namespace parameter to route hook
      netfilter: af_info: add 'strict' parameter to limit lookup to .oif
      netfilter: xt_addrtype: replace rt6_lookup with nf_afinfo->route
      netfilter: xt_conntrack: fix inverted conntrack direction test

Hans Schillstrom (1):
      IPVS: fix NULL ptr dereference in ip_vs_ctl.c ip_vs_genl_dump_daemons()

Helmut Schaa (1):
      mac80211: Fix duplicate frames on cooked monitor

Ian Campbell (1):
      MAINTAINERS: add entry for Xen network backend

Johannes Berg (1):
      mac80211: fix comment regarding aggregation buf_size

John W. Linville (2):
      b43: allocate receive buffers big enough for max frame len + offset
      iwlwifi: accept EEPROM version 0x423 for iwl6000

Jozsef Kadlecsik (2):
      netfilter: ipset: list:set timeout variant fixes
      netfilter: ipset: references are protected by rwlock instead of mutex

Jussi Kivilinna (2):
      zd1211rw: remove URB_SHORT_NOT_OK flag in zd_usb_iowrite16v_async()
      zd1211rw: reset rx idle timer from tasklet

Larry Finger (1):
      rtlwifi: Fix some warnings/bugs

Luciano Coelho (2):
      wl12xx: fix module author's email address in the spi and sdio modules
      wl12xx: fix potential buffer overflow in testmode nvs push

Neil Horman (1):
      ipv6: Enable RFS sk_rxhash tracking for ipv6 sockets (v2)

OGAWA Hirofumi (1):
      ipv4: Fix "Set rt->rt_iif more sanely on output routes."

Padmanabh Ratnakar (2):
      be2net: Rename some struct members for clarity
      be2net: Fix suspend/resume operation

Peter Korsgaard (1):
      dsa/mv88e6131: add support for mv88e6085 switch

Rasesh Mody (1):
      bna: Fix for handling firmware heartbeat failure

Senthil Balasubramanian (1):
      ath9k: Fix phy info print message with AR9485 chipset.

Stanislaw Gruszka (1):
      rt2x00: fix cancelling uninitialized work

Steve Glendinning (1):
      net: Add support for SMSC LAN9530, LAN9730 and LAN89530

Ulrich Weber (1):
      pppoe: drop PPPOX_ZOMBIEs in pppoe_flush_dev

Yevgeny Petrilin (2):
      mlx4: Sensing link type at device initialization
      mlx4_en: Restoring RX buffer pointer in case of failure

 MAINTAINERS                                       |    7 ++
 drivers/net/benet/be.h                            |    4 +-
 drivers/net/benet/be_main.c                       |   19 ++--
 drivers/net/bna/bfa_ioc.c                         |   10 +--
 drivers/net/can/mcp251x.c                         |    3 +-
 drivers/net/mlx4/en_rx.c                          |    4 +
 drivers/net/mlx4/main.c                           |    5 +
 drivers/net/mlx4/mlx4.h                           |    2 +
 drivers/net/mlx4/sense.c                          |    4 +-
 drivers/net/pppoe.c                               |    2 +-
 drivers/net/smsc911x.c                            |    8 +-
 drivers/net/usb/smsc95xx.c                        |   15 +++
 drivers/net/wireless/ath/ath9k/hw.c               |    1 +
 drivers/net/wireless/b43/dma.c                    |    2 +-
 drivers/net/wireless/b43/dma.h                    |    2 +-
 drivers/net/wireless/iwlwifi/iwl-eeprom.h         |    2 +-
 drivers/net/wireless/p54/p54usb.c                 |    2 +
 drivers/net/wireless/rt2x00/rt2x00dev.c           |    6 +-
 drivers/net/wireless/rtlwifi/efuse.c              |    2 +-
 drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c |    2 +-
 drivers/net/wireless/rtlwifi/usb.c                |    2 +-
 drivers/net/wireless/wl12xx/sdio.c                |    2 +-
 drivers/net/wireless/wl12xx/spi.c                 |    2 +-
 drivers/net/wireless/wl12xx/testmode.c            |    5 +-
 drivers/net/wireless/zd1211rw/zd_usb.c            |   20 ++++-
 drivers/net/wireless/zd1211rw/zd_usb.h            |    1 +
 include/linux/can/platform/mcp251x.h              |    2 +
 include/linux/netfilter.h                         |    3 +-
 include/linux/netfilter/ipset/ip_set.h            |    2 +-
 include/linux/netfilter/ipset/ip_set_ahash.h      |    3 +-
 include/net/ip_vs.h                               |    2 +-
 include/net/mac80211.h                            |   15 +++-
 include/net/route.h                               |    5 +-
 net/dsa/mv88e6131.c                               |   23 ++++-
 net/dsa/mv88e6xxx.h                               |    2 +
 net/ipv4/netfilter.c                              |    5 +-
 net/ipv4/route.c                                  |    8 +-
 net/ipv4/xfrm4_policy.c                           |    1 +
 net/ipv6/netfilter.c                              |   13 ++-
 net/ipv6/tcp_ipv6.c                               |    4 +-
 net/ipv6/udp.c                                    |    3 +
 net/mac80211/rx.c                                 |    2 +-
 net/netfilter/Kconfig                             |    1 -
 net/netfilter/ipset/ip_set_bitmap_ip.c            |    3 +-
 net/netfilter/ipset/ip_set_bitmap_ipmac.c         |    3 +-
 net/netfilter/ipset/ip_set_bitmap_port.c          |    3 +-
 net/netfilter/ipset/ip_set_core.c                 |  109 +++++++++++++--------
 net/netfilter/ipset/ip_set_list_set.c             |   53 +++++------
 net/netfilter/ipvs/ip_vs_ctl.c                    |    2 +-
 net/netfilter/nf_conntrack_h323_asn1.c            |    2 +-
 net/netfilter/nf_conntrack_h323_main.c            |   16 ++--
 net/netfilter/xt_TCPMSS.c                         |    2 +-
 net/netfilter/xt_addrtype.c                       |   42 ++++++---
 net/netfilter/xt_conntrack.c                      |    2 +-
 54 files changed, 301 insertions(+), 164 deletions(-)

^ permalink raw reply	[flat|nested] 1456+ messages in thread
* [GIT] Networking
@ 2011-04-19 20:44 David Miller
  0 siblings, 0 replies; 1456+ messages in thread
From: David Miller @ 2011-04-19 20:44 UTC (permalink / raw)
  To: torvalds; +Cc: akpm, netdev, linux-kernel


It's the all new Linux networking, now with less OOPS:

1) inetpeer tree traversal uses an on-stack stack, which is fine, but
   when we miss and end up creating a new entry we can trigger into
   the tree cleanup code which will allocate yet another one of these
   stacks on the stack.

   Several reported crashes are believed to be caused by this.

   Fix by sharing the stack state between these two code paths, from
   Eric Dumazet.

2) igmp_max_memberships has real meaning even when CONFIG_IP_MULTICAST
   is not set, so do not use that config knob to control whether the
   sysctl for it is available or not.  Fix from Joakim Tjernlund.

3) Fix double skb free in connector, from Patrick McHardy.

4) sis900 and natsemi forget to store permanent mac address, fix from
   Otavio Salvador.

5) irda_sendmsg() has locking imbalance, fix from Dave Jones.

6) ieee802154 has bogus cflags overrides in it's makefile, causes build
   issues of various sorts (reported by Dave Jones).  Just kill them.

7) We properly disable TSO when scatter-gather is disabled for a device,
   but we forget to handle TSO6 too.

   Similarly, when both TSO features are turned off it makes no sense
   to have TSO_ECN turned on.

   Fixes from Ben Hutchings.

8) SCTP oops fixes wrt retransmits and transport references to retrans
   paths, from Wei Yongjun.

9) ipset bug fixes from Jozsef Kadlecsik.  Dumping order was wrong, and
   entry reclaim was buggy.

10) OF layer conversion of mpc5xxx_can driver broke the build, fix
    from Anatolij Gustschin.

11) qlcnic and netxen have fragment handling issues causing deadlocks,
    fixes from Amit Kumar Salecha.

12) CAIF needs to use list_for_each_entry_safe() in cfmuxl_ctrlcmd() since
    the loop removes nodes.  Fix from Sjur Brændeland.

13) Length check is busted, and assumes linear SKBs, in llc_fixup_skb().
    Fixes bugzilla #32872

14) sfc driver fixes from Ben Hutchings, loopback self-tests leave
    TX queues active, and online self-test had unintended side effects.

15) Comment and log message typo fixes from Weiping Pan.

16) Fix some more cases of IP option parsing when coming out of a
    bridge, from Eric Dumazet.  Also, make ip_options_compile()
    resilient to packets with no attached route.

17) FLAG_POINTTOPOINT and FLAG_MULTI_PACKET overlap in usbnet layer,
    oops.  Fix from Huajun Li.

18) RX path memory leak in ban driver, from Debashis Dutt.

19) Allowing VLAN over loopback causes crashes, particularly in ipv6
    routing, simply disallow this.  From Krishna Kumar.

20) Revert TCP bind() change that causes regressions for various
    programs, such as haproxy and amavisd.  Fixes kernel bugzilla 32832.

Please pull, thanks a lot!

The following changes since commit f0e615c3cb72b42191b558c130409335812621d8:

  Linux 2.6.39-rc4 (2011-04-18 21:26:00 -0700)

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

Amit Kumar Salecha (1):
      qlcnic: limit skb frags for non tso packet

Anatolij Gustschin (1):
      net: can: mscan: fix build breakage in mpc5xxx_can

Ben Hutchings (3):
      sfc: Do not use efx_process_channel_now() in online self-test
      net: Disable all TSO features when SG is disabled
      net: Disable NETIF_F_TSO_ECN when TSO is disabled

Brian Cavagnolo (1):
      mwl8k: do not free unrequested irq

Christian Lamparter (1):
      ath: add missing regdomain pair 0x5c mapping

Dave Jones (1):
      irda: fix locking unbalance in irda_sendmsg

David S. Miller (7):
      Merge branch 'master' of git://git.kernel.org/.../linville/wireless-2.6
      llc: Fix length check in llc_fixup_skb().
      ieee802154: Remove hacked CFLAGS in net/ieee802154/Makefile
      Merge branch 'sfc-2.6.39' of git://git.kernel.org/.../bwh/sfc-2.6
      Revert "tcp: disallow bind() to reuse addr/port"
      Merge branch 'master' of git://git.kernel.org/.../linville/wireless-2.6
      Merge branch 'master' of git://git.kernel.org/.../kaber/nf-2.6

Eric Dumazet (3):
      bridge: reset IPCB in br_parse_ip_options
      inetpeer: reduce stack usage
      ip: ip_options_compile() resilient to NULL skb route

Felix Fietkau (2):
      ath9k: fix missing ath9k_ps_wakeup/ath9k_ps_restore calls
      ath9k_hw: fix stopping rx DMA during resets

Francois Romieu (1):
      r8169: add Realtek as maintainer.

Giuseppe CAVALLARO (3):
      stmmac: fixed dma lib build when turn-on the debug option
      stmmac: fix open funct when exit on error
      stmmac: fix Transmit Underflow error

Jason Conti (1):
      p54: Initialize extra_len in p54_tx_80211

Joakim Tjernlund (1):
      net: Do not wrap sysctl igmp_max_memberships in IP_MULTICAST

Johannes Berg (1):
      iwlagn: override 5300 EEPROM # of chains

John W. Linville (1):
      iwlegacy: make iwl3945 and iwl4965 select IWLWIFI_LEGACY

Jozsef Kadlecsik (5):
      netfilter: ipset: list:set timeout variant fixes
      netfilter: ipset: References are protected by rwlock instead of mutex
      netfilter: ipset: bitmap:ip,mac type requires "src" for MAC
      netfilter: ipset: set match and SET target fixes
      netfilter: ipset: Fix the order of listing of sets

Krishna Kumar (1):
      ip6_pol_route panic: Do not allow VLAN on loopback

Neil Turton (2):
      sfc: Stop the TX queues during loopback self-tests
      sfc: Use rmb() to ensure reads occur in order

Otavio Salvador (2):
      net/sis900: store MAC into perm_addr for SiS 900, 630E, 635 and 96x variants
      net/natsami: store MAC into perm_addr

Patrick McHardy (2):
      connector: fix skb double free in cn_rx_skb()
      Merge branch 'master' of ssh://master.kernel.org/.../kaber/nf-2.6

Peter Pan(潘卫平) (5):
      bonding:set save_load to 0 when initializing
      bonding:delete unused alb_timer
      bonding:delete unused rlb_interval_counter
      net: fix tranmitted/tranmitting typo
      bonding:fix two typos

Rasesh Mody (2):
      bna: fix for clean fw re-initialization
      bna: fix memory leak during RX path cleanup

Sjur Brændeland (2):
      caif: Bugfix use for_each_safe when removing list nodes.
      caif: performance bugfix - allow radio stack to prioritize packets.

Stanislaw Gruszka (1):
      iwlegacy: fix tx_power initialization

Sujith Manoharan (1):
      ath9k_htc: Fix ethtool reporting

Vlad Yasevich (1):
      sctp: fix oops when updating retransmit path with DEBUG on

Wei Yongjun (1):
      sctp: fix oops while removed transport still using as retran path

Yaniv Rosner (1):
      bnx2x: Fix port identification problem

amit salecha (1):
      netxen: limit skb frags for non tso packet

huajun li (1):
      usbnet: Fix up 'FLAG_POINTTOPOINT' and 'FLAG_MULTI_PACKET' overlaps.

 MAINTAINERS                                  |    1 +
 drivers/connector/connector.c                |    1 +
 drivers/net/bna/bfa_ioc.c                    |   31 +++++++++-------
 drivers/net/bna/bfa_ioc.h                    |    1 +
 drivers/net/bna/bfa_ioc_ct.c                 |   28 +++++++++++++++
 drivers/net/bna/bfi.h                        |    6 ++-
 drivers/net/bna/bnad.c                       |    1 -
 drivers/net/bnx2x/bnx2x_ethtool.c            |    9 ++---
 drivers/net/bonding/bond_alb.c               |    6 ++--
 drivers/net/bonding/bond_alb.h               |    4 +--
 drivers/net/can/mscan/mpc5xxx_can.c          |    2 +-
 drivers/net/loopback.c                       |    3 +-
 drivers/net/natsemi.c                        |    3 ++
 drivers/net/netxen/netxen_nic.h              |    4 +-
 drivers/net/netxen/netxen_nic_main.c         |   17 +++++++++
 drivers/net/qlcnic/qlcnic.h                  |    1 +
 drivers/net/qlcnic/qlcnic_main.c             |   14 +++++++
 drivers/net/sfc/efx.c                        |    6 ++-
 drivers/net/sfc/io.h                         |    2 +
 drivers/net/sfc/net_driver.h                 |    2 -
 drivers/net/sfc/nic.c                        |   22 ++++++++----
 drivers/net/sfc/nic.h                        |    1 +
 drivers/net/sfc/selftest.c                   |   25 +++----------
 drivers/net/sfc/tx.c                         |    3 +-
 drivers/net/sis900.c                         |   23 ++++++++++--
 drivers/net/stmmac/dwmac_lib.c               |   28 +++++++-------
 drivers/net/stmmac/stmmac_main.c             |   49 +++++++++++++++-----------
 drivers/net/tokenring/3c359.c                |    4 +-
 drivers/net/tokenring/lanstreamer.c          |    2 +-
 drivers/net/tokenring/olympic.c              |    2 +-
 drivers/net/wireless/ath/ath9k/hif_usb.c     |    4 +-
 drivers/net/wireless/ath/ath9k/hw.c          |    9 -----
 drivers/net/wireless/ath/ath9k/mac.c         |   25 +++++++++++--
 drivers/net/wireless/ath/ath9k/mac.h         |    2 +-
 drivers/net/wireless/ath/ath9k/main.c        |   12 +++++-
 drivers/net/wireless/ath/ath9k/recv.c        |    6 ++--
 drivers/net/wireless/ath/regd_common.h       |    1 +
 drivers/net/wireless/iwlegacy/Kconfig        |    9 +++--
 drivers/net/wireless/iwlegacy/iwl-3945-hw.h  |    2 -
 drivers/net/wireless/iwlegacy/iwl-4965-hw.h  |    3 --
 drivers/net/wireless/iwlegacy/iwl-core.c     |   17 ++++++---
 drivers/net/wireless/iwlegacy/iwl-eeprom.c   |    7 ----
 drivers/net/wireless/iwlegacy/iwl3945-base.c |    4 --
 drivers/net/wireless/iwlegacy/iwl4965-base.c |    6 ---
 drivers/net/wireless/iwlwifi/iwl-5000.c      |    3 ++
 drivers/net/wireless/mwl8k.c                 |    9 ++++-
 drivers/net/wireless/p54/txrx.c              |    2 +-
 include/linux/usb/usbnet.h                   |    4 +-
 net/bridge/br_netfilter.c                    |    6 +--
 net/caif/cfdgml.c                            |    6 +++-
 net/caif/cfmuxl.c                            |    4 +-
 net/core/dev.c                               |   10 ++++--
 net/ieee802154/Makefile                      |    2 -
 net/ipv4/inet_connection_sock.c              |    5 +--
 net/ipv4/inetpeer.c                          |   13 ++++---
 net/ipv4/ip_options.c                        |    6 ++--
 net/ipv4/sysctl_net_ipv4.c                   |    3 --
 net/ipv6/inet6_connection_sock.c             |    2 +-
 net/irda/af_irda.c                           |    3 +-
 net/llc/llc_input.c                          |    3 +-
 net/netfilter/ipset/ip_set_bitmap_ipmac.c    |    4 ++
 net/netfilter/ipset/ip_set_core.c            |   18 +++++----
 net/netfilter/xt_set.c                       |   18 ++++++++-
 net/sctp/associola.c                         |    4 ++
 64 files changed, 330 insertions(+), 203 deletions(-)

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


The commit count here is not as low as I would have liked, but it is the
usual smattering of one-liners fixing problems people are actually
running into.  Considering the fact that the last networking pull
request was nearly 2 weeks ago, the hit count isn't that bad.

Along with the straight-out fixes, there are a few reverts for changes
that caused clear regressions.

Anyways:

1) Revert veth change, breaks configuration of veth devices, from Jiri
   Pirko.

2) WoL by default isn't done properly in tg3 driver, from Rafael
   J. Wysocki.

3) fs_enet driver doesn't configure multicast into the chip properly,
   from Andrea Galbusera.

4) Fix QoS config send halting TX in iwlwifi, from Daniel Halperin.

5) atl1c manages async work events using non-atomic bit field, use
   atomic bitops to fix these races, from Tim Gardner.

6) Revert bridging change which broke 802.3ad bonding inside of
   bridge.

7) Removing a net driver can wedge in netconsole due to recursive
   locking, fix from Neil Horman.

8) bnx2x blindly dereferences packets as if they were all TCP,
   fix to check protocol type properly and handle UDP correctly
   as well.  From Eric Dumazet and Vladislav Zolotarov.

9) Fix r8169 to not request firmware before userspace is even
   present, from Francois Romieu.

10) Blackhole routes need to provide ->cow_metrics() op otherwise
    we OOPS, from Held Benhard.

11) IPSEC replay window handling fixes from Steffen Klassert.

12) usbnet can wedge on resume because a pending interrupt URB
    gets lost, resubmit it on resume.  From Paul Stewart.

13) Pending timer on remove results in OOPS in bnx2 driver, fix
    from Neil Horman.

14) ftmac100 does usleep_range() in non-sleepable contexts, fix
    to use udelay() for now.  From Adam Jaremko.

15) AF_UNIX sockets use a dummy packet send in order to implement
    connect() and accept().  We want to completely ignore these
    pseudo-packets in recvmsg() otherwise we can OOPS.  Fix
    from Eric W. Biederman.

16) Every net namespace creation emits an annoying log message from
    the fib_trie code, kill it.  From Alexey Dobriyan.

17) Invalid ioctl commands should emit -ENOTTY not -EINVAL.  From
    Lifeng Sun.

18) smsc95xx driver checks BMCR register bit improperly, it's
    actually using a register address (which is zero and thus
    the test never passes) :-)  Sharp eyed fix from Rabin Vincent.

19) Calls to register_net_sysctl_table() should be consistently
    paired with unregister_net_sysctl_table().  Fix broken cases,
    from Lucian Adrian Grijincu.

20) RAW CAN socket release can OOPS due to missing 'sk' check, from
    Oliver Hartkopp.

    The BCM CAN code has an identical bug, also fixed here, as
    was originally reported by Dave Jones.

    These bugs were uncovered thanks to Dave's syscall stresser.

21) SKB use after free fixes in iwlwifi and iwl4965, from Stanislaw
    Gruszka.

22) udp6_ufo_fragment() mis-calculates SKB headroom, from Shan Wei.

23) A conversion of how the RTAX_HOPLIMIT mertric is handled in ipv6
    missed one case, resulting in addrconf routes always using
    "255" as the hop limit.  Fix from Thomas Egerer.

24) Missing counter bump in be2net driver results in temperature
    sense happening way too often, from Ivan Vecera.

25) agg_device_up() in the bonding code uses the wrong method to find
    the aggregator of the bond, it should use agg->lag_ports->slave
    instead of agg->slave.  Fix from Jiri Bohac.

26) Bluetooth HCI connect code does one refcount grab too many,
    fix from Ville Tervo.

Please pull, thanks a lot!

The following changes since commit adadfe48df3858c3c1ba52963502f38885ab2f3c:

  Merge branch 'for-linus' of git://git.infradead.org/ubifs-2.6 (2011-05-02 12:17:29 -0700)

are available in the git repository at:

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

Adam Jaremko (1):
      net: ftmac100: fix scheduling while atomic during PHY link status change

Alexey Dobriyan (1):
      ipv4: don't spam dmesg with "Using LC-trie" messages

Andrea Galbusera (1):
      powerpc: Fix multicast problem in fs_enet driver

Breno Leitao (1):
      ehea: Fix a DLPAR bug on ehea_rereg_mrs().

Dan Williams (1):
      usbnet: add support for some Huawei modems with cdc-ether ports

Daniel Halperin (1):
      iwlwifi: fix frame injection for HT channels

Dave Jones (1):
      can: Add missing socket check in can/bcm release.

David S. Miller (4):
      Revert "bridge: Forward reserved group addresses if !STP"
      Merge branch 'master' of git://git.kernel.org/.../linville/wireless-2.6
      Merge branch 'davem.r8169' of git://git.kernel.org/.../romieu/netdev-2.6
      Merge branch 'master' of git://git.kernel.org/.../linville/wireless-2.6

Eric W. Biederman (1):
      af_unix: Only allow recv on connected seqpacket sockets.

Felix Fietkau (1):
      ath9k: fix the return value of ath_stoprecv

François Romieu (1):
      r8169: don't request firmware when there's no userspace.

Hans Petter Selasky (1):
      cdc_ncm: fix short packet issue on some devices

Held Bernhard (1):
      net: provide cow_metrics() methods to blackhole dst_ops

Ivan Vecera (1):
      be2net: increment work_counter in be_worker

Jiri Bohac (1):
      bonding: 802.3ad - fix agg_device_up

Jiri Pirko (1):
      Revert: veth: remove unneeded ifname code from veth_newlink()

Joe Perches (1):
      amd8111e: trivial typo spelling: Negotitate -> Negotiate

Johannes Berg (1):
      mac80211: fix SMPS debugfs locking

John W. Linville (1):
      Merge branch 'master' of git://git.kernel.org/.../padovan/bluetooth-2.6

Lifeng Sun (1):
      networking: inappropriate ioctl operation should return ENOTTY

Lucian Adrian Grijincu (1):
      sysctl: net: call unregister_net_sysctl_table where needed

Luiz Augusto von Dentz (1):
      Bluetooth: fix shutdown on SCO sockets

Neil Horman (2):
      netconsole: fix deadlock when removing net driver that netconsole is using (v2)
      bnx2: cancel timer on device removal

Oliver Hartkopp (1):
      can: add missing socket check in can/raw release

Oliver Neukum (1):
      usbnet: Transfer of maintainership

Paul Stewart (1):
      usbnet: Resubmit interrupt URB if device is open

Peter Korsgaard (1):
      dsa/mv88e6131: fix unknown multicast/broadcast forwarding on mv88e6085

Rabin Vincent (1):
      smsc95xx: fix reset check

Rafael J. Wysocki (1):
      tg3: Fix failure to enable WoL by default when possible

Rafał Miłecki (1):
      b43: trivial: update module info about ucode16_mimo firmware

Ruiyi Zhang (1):
      Bluetooth: Only keeping SAR bits when retransmitting one frame.

Shan Wei (1):
      ipv6: udp: fix the wrong headroom check

Stanislaw Gruszka (5):
      iwlwifi: fix skb usage after free
      iwl4965: fix skb usage after free
      iwl4965: fix "TX Power requested while scanning"
      iwlagn: fix "Received BA when not expected"
      iwl4965: fix "Received BA when not expected"

Steffen Klassert (3):
      xfrm: Fix replay window size calculation on initialization
      esp6: Fix scatterlist initialization
      xfrm: Check for the new replay implementation if an esn state is inserted

Thomas Egerer (1):
      ipv6: Remove hoplimit initialization to -1

Tim Gardner (1):
      atl1c: Fix work event interrupt/task races

Ville Tervo (1):
      Bluetooth: Fix refcount balance for hci connection

Vinicius Costa Gomes (1):
      Bluetooth: Fix keeping the command timer running

Vladislav Zolotarov (1):
      bnx2x: fix UDP csum offload

Wey-Yi Guy (1):
      iwlegacy: led stay solid on when no traffic

artpol (1):
      mii: add support of pause frames in mii_get_an

 MAINTAINERS                                  |    2 +-
 arch/powerpc/include/asm/8xx_immap.h         |    4 +-
 drivers/net/amd8111e.c                       |    2 +-
 drivers/net/atl1c/atl1c.h                    |    6 +-
 drivers/net/atl1c/atl1c_main.c               |   14 ++---
 drivers/net/benet/be_main.c                  |    1 +
 drivers/net/bnx2.c                           |    2 +
 drivers/net/bnx2x/bnx2x_cmn.c                |   34 ++++++---
 drivers/net/bonding/bond_3ad.c               |    7 ++-
 drivers/net/ehea/ehea_main.c                 |    9 ++-
 drivers/net/fs_enet/mac-fec.c                |    8 +-
 drivers/net/ftmac100.c                       |    8 +-
 drivers/net/mii.c                            |    4 +
 drivers/net/netconsole.c                     |    8 ++
 drivers/net/r8169.c                          |   99 ++++++++++++++++++-------
 drivers/net/tg3.c                            |    8 ++-
 drivers/net/usb/cdc_ether.c                  |   14 +++-
 drivers/net/usb/cdc_ncm.c                    |    4 +-
 drivers/net/usb/smsc95xx.c                   |    2 +-
 drivers/net/usb/usbnet.c                     |    8 ++
 drivers/net/veth.c                           |   12 +++
 drivers/net/wireless/ath/ath9k/recv.c        |    2 +-
 drivers/net/wireless/b43/main.c              |    1 +
 drivers/net/wireless/iwlegacy/iwl-4965-tx.c  |   28 +++++---
 drivers/net/wireless/iwlegacy/iwl-led.c      |   20 +++++-
 drivers/net/wireless/iwlegacy/iwl4965-base.c |    8 +-
 drivers/net/wireless/iwlwifi/iwl-agn-rxon.c  |    7 +--
 drivers/net/wireless/iwlwifi/iwl-agn-tx.c    |   27 +++++---
 include/linux/usb/usbnet.h                   |    1 +
 net/bluetooth/hci_core.c                     |    5 +-
 net/bluetooth/hci_event.c                    |    2 -
 net/bluetooth/l2cap_core.c                   |    1 +
 net/bluetooth/sco.c                          |    9 +++
 net/bridge/br_input.c                        |    2 +-
 net/can/bcm.c                                |    7 ++-
 net/can/raw.c                                |    7 ++-
 net/core/dev.c                               |    6 +-
 net/dsa/Kconfig                              |    4 +-
 net/dsa/mv88e6131.c                          |   26 ++++++--
 net/ipv4/devinet.c                           |    2 +-
 net/ipv4/fib_trie.c                          |    3 -
 net/ipv4/route.c                             |    7 ++
 net/ipv6/addrconf.c                          |    2 +-
 net/ipv6/esp6.c                              |    2 +-
 net/ipv6/route.c                             |    8 ++-
 net/ipv6/udp.c                               |    2 +-
 net/mac80211/cfg.c                           |    2 +
 net/mac80211/debugfs_netdev.c                |    4 +-
 net/unix/af_unix.c                           |   16 ++++-
 net/xfrm/xfrm_replay.c                       |    2 +-
 net/xfrm/xfrm_user.c                         |    3 +
 51 files changed, 338 insertions(+), 134 deletions(-)

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


There's several OOPS'ers and reverts in here.

I think we now have all of the worst ones fixed from the regression
list, and I would recommend doing just one more -rc to get this all
sorted out and tested properly.  But of course that is completely up
to you.

1) ipheth regressed because it had a hard dependency upon NET_IP_ALIGN
   being defined always as 2, get rid of that assumption.  From Ben
   Hutchings.

2) IPV6 REJECT module puts random values in TOS field, fix from
   Fernando Luis Vazquez Cao.

3) When an ipv4 fragmentation entry expires via a timer, we have to
   revalidate the route otherwise we can crash.  Fix from Eric
   Dumazet.

4) In usbnet, usbnet_bh can be scheduled too early during resume
   resulting in flood of RX frames but no reclaim, and this leads to
   running out of atomic memory.  Don't allow usbnet_bh to schedule
   until the device is brought completely up.  Fix from Ming Lei.

5) TCP cubic can divide by zero in some extreme cases, fix from
   Stephen Hemminger.

6) SLIP and SLCAN devices return incorrect values from their ldisc
   open method, from Matvejchikov Ilya and Oliver Hartkopp.

7) VLAN GVRP state is undone at the wrong moment, causing crashes during
   batched device delete.  From Eric Dumazet.

8) dev_close() mistakenly had it's IFF_UP check removed, this has to be
   put back otherwise we can crash during batched device teardown, in
   particular with bonding.  Fix from Eric DUmazet.

9) PCH_GBE "checksum correct" logic on RX is reversed (hardware sets
   the status bit on checksum failure, clears it on success), from
   Toshiharu Okada.

10) vmxnet3 does not take ->cmd_lock consistently with interrupts disabled,
    as is warned by lockdep.  Fix from Roland Dreier.

11) DCCP feature options length needs to be validated properly,
    otherwise we can end up working with negative lengths, fix from
    Dan Rosenberg.

13) Fix regressions in ebtables compat support, from Eric Dumazet and
    Florian Westphal.

14) IPVS namespace support can leave objects referenced indefinitely until
    reboot.  Fixes from Hans Schillstrom.

15) DSCP netfilter code forgets to invert mask, from Fernando Luis
    Vazquez Cao.

16) Revert a buggy xt_conntrack change that broke handling of locally
    generated packets.  From Florian Westphal and Jan Engelhardt.

17) Inter-family packet output was busted in IPSEC, we need to split
    the operation into two parts, ->output() and ->output_finish(), to
    make sure we work in the context of the correct protocol (ipv4 vs
    ipv6) at each step.  Fix from Steffen Klassert.

18) We cannot allow ESN handling when anti-reply detection is disabled,
    also from Steffen Klassert.

Please pull, thanks a lot!

The following changes since commit 54b333529df25b21da462c7dcc16c7dc779d9f26:

  Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus (2011-05-10 12:00:53 -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):
      ipheth: Properly distinguish length and alignment in URBs and skbs

Dan Rosenberg (1):
      dccp: handle invalid feature options length

Dan Williams (1):
      net/usb: mark LG VL600 LTE modem ethernet interface as WWAN

David S. Miller (1):
      Merge branch 'pablo/nf-2.6-updates' of git://1984.lsi.us.es/net-2.6

Eric Dumazet (4):
      net: ip_expire() must revalidate route
      netfilter: fix ebtables compat support
      vlan: fix GVRP at dismantle time
      net: dev_close() should check IFF_UP

Fernando Luis Vazquez Cao (2):
      netfilter: IPv6: initialize TOS field in REJECT target module
      netfilter: IPv6: fix DSCP mangle code

Florian Westphal (1):
      netfilter: ebtables: only call xt_compat_add_offset once per rule

Hans Schillstrom (2):
      IPVS: Change of socket usage to enable name space exit.
      IPVS: init and cleanup restructuring

Kleber Sacilotto de Souza (1):
      ehea: fix wrongly reported speed and port

Kurt Van Dijck (1):
      can: fix SJA1000 dlc for RTR packets

Matvejchikov Ilya (1):
      NET: slip, fix ldisc->open retval

Ming Lei (1):
      usbnet: runtime pm: fix out of memory

Oliver Hartkopp (1):
      slcan: fix ldisc->open retval

Pablo Neira Ayuso (2):
      netfilter: ctnetlink: fix timestamp support for new conntracks
      netfilter: revert a2361c8735e07322023aedc36e4938b35af31eb0

Roland Dreier (1):
      vmxnet3: Consistently disable irqs when taking adapter->cmd_lock

Somnath Kotur (1):
      be2net: Fixed bugs related to PVID.

Steffen Klassert (2):
      xfrm: Assign the inner mode output function to the dst entry
      xfrm: Don't allow esn with disabled anti replay detection

Tomoya (1):
      pch_gbe: support ML7223 IOH

Toshiharu Okada (2):
      PCH_GbE : Fixed the issue of collision detection
      PCH_GbE : Fixed the issue of checksum judgment

stephen hemminger (1):
      tcp_cubic: limit delayed_ack ratio to prevent divide error

 drivers/net/Kconfig                  |    8 ++-
 drivers/net/benet/be.h               |    2 +-
 drivers/net/benet/be_cmds.c          |    2 +-
 drivers/net/benet/be_main.c          |   18 ++++--
 drivers/net/can/sja1000/sja1000.c    |    2 +-
 drivers/net/can/slcan.c              |    4 +-
 drivers/net/ehea/ehea_ethtool.c      |   21 ++++--
 drivers/net/pch_gbe/pch_gbe_main.c   |   23 +++++--
 drivers/net/slip.c                   |    4 +-
 drivers/net/usb/cdc_ether.c          |    2 +-
 drivers/net/usb/ipheth.c             |   14 +++--
 drivers/net/usb/usbnet.c             |   10 ++-
 drivers/net/vmxnet3/vmxnet3_drv.c    |   10 ++-
 include/net/ip_vs.h                  |   17 +++++
 include/net/xfrm.h                   |    3 +
 net/8021q/vlan.c                     |    3 +
 net/8021q/vlan_dev.c                 |    3 -
 net/bridge/netfilter/ebtables.c      |   64 +++---------------
 net/core/dev.c                       |   10 ++-
 net/dccp/options.c                   |    2 +
 net/ipv4/ip_fragment.c               |   33 +++++-----
 net/ipv4/tcp_cubic.c                 |    9 ++-
 net/ipv4/xfrm4_output.c              |    8 ++-
 net/ipv4/xfrm4_state.c               |    1 +
 net/ipv6/netfilter/ip6t_REJECT.c     |    4 +-
 net/ipv6/xfrm6_output.c              |    6 +-
 net/ipv6/xfrm6_state.c               |    1 +
 net/netfilter/ipvs/ip_vs_app.c       |   15 +----
 net/netfilter/ipvs/ip_vs_conn.c      |   12 +---
 net/netfilter/ipvs/ip_vs_core.c      |  103 ++++++++++++++++++++++++++---
 net/netfilter/ipvs/ip_vs_ctl.c       |  120 ++++++++++++++++++++++++++++-----
 net/netfilter/ipvs/ip_vs_est.c       |   14 +---
 net/netfilter/ipvs/ip_vs_proto.c     |   11 +---
 net/netfilter/ipvs/ip_vs_sync.c      |   65 ++++++++++--------
 net/netfilter/nf_conntrack_netlink.c |    4 +
 net/netfilter/x_tables.c             |    4 +-
 net/netfilter/xt_DSCP.c              |    2 +-
 net/netfilter/xt_conntrack.c         |    5 --
 net/xfrm/xfrm_policy.c               |   14 ++++-
 net/xfrm/xfrm_replay.c               |    3 +
 40 files changed, 423 insertions(+), 233 deletions(-)

^ permalink raw reply	[flat|nested] 1456+ messages in thread
* [GIT] Networking
@ 2011-05-13 20:40 David Miller
  0 siblings, 0 replies; 1456+ messages in thread
From: David Miller @ 2011-05-13 20:40 UTC (permalink / raw)
  To: torvalds; +Cc: akpm, netdev, linux-kernel


Some stragglers, the bridging one is pretty important as it hits
virtualization users:

1) Do not run ipv4 options parser on ipv6 packets in bridging,
   from Stephen Hemminger.

2) Regression fix, changes to TOS/tclass handling made ECN stop
   being done on ipv6 connections.  Fix from Steinar H. Gunderson.

3) On-wire packets for bridging modes were defined in a way (lacking
   necessary __packed directives), such that they didn't work properly
   on some architectures (namely, ARM).  Fix from Vitalii Demianets.

4) Long ago net_device_ops conversion broke several m68k drivers
   based upon the 8390 infrastructure.  Fix from Geert Uytterhoeven.

5) SFC needs to map certain chip memory as uncacheable, from Ben
   Hutchings.

6) Memory hotplug oops fix in ehea driver from Anton Blanchard.

7) IBSS oops fix in intel wireless drivers, from Stanislaw Gruszka.

8) Command pending queue locking fix in libertas.

Please pull, thanks a lot!

The following changes since commit 3568bd9720b4a775f28a718fcbb462ce2f386988:

  Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client (2011-05-11 19:13:34 -0700)

are available in the git repository at:

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

Anton Blanchard (1):
      ehea: Fix memory hotplug oops

Ben Hutchings (1):
      sfc: Always map MCDI shared memory as uncacheable

David S. Miller (2):
      Merge branch 'master' of git://git.kernel.org/.../linville/wireless-2.6
      Merge branch 'sfc-2.6.39' of git://git.kernel.org/.../bwh/sfc-2.6

Geert Uytterhoeven (3):
      zorro8390: Fix regression caused during net_device_ops conversion
      hydra: Fix regression caused during net_device_ops conversion
      ne-h8300: Fix regression caused during net_device_ops conversion

Luciano Coelho (1):
      mac80211: don't start the dynamic ps timer if not associated

Mohammed Shafi Shajakhan (1):
      ath9k: Fix a warning due to a queued work during S3 state

Paul Fox (1):
      libertas: fix cmdpendingq locking

Stanislaw Gruszka (1):
      iwlegacy: fix IBSS mode crashes

Steinar H. Gunderson (1):
      ipv6: restore correct ECN handling on TCP xmit

Stephen Hemminger (1):
      bridge: fix forwarding of IPv6

Vitalii Demianets (1):
      bonding,llc: Fix structure sizeof incompatibility for some PDUs

 drivers/net/Makefile                     |    6 ++--
 drivers/net/bonding/bond_3ad.h           |   10 +++---
 drivers/net/ehea/ehea_main.c             |    6 ++--
 drivers/net/hydra.c                      |   14 ++++----
 drivers/net/ne-h8300.c                   |   16 +++++-----
 drivers/net/sfc/mcdi.c                   |   49 ++++++++++++++++++-----------
 drivers/net/sfc/nic.h                    |    2 +
 drivers/net/sfc/siena.c                  |   25 +++++++++++++--
 drivers/net/wireless/ath/ath9k/main.c    |    8 +++++
 drivers/net/wireless/iwlegacy/iwl-core.c |    7 ++++
 drivers/net/wireless/iwlegacy/iwl-dev.h  |    6 ++++
 drivers/net/wireless/libertas/cmd.c      |    6 ++-
 drivers/net/zorro8390.c                  |   12 ++++----
 include/net/inet_ecn.h                   |   16 ++++++++--
 include/net/llc_pdu.h                    |    8 ++--
 net/bridge/br_netfilter.c                |    2 +-
 net/mac80211/tx.c                        |    4 ++
 17 files changed, 132 insertions(+), 65 deletions(-)

^ permalink raw reply	[flat|nested] 1456+ messages in thread
* [GIT] Networking
@ 2011-05-16 20:29 David Miller
  0 siblings, 0 replies; 1456+ messages in thread
From: David Miller @ 2011-05-16 20:29 UTC (permalink / raw)
  To: torvalds; +Cc: akpm, netdev, linux-kernel


1) SFC crashes on 'ethtool -d', from Ben Hutchings.

2) VMXNET3 driver doesn't set LRO correctly on probe, this hits a lot
   of VMWare users.  Fix from Thomas Jarosch.

3) IPVS needs to use correct SEQ release interface, otherwise it leaks
   netns references.  Fix from Hans Schillstrom.

4) Users can (via tun/tap for example) trigger the warnings generated
   by the netdevice feature validation checks we make.  Make such
   warnings of DEBUG level so user's can spam the logs.  Fix from
   Michał Mirosław.

There is a dup of bridge netfilter fix (already in your tree) with
commit ID cb68552858c64db302771469b1202ea09e696329 in here because
Pablo applied it to the netfilter tree as well (and in his tree it
appears as commit d8083deb4f1aa0977980dfb834fcc336ef38318f).  So when
I merged his tree to get the IPVS namespace leak fix, I got the bridge
netfilter fix dup too.

Please pull, thanks a lot!

The following changes since commit df8d06ade6eed9077f658ac8696fc1cb5c081220:

  Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 (2011-05-16 08:55:49 -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):
      sfc: Fix oops in register dump after mapping change

David S. Miller (1):
      Merge branch 'pablo/nf-2.6-updates' of git://1984.lsi.us.es/net-2.6

Hans Schillstrom (1):
      IPVS: fix netns if reading ip_vs_* procfs entries

Michał Mirosław (1):
      net: Change netdev_fix_features messages loglevel

Stephen Hemminger (1):
      bridge: fix forwarding of IPv6

Thomas Jarosch (1):
      vmxnet3: Fix inconsistent LRO state after initialization

 drivers/net/sfc/nic.c                 |    7 +++++++
 drivers/net/vmxnet3/vmxnet3_ethtool.c |    3 +++
 net/core/dev.c                        |   22 ++++++++--------------
 net/netfilter/ipvs/ip_vs_app.c        |    2 +-
 net/netfilter/ipvs/ip_vs_conn.c       |    4 ++--
 net/netfilter/ipvs/ip_vs_ctl.c        |    6 +++---
 6 files changed, 24 insertions(+), 20 deletions(-)

^ permalink raw reply	[flat|nested] 1456+ messages in thread
* [GIT] Networking
@ 2011-05-20 19:40 David Miller
  0 siblings, 0 replies; 1456+ messages in thread
From: David Miller @ 2011-05-20 19:40 UTC (permalink / raw)
  To: torvalds; +Cc: akpm, netdev, linux-kernel


There are two small conflicts to resolve when you merge this:

1) arch/sparc/x86/Kconfig

   Your tree has a change that removes a select on ARCH_NO_SYSDEV_OPS,
   we have one that adds a select on HAVE_BPF_JIT.  Kill the former,
   keep the latter.

2) net/mac80211/agg-tx.c

   Keep the ieee80211_assign_tid_tx() function, delete kfree_tid_tx().

   This is due to the kfree_rcu() changes in your tree.

Anyways in this installment:

1) An x86-64 JIT for BPF filters from Eric Dumazet.

2) More work towards making ipv4 route entries generic enough such that
   we can remove the routing cache and lookup routes directly in the
   routing table.  Maybe by 2.6.41 or 2.6.42 we'll be able to pull this
   off.

3) Preferred source address selection support for ipv6, from Daniel Walter.

4) Batched device unregister support in veth and macvlan, and also some
   RCU synchronization removals during device teardown from Eric Dumazet.

5) Support for running ICMP applications like 'ping' unprivileged, from
   Vasiliy Kulikov.

6) SCTP_GET_ASSOC_ID_LIST socket option support from Wei Yongjun.

7) Support for new chipsets in r8169, from hayeswang.

8) Use RCU locking in CAIF protocol stack, from sjur.brandeland

9) Add QFQ (quick fair queue) packet scheduler, from Stephen Hemminger.

10) Add netlink notifications to bridge layer, also from Stephen.

11) Fix device driver handling of ethtool triggered LED blinking,
    via a new ->set_phys_id() ethtool op.  All drivers converted and
    the old ->phys_id() ethtool op is deleted.  From Stephen Hemminger.

12) RCU conversions in Phonet layer, from Rémi Denis-Courmont.

13) Many conversions of drivers over to netdev->hw_features, from
    Michał Mirosław.

14) Support for placing interfaces into hardware loopback mode, from
    Mahesh Bandewar.

15) TSO and other bug fixes in r8169 from Francois Romieu.

16) Handle ECN bits more correctly in fragments on ipv4, from
    Eric Dumazet.

Please pull, thanks a lot!

The following changes since commit 257313b2a87795e07a0bdf58d0fffbdba8b31051:

  selinux: avoid unnecessary avc cache stat hit count (2011-05-19 21:22:53 -0700)

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

Adrian Chadd (1):
      ath9k: fix AR9160 xpaBiasLvlFreq endianness handling

Ajit Khaparde (11):
      be2net: add rxhash support
      be2net: use common method to check for sriov function type
      be2net: fix to get max VFs supported from adapter
      be2net: dynamically allocate adapter->vf_cfg
      be2net: call FLR after setup wol in be_shutdown
      be2net: allow register dump only for PFs
      be2net: Add code to display nic speeds other than 1Gbps/10Gbps
      be2net: fix be_mcc_compl_process to identify eth_get_stat command
      be2net: pass domain id to be_cmd_link_status_query
      be2net: add code to display default value of tx rate for VFs
      be2net: Support for version 1 of stats for BE3

Alexander Duyck (10):
      ethtool: prevent null pointer dereference with NTUPLE set but no set_rx_ntuple
      v3 ethtool: add ntuple flow specifier data to network flow classifier
      ixgbe: remove ntuple display support
      ixgbe: move flags and state into the same cacheline
      ixgbe: Combine SFP and multi-speed fiber task into single service task
      ixgbe: Merge watchdog functionality into service task
      ixgbe: merge reset task into service task
      ixgbe: Merge ATR reinit into the service task
      ixgbe: Merge over-temp task into service task
      ixgbe: cleanup some minor issues in ixgbe_down()

Alexander Stein (1):
      macb: Add rx overrun counter

Alexey Dobriyan (6):
      kstrtox: convert drivers/isdn/
      Bluetooth: convert net/bluetooth/ to kstrtox
      pktgen: use %pI6c for printing IPv6 addresses
      netconsole: switch to kstrto*() functions
      net: add mac_pton() for parsing MAC address
      olympic: convert to seq_file

Alexey Orishko (1):
      CDC NCM: Add mising short packet in cdc_ncm driver

Allan Stephens (19):
      tipc: Update comments in message header include file
      tipc: Eliminate unused routing message definitions
      tipc: Cosmetic consolidation of internal message type definitions
      tipc: Remove code to emulate loss of broadcast messages
      tipc: Don't initialize link selector field in fragmented messages
      tipc: Avoid pointless masking of fragmented message identifier
      tipc: Fix issues with fragmentation of an existing message buffer
      tipc: Set name lookup scope field properly in all data messages
      tipc: Fix problem with bundled multicast message
      tipc: Update destination node field on incoming multicast messages
      tipc: Fix sk_buff leaks when link congestion is detected
      tipc: Strengthen checks for neighboring node discovery
      tipc: Abort excessive send requests as early as possible
      tipc: Avoid recomputation of outgoing message length
      tipc: Introduce routine to enqueue a chain of messages on link tx queue
      tipc: Enhance handling of discovery object creation failures
      tipc: Enhance sending of discovery object link request messages
      tipc: Add monitoring of number of nodes discovered by bearer
      tipc: Revise timings used when sending link request messages

Allan, Bruce W (2):
      ethtool: time to blink provided in seconds not jiffies
      ethtool: allow custom interval for physical identification

Amit Virdi (1):
      net/irda/ircomm_tty.c: Use flip buffers to deliver data

Amitkumar Karwar (13):
      mwifiex: return success in set_default_key for WPA/WPA2
      mwifiex: cleanup ioctl wait queue and abstraction layer
      mwifiex: remove unused function parameters
      mwifiex: remove some macro definitions
      mwifiex: optimize driver initialization code
      cfg80211: module_param to disable HT40 in 2.4GHz band
      mwifiex: check firmware capabilities while initialising 5GHz band parameters
      mwifiex: HT capability information handling
      mwifiex: fix bug in mwifiex_save_curr_bcn()
      mwifiex: fix simultaneous assoc and scan issue
      mwifiex: remove unnecessary struct mwifiex_opt_sleep_confirm_buffer
      mwifiex: remove redundant local structures
      mwifiex: remove mwifiex_recv_complete function

Andrei Emeltchenko (2):
      Bluetooth: check L2CAP info_rsp ident and state
      Bluetooth: delete hanging L2CAP channel

Andrew Lunn (1):
      batman-adv: Set the txqueuelen to zero when creating soft interface

Andy Ross (1):
      Bluetooth: Device ids for ath3k on Pegatron Lucid tablets

Anirban Chakraborty (9):
      qlcnic: Cleanup patch
      qlcnic: Code optimization patch
      qlcnic: Changes to VLAN code
      qlcnic: Remove unused code
      qlcnic: Update version number to 5.0.16
      ethtool: Added support for FW dump
      qlcnic: FW dump support
      qlcnic: Take FW dump via ethtool
      qlcnic: Bumped up version number to 5.0.18

Anton Blanchard (2):
      net: Add sendmmsg socket system call
      net: recvmmsg: Strip MSG_WAITFORONE when calling recvmsg

Antonio Ospite (1):
      rfkill: Regulator consumer driver for rfkill

Antonio Quartulli (4):
      batman-adv: orig_hash_find() manages rcu_lock/unlock internally
      batman-adv: Move definition of atomic_dec_not_zero() into main.h
      batman-adv: fix gw_node_update() and gw_election()
      batman-adv: rename everything from *hna* into *tt* (translation table)

Arik Nemtsov (18):
      wl12xx: 1281/1283 support - Use different FW file for AP mode wl127x/wl128x chips
      wl12xx: Clamp byte mode transfers for 128x chips
      wl12xx: configure channel/band while FW is off
      mac80211: allow low level drivers to report packet loss
      wl12xx: support FW TX inactivity triggers
      wl12xx: implement the tx_frames_pending mac80211 callback
      wl12xx: discard corrupted packets in RX
      wl12xx: add BT-coexistance for AP
      wl12xx: use wiphy values for setting rts, frag thresholds on init
      wl12xx: AP-mode - disable beacon filtering on start up
      wl12xx: schedule recovery on command timeout
      wl12xx: print firmware program counter during recovery
      wl12xx: AP-mode - overhaul rate policy configuration
      wl12xx: AP-mode - reconfigure templates after basic rates change
      wl12xx: add debugfs entry for starting recovery
      wl12xx: fix race condition during recovery in AP mode
      wl12xx: export driver state to debugfs
      mac80211: set TID of internal mgmt packets to 7

Ben Greear (2):
      wifi: Add hwflags to debugfs.
      ath5k: Fix lockup due to un-init spinlock.

Ben Hutchings (18):
      sfc: Move test of rx_checksum_enabled from nic.c to rx.c
      sfc: Enable all TSO features on VLANs
      sfc: Implement generic features interface
      ethtool: Convert struct ethtool_ops comment to kernel-doc format
      ethtool: Fill out and update comment for struct ethtool_ops
      ethtool: Change ETHTOOL_PHYS_ID implementation to allow dropping RTNL
      sfc: Implement ethtool_ops::set_phys_id instead of ethtool_ops::phys_id
      gianfar: Clean up implementation of RX network flow classification
      niu: Recognise original ethtool class code for AH/ESP flow hashing
      rndis_host: Poll status before control channel where necessary
      rndis_host: Quirky devices are still 'point-to-point'
      ipv6: Send unsolicited neighbour advertismements when notified
      vlan: Propagate NETDEV_NOTIFY_PEERS notifier
      bonding, ipv4, ipv6, vlan: Handle NETDEV_BONDING_FAILOVER like NETDEV_NOTIFY_PEERS
      ipv4, ipv6, bonding: Restore control over number of peer notifications
      sfc: Fix return value from efx_ethtool_set_rx_ntuple()
      sfc: Fix TX queue numbering when separate_tx_channels=1
      sfc: Use netif_device_{detach,attach}() around reset and self-test

Bing Zhao (10):
      wireless: mwifiex: initial commit for Marvell mwifiex driver
      mwifiex: remove macro SHORT_SLOT_TIME_DISABLED
      mwifiex: remove MWIFIEX_BSS_MODE_ macros
      ieee80211: add HT extended capabilities masks
      mwifiex: remove struct mwifiex_802_11_fixed_ies
      mwifiex: remove unused macros in decl.h and main.h
      mwifiex: fix cmd_skb headroom decreasing issue
      mwifiex: rename function mwifiex_is_ba_stream_avail
      mwifiex: fix missing tsf_val TLV
      mwifiex: cleanup ioctl.h

Brian Cavagnolo (5):
      mwl8k: refactor in preparation for APIv2 update
      mwl8k: update to ap firmware API version 2
      mwl8k: differentiate between WMM queues and AMPDU queues
      mwl8k: add internal API for managing AMPDU streams
      mwl8k: use traffic threshold to decide when to start ampdu

Bruce Allan (5):
      e1000e: convert short duration msleep() to usleep_range()
      e1000e: PCIe link speed in GT/s, not GB/s
      e1000e: If ASPM L0s needs to be disabled, do it prior to enabling device
      e1000e: implement ethtool set_phys_id
      e1000e: minor comment cleanups

Carolyn Wyborny (1):
      igb: Add check for invalid size to igb_get_invariants_82575()

Changli Gao (2):
      net: ping: make local functions static
      net: ping: fix the coding style

Chaoming Li (14):
      rtlwifi: rtl8192ce: Fix LED initialization
      rtlwifi: rtl8192se: Merge def.h
      rtlwifi: rtl8192se: Merge dynamic management routines
      rtlwifi: rtl8192se: Merge firmware routines
      rtlwifi: rtl8192se: Merge hardware routines
      rtlwifi: rtl8192se: Merge led routines
      rtlwifi: rtl8192se: Merge phy routines
      rtlwifi: rtl8192se: Merge register definitions
      rtlwifi: rtl8192se: Merge rf routines
      rtlwifi: rtl8192se: Merge main (sw) routines
      rtlwifi: rtl8192se: Merge table routines
      rtlwifi: rtl8192se: Merge TX and RX routines
      rtlwifi: rtl8192se: Modify Kconfig and Makefile routines for new driver
      rtlwifi: rtl8192se: Remove need to disable ASPM

Chaoming_Li (17):
      rtlwifi: Change efuse routines addition of RTL8192SE and RTL8192DE
      rtlwifi: Change wifi.h for rtl8192se and rtl8192de
      rtlwifi: Change base routines for addition of rtl8192se and rtl8192de
      rtlwifi: Change cam routines for addition of rtl8192se and rtl8192de
      rtlwifi: Convert core routines for addition of rtl8192se and rtl8192de
      rtlwifi: Convert pci routines for addition of rtl8192se and rtl8192de
      rtlwifi: Convert ps routines for addition of rtl8192se and rtl8192de
      rtlwifi: Convert rc routines for addition of rtl8192se and rtl8192de
      rtlwifi: Convert regulatory domain routines for addition of rtl8192se and rtl8192de
      rtlwifi: Convert usb routines for addition of rtl8192se and rtl8192de
      rtlwifi: rtl8192c-common: Convert common dynamic management routines for addition of rtl8192se and rtl8192de
      rtlwifi: rtl8192c-common: Change common firmware routines for addition of rtl8192se and rtl8192de
      rtlwifi: rtl8192c-common: Change common PHY routines for addition of rtl8192se and rtl8192de
      rtlwifi: rtl8192ce: Change hw routine for addition of rtl8192se and rtl8192de
      rtlwifi: rtl8192ce: Change sw and LED routines for addition of rtl8192se and rtl8192de
      rtlwifi: rtl8192ce: Change phy and rc routines for addition of rtl8192se and rtl8192de
      rtlwifi: rtl8192ce: Change rtl8192ce routines phy and trx and modify rtl8192cu for addition of rtl8192se and rtl8192de

Christian Lamparter (7):
      ar9170usb: purge obsolete driver
      p54: implement multicast filter
      carl9170: improve unicast PS buffering
      mac80211: fix too early reorder release timer
      mac80211: consolidate MIC failure report handling
      carl9170: fix -Wunused-but-set-variable warnings
      p54pci: fix -Wunused-but-set-variable warnings

Christoph Fritz (1):
      mwifiex: fix null derefs, mem leaks and trivia

Cindy H. Kao (1):
      iwlwifi: support the svtool messages interactions through nl80211 test mode

Dan Carpenter (1):
      iwlwifi: remove duplicate initialization in __iwl_down()

Daniel Drake (1):
      libertas: remove tx_timeout handler

Daniel Halperin (5):
      iwlwifi: limit number of attempts for highest HT rate
      iwlwifi: cleanup and bugfix tx aggregation code
      iwlwifi: add RATE_MCS_RATE_MSK
      iwlwifi: set default aggregation frame limit to 63
      mac80211: fix contention time computation in minstrel, minstrel_ht

Daniel Walter (2):
      ipv6: ignore looped-back NA while dad is running
      ipv6: RTA_PREFSRC support for ipv6 route source address selection

Daniele Furlan (1):
      batman-adv: remove duplicate code from function is_bidirectional_neigh()

David Decotigny (12):
      net-bonding: Fix minor sparse complaints
      net-bonding: Fix minor/cosmetic type inconsistencies
      net-bonding: Adding support for throughputs larger than 65536 Mbps
      bnx2x: cosmetics: Using ethtool_cmd_speed() API
      ethtool: cosmetics: enforce const-ness in ethtool_cmd_speed
      ethtool: Call ethtool's get/set_settings callbacks with cleaned data
      ethtool: Use full 32 bit speed range in ethtool's set_settings
      ethtool: cosmetic: Use ethtool ethtool_cmd_speed API
      acenic: Fix using the specified speed when configuring NIC
      tulip/de2104x: don't report different speeds depending on port type
      net/igb/e1000/e1000e: more robust ethtool duplex/speed configuration
      stmmac: don't go through ethtool to start auto-negotiation

David S. Miller (182):
      Merge branch 'master' of master.kernel.org:/.../davem/net-2.6
      net: Add helper flowi4_init_output().
      ipv4: Use flowi4_init_output() in net/route.h
      ipv4: Use flowi4_init_output() in inet_connection_sock.c
      ipv4: Use flowi4_init_output() in ip_send_reply()
      ipv4: Use flowi4_init_output() in raw_sendmsg()
      ipv4: Use flowi4_init_output() in cookie_v4_check()
      ipv4: Use flowi4_init_output() in udp_sendmsg()
      net: Order ports in same order as addresses in flow objects.
      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 'master' of master.kernel.org:/.../davem/net-2.6
      Merge branch 'master' of master.kernel.org:/.../davem/net-2.6
      niu: Fix warnings due to -Wunused-but-set-variable
      s2io: Fix warnings due to -Wunused-but-set-variable.
      9p: Kill set but unused variable in 9p_client_{read,write}() and p9_client_readdir()
      atm: iphase: Fix set-but-not-used warnings.
      Merge branch 'for-davem' of git://git.kernel.org/.../linville/wireless-next-2.6
      net: Missing 'inline' in vlan-disabled vlan_untag()
      ipv4: Call fib_select_default() only when actually necessary.
      atm: eni: Kill set-but-unused variables.
      atm: he: Fix undefined sequence points.
      atm: idt77252: Fix set-but-unused variables.
      atm: solos-pci: Fix set-but-unused variable.
      pktgen: Fix set-but-unused variable.
      decnet: Fix set-but-unused variable.
      econet: Fix set-but-unused variable.
      ax25: Fix set-but-unused variable.
      atm: lec: Fix set-but-unused variables.
      bonding: Fix set-but-unused variable.
      atlx: Fix set-but-unused variable.
      atl1e: Fix set-but-unused variable.
      atl1c: Fix set-but-unused variable.
      isdn: gigaset: Fix set-but-unused variable.
      isdn: eicon: Fix set-but-unused variables.
      isdn: hfcpci: Fix set-but-unused variables.
      isdn: hfcsusb: Fix set-but-unused variables.
      isdn: arcofi: Fix set-but-unused variables.
      isdn: elsa_cs: Fix set-but-unused variables.
      isdn: elsa_ser: Fix set-but-unused variables.
      isdn: hfc_usb: Fix set-but-unused variables.
      isdn: ipacx: Fix set-but-unused variables.
      isdn: jade: Fix set-but-unused variables.
      isdn: l3dss1: Fix set-but-unused variables.
      isdn: l3ni1: Fix set-but-unused variables.
      isdn: teles_cs: Fix set-but-unused variables.
      isdn: i4l: isdn_common: Fix set-but-unused variables.
      isdn: i4l: isdn_net: Fix set-but-unused variables.
      isdn: mISDN: socket: Fix set-but-unused variables.
      bna: Fix set-but-unused variables.
      bnx2x: Fix set-but-unused variables.
      caif: Fix set-but-unused variables.
      irda: irlap_event: Fix set-but-unused variables.
      irda: irproc: Fix set-but-unused variables.
      l2tp: Fix set-but-unused variables.
      netlabel: Fix set-but-unused variables.
      netfilter: nfnetlink_log: Fix set-but-unused variables.
      netfilter: nf_conntrack_standalone: Fix set-but-unused variables.
      netfilter: ip6_tables: Fix set-but-unused variables.
      netfilter: ip6table_mangle: Fix set-but-unused variables.
      isdn: i4l: isdn_tty: Fix unused-but-set variables.
      be2net: Fix unused-but-set variables.
      Merge branch 'batman-adv/next' of git://git.open-mesh.org/ecsv/linux-merge
      decnet: Don't leak entries when rebuilding zone.
      Merge branch 'master' of master.kernel.org:/.../davem/net-2.6
      Merge branch 'master' of git://git.kernel.org/.../kaber/nf-next-2.6
      mv643xx_eth: Fix build regression.
      net: Remove __KERNEL__ cpp checks from include/net
      Merge branch 'for-davem' of git://git.kernel.org/.../linville/wireless-next-2.6
      bluetooth: Fix use-before-initiailized var.
      Merge branch 'master' of master.kernel.org:/.../davem/net-2.6
      ipv4: Sanitize and simplify ip_route_{connect,newports}()
      ipv4: Remove erroneous check in igmpv3_newpack() and igmp_send_report().
      ipv4: Kill RTO_CONN.
      l2tp: Fix inet_opt conversion.
      net: Make dst_alloc() take more explicit initializations.
      net: Use non-zero allocations in dst_alloc().
      ipv4: Use caller's on-stack flowi as-is in output route lookups.
      ipv4: Remove now superfluous code in ip_route_connect().
      ipv4: Fetch route saddr from flow key in inet_sk_reselect_saddr().
      ipv4: Fetch route saddr from flow key in ip4_datagram_connect().
      ipv4: Fetch route saddr from flow key in tcp_v4_connect().
      ipv4: Fetch route saddr from flow key in l2tp_ip_connect().
      ipv4: Get route daddr from flow key in dccp_v4_connect().
      ipv4: Get route daddr from flow key in ip4_datagram_connect().
      ipv4: Get route daddr from flow key in inet_csk_route_req().
      ipv4: Get route daddr from flow key in tcp_v4_connect().
      ipv4: Get route daddr from flow key in l2tp_ip_connect().
      ipv4: Make sure flowi4->{saddr,daddr} are always set.
      Merge branch 'batman-adv/next' of git://git.open-mesh.org/ecsv/linux-merge
      ipv4: Rework ipmr_rt_fib_lookup() flow key initialization.
      ipv4: Renamt struct rtable's rt_tos to rt_key_tos.
      dccp: Use flowi4->saddr in dccp_v4_connect()
      ipv4: Make caller provide on-stack flow key to ip_route_output_ports().
      pptp: Use flowi4's daddr/saddr in pptp_xmit().
      libcxgbi: Use flowi4's saddr in cxgbi_check_route().
      ipv4: Use flowi4's {saddr,daddr} in igmpv3_newpack() and igmp_send_report()
      sctp: Use flowi4's {saddr,daddr} in sctp_v4_dst_saddr() and sctp_v4_get_dst()
      ipv4: Use flowi4->{daddr,saddr} in ipip_tunnel_xmit().
      ipv4: In ip_build_and_send_pkt() use 'saddr' and 'daddr' args passed in.
      ipv4: Pass explicit saddr/daddr args to ipmr_get_route().
      ipv4: Kill rt->rt_{src, dst} usage in IP GRE tunnels.
      ipv6: Use flowi4->{daddr,saddr} in ipip6_tunnel_xmit().
      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
      Merge branch 'master' of master.kernel.org:/.../davem/net-2.6
      hamachi: Delete TX checksumming code commented out since 1999
      inet: Decrease overhead of on-stack inet_cork.
      ipv4: Initialize on-stack cork more efficiently.
      ipv4: Initialize cork->opt using NULL not 0.
      hamachi: Put back RX_CHECKSUM
      Merge branch 'master' of master.kernel.org:/.../jkirsher/net-next-2.6
      dccp: Use cork flow in dccp_v4_connect()
      tcp: Use cork flow in tcp_v4_connect()
      l2tp: Fix locking in l2tp_ip.c
      l2tp: Fix locking in l2tp_core.c
      l2tp: Use cork flow in l2tp_ip_connect() and l2tp_ip_sendmsg()
      ipv4: Lock socket and use cork flow in ip4_datagram_connect().
      ipv4: Use cork flow in inet_sk_{reselect_saddr,rebuild_header}()
      ipv4: Use cork flow in ip_queue_xmit()
      sctp: Store a flowi in transports to provide persistent keying.
      ipv4: Create inet_csk_route_child_sock().
      ipv4: Use inet_csk_route_child_sock() in DCCP and TCP.
      inet: Pass flowi to ->queue_xmit().
      ipv4: Don't use rt->rt_{src,dst} in ip_queue_xmit().
      sctp: Don't use rt->rt_{src,dst} in sctp_v4_xmit()
      tcp: Use cork flow info instead of rt->rt_dst in tcp_v4_get_peer()
      Merge branch 'batman-adv/next' of git://git.open-mesh.org/ecsv/linux-merge
      udp: Use flow key information instead of rt->rt_{src,dst}
      ipv4: Pass flow keys down into datagram packet building engine.
      ipv4: Pass flow key down into ip_append_*().
      sctp: Fix debug message args.
      Merge branch 'davem-next.r8169' of git://git.kernel.org/.../romieu/netdev-2.6
      ipv4: Pass explicit daddr arg to ip_send_reply().
      ipv4: icmp: Eliminate remaining uses of rt->rt_src
      ipv4: udp: Eliminate remaining uses of rt->rt_src
      sctp: Remove rt->rt_src usage in sctp_v4_get_saddr()
      infiniband: Remove rt->rt_src usage in addr4_resolve()
      ipv4: xfrm: Eliminate ->rt_src reference in policy code.
      Merge branch 'tipc-May10-2011' of git://git.kernel.org/.../paulg/net-next-2.6
      Merge branch 'master' of master.kernel.org:/.../davem/net-3.6
      ipvs: Use IP_VS_RT_MODE_* instead of magic constants.
      ipvs: Eliminate rt->rt_dst usage in __ip_vs_get_out_rt().
      ipv4: Kill spurious opt->srr check in ip_options_rcv_srr().
      ipv4: Simplify iph->daddr overwrite in ip_options_rcv_srr().
      ipv4: Elide use of rt->rt_dst in ip_forward()
      Merge branch 'master' of master.kernel.org:/.../davem/net-next-2.6
      ipv4: Fix 'iph' use before set.
      ipv4: Kill spurious write to iph->daddr in ip_forward_options().
      ipv4: Always call ip_options_build() after rest of IP header is filled in.
      ipv4: Remove route key identity dependencies in ip_rt_get_source().
      ipv4: Remove rt->rt_dst reference from ip_forward_options().
      Merge branch 'batman-adv/next' of git://git.open-mesh.org/ecsv/linux-merge
      Merge branch 'master' of master.kernel.org:/.../jkirsher/net-next-2.6
      ipv4: Trivial rt->rt_src conversions in net/ipv4/route.c
      Merge branch 'for-davem' of git://git.kernel.org/.../linville/wireless-next-2.6
      bluetooth: Fix warnings in l2cap_core.c
      Merge branch 'master' of git://git.kernel.org/.../bwh/sfc-next-2.6
      Merge branch 'master' of git://git.kernel.org/.../kaber/nf-2.6
      ipv4: Don't use enums as bitmasks in ip_fragment.c
      Merge branch 'master' of master.kernel.org:/.../davem/net-2.6
      sfc: Don't use enums as a bitmask.
      ipv4: Kill RT_CACHE_DEBUG
      ipv4: Make caller provide flowi4 key to inet_csk_route_req().
      ipv4: Pass explicit destination address to rt_get_peer().
      ipv4: Pass explicit destination address to rt_bind_peer().
      Merge branch 'master' of master.kernel.org:/.../davem/net-2.6
      9p: Kill set but not used variable 'ret' in parse_opts()
      9p: Kill unused variable 'ret' in trans_rdma.c:parse_opts()
      isdn: capi: Use pr_debug() instead of ifdefs.
      pkt_sched: Kill set but unused variable 'protocol' in tc_classify()
      rxrpc: Kill set but unused variable 'sp' in rxrpc_rotate_tx_window()
      rxrpc: Kill set but unused variable 'sp' in rxrpc_process_connection()
      rxrpc: Kill set but unused variable 'local' in rxrpc_UDP_error_handler()
      rxrpc: Fix set but unused variable 'usage' in rxrpc_get_peer().
      atl1c: atl1c_resume() is only used when CONFIG_PM_SLEEP is defined.
      irda: Kill set but unused vars 'saddr' and 'daddr' in irlan_provider_connect_indication()
      be2net: Kill set but unused variable 'req' in lancer_fw_download()
      rxrpc: Fix set but unused variable 'usage' in rxrpc_get_transport()
      irda: Kill set but unused variable 'clen' in ircomm_connect_indication()
      irda: Kill set but unused variable 'bytes' in irlan_check_command_param()
      irda: Fix error propagation in ircomm_lmp_connect_response()

Dimitris Michailidis (2):
      cxgb4: drop phys_id interface and implement the newer set_phys_id
      cxgb4vf: drop phys_id interface and implement the newer set_phys_id

Dmitry Kravkov (8):
      bnx2x: Update firmware to 6.2.9
      bnx2x: don't write dcb/llfc fields in STORM memory
      bnx2x, cnic: Disable iSCSI if DCBX negotiation is successful
      bnx2x: allow WoL on every function in MF modes
      bnx2x: Do storage mac address validation for SF mode.
      bnx2x: improve memory handling, low memory recovery flows
      bnx2x: update year to 2011 and version to 1.62.12-0
      bnx2x: function descriptions format fixed

Don Fry (2):
      iwlagn: mod param cleanup
      iwlagn: semaphore and calib cleanup

Don Skidmore (7):
      ixgbe: cleanup short msleep's (<20ms) to use usleep_range
      ixgbe: enable SCTP checksum offload for X540
      ixgbe: Bump version
      ixgbe: fix X540 ethtool loopback test.
      ixgbe: fix typo error with software defined pins on 82599
      ixgbe: Cleanup PCIe bus speed info
      ixgbe: Add support for new 82599 adapter

Eliad Peller (15):
      wl12xx: set the actual tid instead of the ac
      wl12xx: rearrange some ELP wake_up/sleep calls
      wl12xx: sleep instead of wakeup after tx work
      wl12xx: avoid premature elp entrance
      wl12xx: print actual rx packet size (without padding)
      wl12xx: avoid redundant join on interface reconfiguration
      wl12xx: configure rates when working in ibss mode
      wl12xx: add debugfs entries for dtim_interval and beacon_interval
      wl12xx: simplify wl1271_ssid_set()
      wl12xx_sdio: set interrupt as wake_up interrupt
      wl12xx: declare suspend/resume callbacks (for wowlan)
      wl12xx_sdio: set MMC_PM_KEEP_POWER flag on suspend
      wl12xx: prevent scheduling while suspending (WoW enabled)
      wl12xx_sdio: declare support for NL80211_WOW_TRIGGER_ANYTHING trigger
      wl12xx: enter/exit psm on wowlan suspend/resume

Emil Tantilov (23):
      ixgbe: fix return value checks
      ixgbe: correct function number for some 82598 parts
      ixgbe: fix namespacecheck issue
      ixgbe: refactor common start_hw code for 82599 and x540
      ixgbe: move disabling of relaxed ordering in start_hw()
      ixgbe: fix 82599 KR downshift coexistence with LESM FW module
      ixgbe: fix semaphores in eeprom routines for x540
      ixgbe: add support for new HW
      ixgbe: explicitly disable 100H for x540
      ixgbe: make device_caps() generic
      ixgbe: explicitly disable 100H for x540
      ixgbe: register defines cleanup
      ixgbe: add support for 64k EEPROM for 82599
      ixgbe: add LED blink code for x540
      ixgbe: convert to ethtool set_phys_id
      e100: fix build warning
      ixgbe: Use function pointer for ixgbe_acquire/release_swfw_sync()
      ixgbe: fix sparse warning
      ixgbe: improve EEPROM read/write operations
      ixgbe: add rxhash support
      ixgbe: add ethtool counters for OS2BMC
      ixgbe: force unlock on timeout
      ixgbe: fix sparse warning

Eric Dumazet (23):
      fib: add __rcu annotations
      xen: netfront: fix declaration order
      netfilter: get rid of atomic ops in fast path
      netfilter: fix ebtables compat support
      inet: constify ip headers and in6_addr
      net: filter: Just In Time compiler for x86-64
      inet: add RCU protection to inet->opt
      bpf: depends on MODULES
      net: dont hold rtnl mutex during netlink dump callbacks
      net: use batched device unregister in veth and macvlan
      garp: remove one synchronize_rcu() call
      vlan: remove one synchronize_net() call
      net: fix two lockdep splats
      l2tp: fix potential rcu race
      garp: remove last synchronize_rcu() call
      net: ping: small changes
      net: ping: dont call udp_ioctl()
      ipv4: more compliant RFC 3168 support
      net: use hlist_del_rcu() in dev_change_name()
      net: add skb_dst_force() in sock_queue_err_skb()
      ipv6: reduce per device ICMP mib sizes
      macvlan: remove one synchronize_rcu() call
      macvlan: fix panic if lowerdev in a bond

Fabrice Deyber (1):
      mac80211: Only process mesh PREPs with equal seq number if metric is better.

Felix Fietkau (48):
      ath9k: remove unnecessary debugfs return code checks
      ath9k: add an interface for overriding the value of specific GPIO pins
      ath9k: add support for overriding the MAC address through platform data
      ath9k: add support for overriding LED pin and GPIO settings from platform data
      ath9k_hw: enable a BlockAck related fixup specific to AR9100
      ath9k_hw: force rx chainmask to 7 on AR9100
      ath9k: remove the pending frames ath_txq_schedule workaround
      ath9k: fix beacon timer handling issues
      ath9k: trigger nfcal only after multiple missed beacons in AP mode
      ath9k: fix stuck beacon detection
      ath9k_hw: embed the ath_ops callbacks in the ath_hw struct
      ath9k_hw: add a new register op for read-mask-write
      ath9k_hw: replace REG_READ+REG_WRITE with REG_RMW
      ath9k_hw: turn a few big macros into functions
      ath9k_hw: remove pCap->total_queues
      ath9k_hw: remove ah->config.ht_enable
      ath9k_hw: remove pCap->reg_cap
      ath9k_hw: remove pCap->keycache_size
      ath9k_hw: remove ATH9K_HW_CAP_ENHANCEDPM
      ath9k_hw: remove pCap->tx_triglevel_max
      mac80211: fix suppressing probe responses in ad-hoc mode
      mac80211: remove the dependency on crypto_blkcipher
      ath9k: fix beacon slot processing in ad-hoc mode
      ath9k: use the hw opmode to select the beacon timer mode
      ath9k: fix PS-Poll reception on AR9160 and earlier
      ath9k: fix too early enabling of rx during ath_startrecv()
      ath9k_hw: remove unnecessary parts of the AR9380 SREV check
      ath5k: fix tx status reporting issues
      ath5k: fix short preamble rate duration value
      ath5k: fix SIFS time handling
      ath5k: fix slot time handling
      ath5k: optimize tx descriptor setup
      ath5k: remove ts_rate from ath5k_tx_status
      ath5k: optimize tx status processing
      ath5k: optimize rx status processing
      ath5k: remove ts_retry from ath5k_tx_status
      ath5k: clean up debugfs code
      ath5k: reduce interrupt load caused by rx/tx interrupts
      mac80211: receive EAP frames from a station in an AP VLAN on the main AP
      ath5k: disable 5 GHz support if a 2.4 GHz radio is detected
      ath: unshare struct ath_bus_ops between ath5k and ath9k
      ath5k: add a new bus op for reading the mac address
      ath5k: fix the EEPROM check for hw AES crypto support
      ath5k: disable 5 GHz support for the dualband PHY chip on dual-radio AR5312
      mac80211: add a function for setting the TIM bit for a specific station
      ath9k: fix powersave frame filtering/buffering in AP mode
      ath9k: assign keycache slots to unencrypted stations
      ath9k: fix a regression in PS frame filter handling

Flavio Leitner (1):
      e1000e: fix stats locking in e1000_watchdog_task

Florian Westphal (1):
      netfilter: ebtables: only call xt_compat_add_offset once per rule

Franco Fichtner (1):
      ethtool: bring back missing comma in netdev features strings

Francois Romieu (10):
      r8169: TSO fixes.
      r8169: fix merge conflict fix.
      r8169: style cleanups.
      r8169: remove some code duplication.
      r8169: rtl8169_set_speed_xmii cleanup.
      r8169: link speed selection timer rework.
      r8169: remove non-NAPI context invocation of rtl8169_rx_interrupt.
      r8169: provide some firmware information via ethtool.
      r8169: merge firmware information into the chipset description data.
      r8169: avoid late chip identifier initialisation.

Frank Blaschka (3):
      qeth: convert to hw_features part 2
      qeth: add OSA concurrent hardware trap
      qeth: use ndo_set_features callback for initial setup and recovery

Gabor Juhos (1):
      ath9k: introduce ATH9K_{PCI,AHB} config options

Garen Tamrazian (1):
      iwlagn: fix radar frame rejection

Gertjan van Wingerde (10):
      rt2x00: Linksys WUSB600N rev2 is a RT3572 device.
      rt2x00: Allow dynamic addition of PCI/USB IDs.
      rt2x00: Add USB IDs.
      rt2x00: RT33xx device support is no longer experimental.
      rt2x00: Enable support for RT53xx PCI devices by default.
      rt2x00: Merge rt2x00ht.c contents in other files.
      rt2x00: Streamline rt2800 eeprom initialisations.
      rt2x00: Introduce capability flag for Bluetooth co-existence.
      rt2x00: Initial support for RT5370 USB devices.
      rt2x00: Fix rmmod hang of rt2800pci

Giuseppe CAVALLARO (2):
      stmmac: removed not used definitions
      stmmac: fix autoneg in set_pauseparam

Giuseppe Cavallaro (1):
      stmmac: review Wol and enable the Unicast support

Greg Rose (3):
      igb: Add anti-spoofing feature documentation
      ixgbevf: Add macvlan support in the set rx mode op
      ixgbe: Add macvlan support for VF

Gustavo F. Padovan (51):
      Bluetooth: remove unnecessary function declaration
      Bluetooth: Remove unused struct item
      Bluetooth: Improve error message on wrong link type
      Bluetooth: Remove unused struct l2cap_conn item
      Bluetooth: Move bt_accept_enqueue() to outside __l2cap_chan_add
      Bluetooth: Fix HCI_RESET command synchronization
      Merge branch 'master' of git://git.kernel.org/.../padovan/bluetooth-2.6
      Bluetooth: Remove gfp_mask param from hci_reassembly()
      Bluetooth: Don't use spin_lock_bh in user context
      Bluetooth: Use GFP_KERNEL in user context
      Bluetooth: Create struct l2cap_chan
      Bluetooth: Use struct list_head for L2CAP channels list
      Bluetooth: Remove struct del_list
      Bluetooth: Move ident to struct l2cap_chan
      Bluetooth: Move conf_{req,rsp} stuff to struct l2cap_chan
      Bluetooth: clean up l2cap_sock_recvmsg()
      Bluetooth: Move conn_state to struct l2cap_chan
      Bluetooth: Move of ERTM *_seq vars to struct l2cap_chan
      Bluetooth: Move more ERTM stuff to struct l2cap_chan
      Bluetooth: Move SDU related vars to struct l2cap_chan
      Bluetooth: Move remote info to struct l2cap_chan
      Bluetooth: Move ERTM timers to struct l2cap_chan
      Bluetooth: Move srej and busy queues to struct l2cap_chan
      Bluetooth: Move busy workqueue to struct l2cap_chan
      Bluetooth: Fix lockdep warning with skb list lock
      Bluetooth: Move SREJ list to struct l2cap_chan
      Bluetooth: Remove some sk references from l2cap_core.c
      Bluetooth: Remove unneeded uninitialized_vars()
      Bluetooth: Move tx queue to struct l2cap_chan
      Bluetooth: Fix wrong comparison in listen()
      Bluetooth: Clean up ath3k_load_firmware()
      Bluetooth: Add proper handling of received LE data
      Bluetooth: Check return value of hci_recv_stream_fragment()
      Bluetooth: Don't lock sock inside l2cap_get_sock_by_scid()
      Bluetooth: Fix another locking unbalance
      Bluetooth: Fix lockdep warning in L2CAP
      Merge master.kernel.org:/.../padovan/bluetooth-2.6
      Bluetooth: Refactor L2CAP channel allocation
      Bluetooth: Move conf_state to struct l2cap_chan
      Bluetooth: Rename l2cap_do_connect() to l2cap_chan_connect()
      Bluetooth: Move some more elements to struct l2cap_chan
      Bluetooth: Move more vars to struct l2cap_chan
      Bluetooth: Move more channel info to struct l2cap_chan
      Bluetooth: Move more vars to struct l2cap_chan
      Bluetooth: Move conn to struct l2cap_chan
      Bluetooth: Fix memory leak with L2CAP channels
      Bluetooth: Don't export l2cap_sock_ops
      Bluetooth: Add l2cap_add_psm() and l2cap_add_scid()
      Bluetooth: Handle psm == 0 case inside l2cap_add_psm()
      Bluetooth: Remove l2cap_sk_list
      Bluetooth: Remove leftover debug messages

Hans Schillstrom (2):
      IPVS: Change of socket usage to enable name space exit.
      IPVS: init and cleanup restructuring

Harvey Harrison (1):
      via-rhine: trivial sparse annotation in vlan_tci helper

Hauke Mehrtens (1):
      wl12xx: do not set queue_mapping directly

Heiko Carstens (2):
      claw: remove unused return code handling
      lcs: get rid of compile warning

Helmut Schaa (20):
      mac80211: Minor optimization in tx status handling
      rt2x00: Limit rt2x00pci rxdone processing to 16 entries at once
      rt2x00: Limit rt2800pci txdone processing to 16 entries at once
      rt2x00: Calculate tx status fifo size instead of hardcoding it
      rt2x00: Remove DRIVER_SUPPORT_WATCHDOG flag
      rt2x00: Restructure bw_comp calculation
      rt2x00: Don't recalculate HT40 compensation for each rate
      rt2x00: Indention cleanup in rt2800lib
      rt2x00: Remove obsolete rt2x00queue_align_payload
      rt2x00: Implement tx power temperature compensation
      rt2x00: Fix STBC transmissions to STAs with Rx STBC > 1
      rt2x00: Fix tx aggregation problems with some clients
      rt2x00: Add an error message when trying to send on a full queue
      rt2x00: Fix stuck queue in tx failure case
      rt2x00: Make rt2x00_queue_entry_for_each more flexible
      rt2x00: Use correct TBTT_SYNC config in AP mode
      rt2x00: Update TX_SW_CFG2 init value
      rt2x00: Use TXOP_HTTXOP for beacons
      rt2x00: Always inline rt2x00pci_enable_interrupt
      rt2x00: Optimize register access in rt2800pci

Ian Campbell (3):
      xen: netfront: assume all hw features are available until backend connection setup
      Signed bit field; int have_hotplug_status_watch:1
      xen: netback: use __CONST_RING_SIZE not __RING_SIZE

Ido Yariv (8):
      wl12xx: Clean up and fix the 128x boot sequence
      wl12xx: Clean up the block size alignment code
      wl12xx: Clean up the dummy packet mechanism
      wl12xx: Simplify TX blocks accounting
      wl12xx: Handle platforms without level trigger interrupts
      wl12xx: Modify memory configuration for 128x/AP
      wl12xx: Restart TX when TX descriptors are available
      wl12xx: Enable dynamic memory for 127x

Ivo van Doorn (11):
      rt2x00: Add support for the ZyXEL NWD-211AN USB
      rt2x00: Split rt2x00dev->flags
      rt2x00: Decrease association time for USB devices
      rt2x00: Optimize register access in rt2800usb
      rt2x00: Implement get_ringparam callback function
      rt2x00: Implement get_antenna and set_antenna callback functions
      rt2x00: Reduce tx status reading timeout
      rt2x00: Optimize TX_STA_FIFO register reading
      rt2x00: Fix optimize register access for rt2800pci
      rt2x00: Add autowake support for USB hardware
      rt2x00: Fix transfer speed regression for USB hardware

Jacek Luczak (1):
      SCTP: fix race between sctp_bind_addr_free() and sctp_bind_addr_conflict()

Jan Engelhardt (1):
      mISDN: fix "persistant" typo

Jan Kiszka (1):
      capi: Perform scheduled capifs removal

Jarkko Nikula (2):
      wl1251: Prepare for idle mode support
      wl1251: Add support for idle mode

Javier Cardona (21):
      nl80211: rename NL80211_MESH_SETUP_VENDOR_PATH_SEL_IE
      cfg80211/nl80211: Add userspace authentication flag to mesh setup
      mac80211: ignore peers if security is enabled for this mesh
      nl80211/mac80211: let userspace authenticate stations
      mac80211: Let user space receive and send mesh auth/deauth frames
      mac80211: ignore peer link requests from unauthenticated stations.
      nl80211/mac80211: Perform PLINK_ACTION on new station
      nl80211: New notification to discover mesh peer candidates.
      mac80211: send notification on new peer candidate for our secure mesh
      nl80211: Introduce NL80211_MESH_SETUP_USERSPACE_AMPE
      mac80211: Let userspace send action frames over mesh interfaces
      mac80211: Drop MESH_PLINK category and use new ANA-approved MESH_ACTION
      open80211s: Stop using zero for address 3 in mesh plink mgmt frames
      cfg80211: Use capability info to detect mesh beacons.
      nl80211: Let userspace drive the peer link management states.
      mac80211: Check size of a new mesh path table for changes since allocation.
      mac80211: Fix locking bug on mesh path table access
      mac80211: Move call to mpp_path_lookup inside RCU-read section
      mac80211: allow setting supported rates on mesh peers
      ath9k: fix beaconing for mesh interfaces
      nl80211: Move peer link state definition to nl80211

Javier Martinez Canillas (1):
      drivers/net: Remove IRQF_SAMPLE_RANDOM flag from network drivers

Jeff Kirsher (6):
      e1000e: convert to new VLAN model
      ixgbe: update version string for Dell CEM use
      ixgb: convert to set_phys_id
      e100: implemenet set_phys_id
      e1000: convert to set_phys_id
      igb: convert to ethtool set_phys_id

Jiejing Zhang (1):
      Bluetooth: hci_uart: check the return value of recv()

Jiri Pirko (3):
      net: vlan: make non-hw-accel rx path similar to hw-accel
      bonding: move processing of recv handlers into handle_frame()
      net: call dev_alloc_name from register_netdevice

Joe Perches (14):
      smsc911x: Use pr_fmt, netdev_<level>, and netif_<level>
      via_rhine: Use netdev_<level> and pr_<level>
      via-rhine: Assign random MAC address if necessary
      tg3: Convert u32 flag,flg2,flg3 uses to bitmap
      tulip: xircom_cb: Convert #ifdef DEBUG blocks and enter/leave uses
      tulip: Convert printks to netdev_<level>
      tulip: Convert uses of KERN_DEBUG
      tulip: Use pr_<level> where appropriate
      rtlwifi: rtl8192cu: Fix memset/memcpy using sizeof(ptr) not sizeof(*ptr)
      libertas: Convert lbs_pr_<level> to pr_<level>
      libertas: Use netdev_<level> or dev_<level> where possible
      sctp: sctp_sendmsg: Don't initialize default_sinfo
      sctp: sctp_sendmsg: Don't test known non-null sinfo
      netdevice.h: Align struct net_device members

Johan Hedberg (21):
      Bluetooth: Add define for the maximum name length on HCI level
      Bluetooth: mgmt: Add local name information to read_info reply
      Bluetooth: mgmt: Add support for setting the local name
      Bluetooth: Add local Extended Inquiry Response (EIR) support
      Bluetooth: Fix missing hci_dev_lock_bh in user_confirm_reply
      Bluetooth: Add mgmt_device_found event
      Bluetooth: Add mgmt_remote_name event
      Bluetooth: Add basic discovery commands to the management interface
      Bluetooth: Add discovering event to the Management interface
      Bluetooth: Add automated SSP user confirmation responses
      Bluetooth: Add variable SSP auto-accept delay support
      Bluetooth: Fix HCI_CONN_AUTH_PEND flag for all authentication requests
      Bluetooth: Add confirm_hint parameter to user confirmation requests
      Bluetooth: Fix reason code for pairing rejection
      Bluetooth: Fix logic in hci_pin_code_request_evt
      Bluetooth: Fix link key persistent storage criteria
      Bluetooth: Fix old_key_type logic for non-persistent keys
      Bluetooth: Fix connection key type updating for buggy controllers
      Bluetooth: Remove old_key_type from mgmt_ev_new_key
      Bluetooth: Add store_hint parameter to mgmt_new_key
      Bluetooth: Fix updating conn->auth_type in hci_io_capa_request_evt

Johannes Berg (68):
      iwlagn: clean up TX aggregation code
      iwlagn: fix aggregation queue scheduler setup
      mac80211: add comment about reordering
      mac80211: clean up station cleanup timer
      iwlagn: remove unused variable
      iwlagn: clean up some 3945/4965 remnants
      iwlagn: make mac80211 handlers static
      iwlagn: clean up ucode loading
      iwlagn: remove pointless return variables
      iwlagn: simplify ucode check code
      iwlagn: verify specific ucode
      iwlagn: remove bootstrap code
      iwlagn: centralize and fix ucode restart
      iwlagn: remove ucode_data_backup
      iwlagn: add feature flags
      iwlagn: fix ucode verify message
      iwlagn: clean up alive handling
      iwlagn: init cmd_queue earlier
      iwlagn: remove BSM clock setting
      iwlagn: remove hw_wa_rev
      iwlagn: remove hw_rev
      iwlagn: remove rev_id
      iwlagn: remove rxb page bookkeeping
      iwlagn: remove ISR ops
      iwlagn: move IO functions out of line
      iwlwifi: fix bugs in change_interface
      iwlagn: clean up & autodetect statistics
      iwlagn: downgrade warning on unknown TLV
      iwlagn: remove most BUG_ON instances
      iwlagn: verify that huge commands are synchronous
      iwlagn: use huge command for beacon
      mac80211: explain padding in place of rate field
      iwlagn: simplify error table reading
      iwlagn: clean up some exit code
      iwlagn: refactor down path
      iwlagn: refactor up path
      iwlagn: extend notification wait function
      iwlagn: make iwlagn_wait_notification return error code
      iwlagn: leave notification waits on firmware errors
      iwlagn: implement synchronous firmware load
      iwlagn: combine firmware code/data
      iwlagn: remove hw_ready variable
      mac80211: tear down BA sessions properly on suspend
      iwlagn: avoid hangs when restarting device
      iwlagn: introduce silent grabbing of NIC access
      iwlagn: refactor restart
      iwlagn: use proper good CRC threshold behaviour
      iwlagn: remove spectrum measurement header
      iwlagn: improve RXON checking
      iwlagn: prefer BSS context
      nl80211/cfg80211: WoWLAN support
      mac80211: add basic support for WoWLAN
      iwlagn: remove get_hcmd_size indirection
      iwlagn: remove frame pre-allocation
      iwlagn: remove unused variable
      iwlagn: dont update bytecount table for command queue
      iwlagn: remove bytecount indirection
      iwlagn: check DMA mapping errors
      iwlagn: fix iwl_is_any_associated
      cfg80211: restrict AP beacon intervals
      mac80211: remove pointless mesh path timer RCU code
      mac80211: make key locking clearer
      mac80211: fix another key non-race
      mac80211: fix a few RCU issues
      mac80211: mesh: move some code to make it static
      cfg80211: advertise possible interface combinations
      mac80211: fix TX a-MPDU locking
      mac80211: sparse RCU annotations

Johannes Stezenbach (4):
      rt2800usb: read TX_STA_FIFO asynchronously
      rt2x00: fix queue timeout checks
      rt2800usb: handle TX status timeouts
      rt2800usb: add timer to handle TX_STA_FIFO

John Fastabend (4):
      ixgbe: DCB, further cleanups to app configuration
      ixgbe: DCB, misallocated packet buffer size with X540 device
      ixgbe: DCB, X540 devices do not respond to pause frames
      ixgbe: fix static functions

John W. Linville (26):
      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 '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
      ath5k: improve pcal error handling for ENOMEM case
      ath5k: improve comments for optimized tx descriptor setup
      ath9k: avoid using trinary operator w/ TX_STAT_INC
      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 'master' of git://git.kernel.org/.../linville/wireless-next-2.6 into for-davem
      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
      Merge branch 'master' of git://git.kernel.org/.../linville/wireless-2.6
      mwl8k: replace rateinfo bitfields with mask and shift macros
      ath5k: fix uninitialized var warning for txf2txs
      b43: avoid uninitialized variable warnings in phy_n
      mwifiex: fix copy-n-paste 'thinko' for tsf_val
      p54: avoid uninitialized variable warning for freq
      Merge branch 'master' of git://git.kernel.org/.../padovan/bluetooth-next-2.6
      Merge branch 'master' of git://git.kernel.org/.../linville/wireless-next-2.6 into for-davem
      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
      Merge branch 'master' of git://git.kernel.org/.../padovan/bluetooth-next-2.6
      ssb: fix pcicore build breakage
      Merge branch 'for-linville' of git://git.kernel.org/.../luca/wl12xx
      Merge branch 'master' of git://git.kernel.org/.../linville/wireless-next-2.6 into for-davem

Jon Mason (3):
      vxge: always enable hardware time stamp
      vxge: spin-lock issue
      vxge: update driver version

Jouni Malinen (4):
      ath9k: Support RSN IBSS
      cfg80211: Add nl80211 event for deletion of a station entry
      nl80211: Fix set_key regression with some drivers
      cfg80211: Remove unused wiphy flag

Jozsef Kadlecsik (1):
      netfilter: ipset: SCTP, UDPLITE support added

Julia Lawall (2):
      drivers/isdn/hisax: Drop unused list
      net/rfkill/core.c: Avoid leaving freed data in a list

Julian Anastasov (1):
      ipvs: Remove all remaining references to rt->rt_{src,dst}

Jussi Kivilinna (1):
      zd1211rw: rename CR* macros to ZD_CR*

Juuso Oikarinen (3):
      wl12xx: Fix potential incorrect band in rx-status
      wl12xx: Add mutex protection for interface list
      wl12xx: Handle duplicate calling of remove interface

KOSAKI Motohiro (2):
      convert old cpumask API into new one
      net: convert to new cpumask API

Kevin Gan (1):
      Bluetooth: btmrvl: support Marvell Bluetooth device SD8787

Kurt Van Dijck (2):
      can: make struct can_proto const
      can: rename can_try_module_get to can_get_proto

Larry Finger (7):
      rtlwifi: rtl8192c{e,u}: Remove some extraneous casts on memcpy commands
      rtlwifi: Remove unused/unneeded variables
      rtlwifi: Fix unitialized variable warnings
      rtlwifi: rtl8192ce: rtl8192cu: Fix most sparse warnings
      rtlwifi: Fix typo in pci.c
      mac80211: Fix build error when CONFIG_PM is not defined
      rtlwifi: Move 2 large arrays off stack

Layne Edwards (1):
      rt2x00: Enable WLAN LED on Ralink SoC (rt305x) devices

Linus Lüssing (5):
      batman-adv: Move bonding / iface alternating router search to own functions
      batman-adv: Make gateway_get_selected type safe
      batman-adv: Simplify gw_check_election(), use gw_get_selected()
      batman-adv: Make orig_node->router an rcu protected pointer
      batman-adv: Protect global TQ window with a spinlock

Luciano Coelho (27):
      wl12xx: add new board_tcxo_clock element to the platform data
      wl12xx: 1281/1283 support - add block size handling for sdio and spi
      wl12xx: use 1 spare TX block instead of two
      wl12xx: set the skbuff priority for dummy packets
      wl12xx: fix SG BT load value to reflect its new meaning
      wl12xx: fix a couple of sparse warnings about undeclared functions
      wl12xx: use a bitmask instead of list of booleans in scanned_ch
      wl12xx: use kstrtoul functions
      wl12xx: move hardcoded hci_io_ds value into the conf struct
      wl12xx: remove unused conf_radio_params structure
      wl12xx: fix sparse warning about undeclared wl12xx_alloc_dummy_packet
      wl12xx: strict_stroul introduced converted to kstrtoul
      Revert "wl12xx: support FW TX inactivity triggers"
      mac80211: don't drop frames where skb->len < 24 in ieee80211_scan_rx()
      mac80211: add a couple of trace event classes to reduce duplicated code
      cfg80211/nl80211: add support for scheduled scans
      mac80211: add support for HW scheduled scan
      cfg80211/nl80211: add interval attribute for scheduled scans
      cfg80211/mac80211: avoid bounce back mac->cfg->mac on sched_scan_stopped
      wl12xx: add configuration values for scheduled scan
      wl12xx: listen to scheduled scan events
      wl12xx: add scheduled scan structures and commands
      wl12xx: implement scheduled scan driver operations and reporting
      wl12xx: export scheduled scan state in debugfs
      wl12xx: prevent sched_scan when not idle or not in station mode
      wl12xx: remove unused flag WL1271_FLAG_IDLE_REQUESTED
      wl12xx: fix compilation error when CONFIG_PM is not set

Luis R. Rodriguez (7):
      ath9k_hw: remove AR9485 1.0 support
      cfg80211: fix regulatory restore upon user hints
      cfg80211: add a timer for invalid user reg hints
      ath: fix 0x6C for beaconing/passive scan flags based on country IE
      cfg80211: fix regresion on reg user timeout
      ath9k_hw: fix power for the HT40 duplicate frames
      ath9k_hw: fix dual band assumption for XB113

Mahesh Bandewar (3):
      net: Allow ethtool to set interface in loopback mode.
      tg3: Allow ethtool to enable/disable loopback.
      bnx2x: Allow ethtool to enable/disable loopback.

Mammatha Edhala (1):
      be2net: Enable SR-IOV for Lancer

Marc Yang (6):
      mwifiex: remove unnecessary _set_auth functions
      mwifiex: use IEEE80211_HT_CAP_ macros for 11n cap_info
      mwifiex: remove MWIFIEX_AUTH_MODE_ macros
      mwifiex: remove unused radio_on variable and macros
      mwifiex: remove unused macros in fw.h
      mwifiex: cleanup power save related struct and macros

Marc-Antoine Perennou (1):
      Bluetooth: add support for Apple MacBook Pro 8,2

Marek Lindner (6):
      batman-adv: concentrate all curr_gw related rcu operations in select/deselect functions
      batman-adv: Make bat_priv->primary_if an rcu protected pointer
      batman-adv: remove misplaced comment
      batman-adv: multi vlan support for bridge loop detection
      batman-adv: Fix refcount imbalance in find_router
      batman-adv: reset broadcast flood protection on error

Mark Brown (1):
      net: dm9000: Fix build

Mark Davis (1):
      rt2800usb: Add seven new USB IDs

Mathieu J. Poirier (1):
      net: allow shifted access in smsc911x V2

Matt Carlson (44):
      tg3: Cleanup extended rx ring size code
      tg3: 5717_PLUS => 57765_PLUS
      tg3: Reintroduce 5717_PLUS
      tg3: Add 5720 ASIC rev
      tg3: Add 5720 NVRAM decoding
      tg3: Add 5720 H2BMC support
      tg3: Add 5720 PHY ID
      tg3: Enable 5720 support
      tg3: Support 4mb flash sizes for 5717 and 5719
      tg3: Provide full regdump on tx timeout
      tg3: Dump registers when status block shows errors
      tg3: Automatically size stat/test string arrays
      tg3: Add jumbo frame loopback tests to selftest
      tg3: Add support for extended VPD blocks
      tg3: Workaround rx_discards stat bug
      tg3: Adjust rx prod ring bd replenish thresholds
      tg3: Nullify RSS for loopback test
      tg3: Only allow phy ioctls while netif_running
      tg3: Move phy accessor functions higher
      tg3: Add read accessor for AUX CTRL phy reg
      tg3: Add write accessor for AUX CTRL phy reg
      tg3: Add macro for SMDSP toggling
      tg3: Add additional EEE messaging
      tg3: Fix int generation hw bug for 5719 / 5720
      tg3: Organize loopback test failure flags
      tg3: Add TSO loopback test
      tg3: Add EEH support
      tg3: Whitespace cleanups
      tg3: Update version to 3.118
      tg3: Set tx bug flags for more devices
      tg3: Cleanup transmit error path
      tg3: Fix 57765 B0 data corruption
      tg3: Fix IPv6 TCP problems for 5719
      tg3: Fix EEE interoperability workaround
      tg3: Consolidate autoneg advertisement setup code
      tg3: Fix TSO loopback test
      tg3: Fix stats for 5704 and later devices
      tg3: Move TSO_CAPABLE assignment
      tg3: Consolidate all netdev feature assignments
      tg3: Remove excessive parenthesis
      tg3: Apply rx_discards fix to 5719/5720
      tg3: Update version to 3.119
      tg3: Fix NETIF_F_LOOPBACK error
      tg3: Add braces around 5906 workaround.

Micha Nelissen (1):
      ipconfig wait for carrier

Michael Chan (1):
      cnic: Fix rtnl deadlock

Michael S. Tsirkin (1):
      net: Change netdev_fix_features messages loglevel

Michael Smith (2):
      fib_validate_source(): pass sk_buff instead of mark
      Disable rp_filter for IPsec packets

Michal Marek (2):
      rt2x00: Drop __TIME__ usage
      tipc: Drop __TIME__ usage

Michał Mirosław (74):
      virtio_net: convert to hw_features
      net: convert SMSC USB net drivers to hw_features
      net: convert xen-netfront to hw_features
      jme: convert offload constraints to ndo_fix_features
      veth: convert to hw_features
      net: convert sunhme/sungem network drivers to hw_features
      net: Call netdev_features_change() from netdev_update_features()
      vlan: convert VLAN devices to use ndo_fix_features()
      net: netxen: convert to hw_features
      skge: convert to hw_features
      net: benet: convert to hw_features
      net: enic: convert to hw_features
      net: tg3: convert to hw_features
      net: atl*: convert to hw_features
      net: Remove invalid offloads
      net: benet: convert to hw_features - fixup
      net: r8169: convert to hw_features
      net: 8139cp: convert to hw_features
      net: stmmac: convert to hw_features
      net: ksz884x: convert to hw_features
      net: via-velocity: convert to hw_features
      net: bnx2: convert to hw_features
      net: add RTNL_ASSERT in __netdev_update_features()
      net: sky2: convert to hw_features
      net: ps3_gelic: convert to hw_features
      net: bna: convert to hw_features
      net: bnx2x: convert to hw_features
      net: ioc3: convert to hw_features
      net: vlan_features comment clarification
      net: spider_net: convert to hw_features
      net: dm9000: convert to hw_features
      net: forcedeth: convert to hw_features
      net: mlx4: convert to hw_features
      net: gianfar: convert to hw_features
      net: macvlan: convert to hw_features
      net: cxgb3: convert to hw_features
      net: tehuti: convert to hw_features
      net: mv643xx: convert to hw_features
      net: typhoon: convert to hw_features
      net: benet: convert to hw_features - fixup
      net: ehea: convert to hw_features
      net: niu: convert to hw_features
      net: greth: convert to hw_features
      net: ibm_newemac: convert to hw_features
      net: cxgb4{,vf}: convert to hw_features
      net: myri10ge: convert to hw_features
      net: fix section mismatches
      net: s2io: convert to hw_features
      net: chelsio: convert to hw_features
      net: vxge: convert to hw_features
      net: vmxnet3: convert to hw_features
      net: qlge: convert to hw_features
      net: dsa: remove ethtool_ops->set_sg
      net: batman-adv: remove rx_csum ethtool_ops
      Staging: convert hv network driver to hw_features
      net: infiniband/hw/nes: convert to hw_features
      net: s390: convert to hw_features
      net: infiniband/ulp/ipoib: convert to hw_features
      net: pch_gbe: convert to hw_features
      net: ibmveth: convert to hw_features
      net: qlcnic: convert to hw_features
      net: xen-netback: convert to hw_features
      net: tun: convert to hw_features
      net: fix hw_features ethtool_ops->set_flags compatibility
      net: make WARN_ON in dev_disable_lro() useful
      net: fix netdev_increment_features()
      bridge: convert br_features_recompute() to ndo_fix_features
      net: allow user to change NETIF_F_HIGHDMA
      net: ibmveth: force reconfiguring checksum settings on startup
      net: bonding: factor out rlock(bond->lock) in xmit path
      net: Fix vlan_features propagation
      net: introduce netdev_change_features()
      bonding: convert to ndo_fix_features
      net: ethtool: fix IPV6 checksum feature name string

Mohammed Shafi Shajakhan (20):
      ath9k: cleanup few redundant macros
      ath9k: remove set11n_virtualmorefrag
      ath9k_hw: remove ath9k_get_channel_edges
      mac80211: remove few obsolete flags
      {mac|nl}80211: Add station connected time
      ath9k: remove the unlikely check for autosleep
      ath9k: Add TSFOOR interrupt stats in debug info
      mac80211: Fix a warning due to skipping tailroom reservation for IV
      ath9k_hw: remove aggregation protection mode
      ath9k_hw: remove get_channel_noise function
      ath9k_hw: make antenna diversity modules chip specific
      ath9k_hw: enable Antenna diversity for AR9485
      ath9k_hw: define registers/macros to support Antenna diversity
      ath9k_hw: config diversity based on eeprom contents
      ath9k_hw: define modules to get/set Antenna diversity paramaters
      ath9k_hw: define antenna diversity group
      ath9k: Implement an API to swap main/ALT LNA's
      ath9k: configure fast_div_bias based on diversity group
      ath9k: make sure main_rssi is positive
      ath9k: make npending frames check as bool

Nicolas Cavallari (1):
      carl9170: fix allmulticast mode

Nishant Sarmukadam (9):
      mwl8k: add support for block ack commands
      mwl8k: Initiate BA sessions
      mwl8k: Handle the watchdog event from the firmware
      mwl8k: Check outgoing rate for a station to decide if ampdu can be created
      mwl8k: Queue ADDBA requests in respective data queues
      mwl8k: Do not configure tx power unconditionally
      mwl8k: interrupt handling changes
      mwl8k: Reserve buffers for tx management frames
      mwl8k: Enable life time expiry for tx packets in the hardware

Ohad Ben-Cohen (3):
      wl12xx: update bet_max_consecutive
      wl12xx: fix roaming
      wl12xx: fix "JOIN while associated" commentary

Oliver Hartkopp (1):
      can: convert protocol handling to RCU

Pablo Neira Ayuso (1):
      netfilter: ctnetlink: fix timestamp support for new conntracks

Padmanabh Ratnakar (5):
      be2net: Handle error completion in Lancer
      be2net: Disable coalesce water mark mode of CQ for Lancer
      be2net: In case of UE, do not dump registers for Lancer
      be2net: Use NTWK_RX_FILTER command for promiscous mode
      be2net: Fix to prevent flooding of TX queue

Patrick McHardy (2):
      netfilter: nf_ct_sip: validate Content-Length in TCP SIP messages
      netfilter: nf_ct_sip: fix SDP parsing in TCP SIP messages for some Cisco phones

Paul Bolle (1):
      iwl4965: drop a lone pr_err()

Paul Gortmaker (1):
      tipc: make zone/cluster mask constants a define

Paul Stewart (1):
      nl80211: Add BSS parameters to station

Peter Pan(潘卫平) (1):
      net:set valid name before calling ndo_init()

Pradeep Nemavat (2):
      mwl8k: Do not stop tx queues
      mwl8k: Add timestamp information for tx packets

Rafał Miłecki (28):
      ssb: trivial: use u8 for chip_rev (it's mask is 0xF)
      ssb: pci: trivial: drop useless pointer
      ssb: pci: fix mdio writes on newer cores (rev 10+)
      ssb: pci: implement mdio reading
      ssb: pci: implement serdes workaround
      ssb: pci: trivial: correct amount of maximum retries
      ssb: cc: use correct min_msk for 0x4312
      ssb: cc: add & fix defines
      ssb: cc: clear GPIOPULL registers on init
      ssb: mark bus as powered up earlier
      ssb: update reject bit for Target State Low
      ssb: pci: separate workarounds
      ssb: pci: update PCIe workarounds
      ssb: pci: early fix for SPROM core index
      ssb: cc: prepare clockmode support for cores rev 10+
      b43: drop invalid IMCFGLO workaround
      b43legacy: drop invalid IMCFGLO workaround
      b43: drop ssb-duplicated workaround for dangling cores
      b43legacy: drop ssb-duplicated workaround for dangling cores
      b43: trivial: include ssb word in ssb specific functions
      bcma: add Broadcom specific AMBA bus driver
      ssb: update list of devices supporting multiple 80211 cores
      b43legacy: trivial: use TMSLOW def instead of magic value
      b43: move MAC PHY clock controling function
      bcma: add missing GPIO defines, use PULL register only when available
      ssb: move ssb_commit_settings and export it
      b43: implement timeouts workaround
      bcma: pci: trivial: correct amount of maximum retries

Rajesh Borundia (1):
      qlcnic: Fix LRO disable

Rajkumar Manoharan (32):
      ath9k_htc: Fix LED pin for AR9287 HTC device
      ath9k_hw: Fix throughput drops in HT40 mode for AR9287 chips
      ath: Speedup key set/reset ops for HTC driver
      ath9k_hw: Speedup register ops for HTC driver
      ath9k: deny new interface addtion on IBSS mode
      ath9k: Cleanup ath_vif struct
      ath9k: Handle BSSID/AID for multiple interfaces
      ath9k: configure beacons based on hw opmode
      ath9k_hw: Fix instable target power control b/w CCK/OFDM
      ath9k: Fix kernel panic on module unload
      ath9k_hw: Remove unused code in AR9287 eeprom
      ath9k_hw: update Ar9003 intervals to fix carrier leak
      ath9k_hw: update AR9003 low_ob_db_tx_gain to improve spur performance
      ath9k: Fix improper beacon slot selection in IBSS
      ath9k_htc: Add debugfs support to change debug mask
      ath9k_htc: Cleanup HTC debugfs
      ath9k_htc: Fix free slot value for cab queue
      ath9k: Fix beacon generation on foreign channel
      ath9k_hw: Fix Tx IQ Calibration hang issue in AR9003 chips
      ath9k: set beacon related ps flags on bss_info change
      mac80211: Fix warnings due to -Wunused-but-set-variable
      ath9k: Fix drain txq failure in flush
      mac80211: use wake_queue to restart trasmit
      mac80211: Postpond ps timer if tx is stopped by others
      ath9k_hw: do noise floor calibration only on required chains
      wireless: Fix warnings due to -Wunused-but-set-variable
      ath9k: avoid enabling interrupts while processing rx
      ath9k: process TSF out of range before RX
      ath9k_hw: Corrected xpabiaslevel register settings for AR9340
      ath9k_hw: Change DCU backoff thresh for AR9340
      ath9k: Fix rssi update in ad-hoc mode
      ath9k: Failed to set default beacon rssi in AP/IBSS mode

Ralf Baechle (1):
      NET: AX.25, NETROM, ROSE: Remove SOCK_DEBUG calls

Randy Dunlap (4):
      mac80211: fix debugfs printk format warning
      libertas: use kernel-doc notation, fix comment style
      x86/net: only select BPF_JIT when NET is enabled
      networking: NET_CLS_ROUTE4 depends on INET

Rob Landley (1):
      net: minor cleanup to net_namespace.c.

Roopa Prabhu (4):
      enic: Add support for new fw devcmds for port profile handling
      enic: Add wrapper routines for new fw devcmds for port profile handling
      enic: Cleanups in port profile helper code
      enic: Add support for PORT_REQUEST_PREASSOCIATE_RR

Rémi Denis-Courmont (1):
      Phonet: convert bound sockets hash list to RCU

Sascha Silbe (1):
      libertas: Add libertas_disablemesh module parameter to disable mesh interface

Sathya Perla (7):
      be2net: refactor code that decides adapter->num_rx_queues
      be2net: parse vid and vtm fields of rx-compl only if vlanf bit is set
      be2net: remove redundant code in be_worker()
      be2net: cancel be_worker in be_shutdown() even when i/f is down
      be2net: remove one useless line
      be2net: handle signal reception while waiting for POST
      be2net: fix mbox polling for signal reception

Sebastian Ott (1):
      qeth: add owner to ccw driver

Selvin Xavier (1):
      be2net: Stats for Lancer

Senthil Balasubramanian (9):
      ath9k: Add RSSI information from control and extension chains
      ath9k: Update gain table for AR9485
      ath: Add a missing world regulatory domain 0x6C
      ath9k: Fix LED gpio for AR93xx chipsets.
      ath9k_hw: Fix incorrect baseband PLL phase shift for AR9485
      ath9k: optimize the usage of power save wrappers.
      ath9k: cleanup hw pll work handler
      ath9k: Add power save wrappers and modularize hw_pll handler
      ath9k_hw: Fix STA connection issues with AR9380 (XB113).

Sergei Shtylyov (1):
      iwlegacy: use pci_dev->revision

Shahar Levi (17):
      wl12xx: 1281/1283 support - move IRQ polarity
      wl12xx: 1281/1283 support - Add Definitions
      wl12xx: 1281/1283 support - Add acx commands
      wl12xx: 1281/1283 support - New radio structs and functions
      wl12xx: 1281/1283 support - Loading FW & NVS
      wl12xx: 1281/1283 support - New boot sequence
      wl12xx: 1281/1283 support - use dynamic memory for the RX/TX pools
      wl12xx: 1281/1283 support - Improve Tx & Rx path
      wl12xx: 1281/1283 support - Add dummy packet support
      wl12xx: 1281/1283 support - enable chip support
      wl12xx: Add support for 11n Rx STBC one spatial stream
      wl12xx: Set End-of-transaction Flag at Wl127x AP Mode
      wl12xx: Set correct REF CLK and TCXO CLK values to the FW
      wl12xx: FM WLAN coexistence
      wl12xx: Update Power Save Exit Retries Packets
      wl12xx: Don't filter beacons that include changed HT IEs
      wl12xx: add IEEE80211_HW_SPECTRUM_MGMT bit to the hw flags

Shan Wei (13):
      net: forcedeth: fix compile warning of not used nv_set_tso function
      net:bna: fix compile warning of ‘bfa_ioc_smem_pgoff’ defined but not used
      sctp: delete unused macro definition of sctp_chunk_is_control
      sctp: fix the comment of sctp_sf_violation_paramlen()
      sctp: use common head of addr parameter to access member in addr-unrelated code
      sctp: kill abandoned SCTP_CMD_TRANSMIT command
      sctp: use memdup_user to copy data from userspace
      sctp: check parameter value of length in ERROR chunk
      sctp: check invalid value of length parameter in error cause
      sctp: remove redundant check when walking through a list of TLV parameters
      sctp: handle ootb packet in chunk order as defined
      net:use help function of skb_checksum_start_offset to calculate offset
      net: drivers: kill two unused macro definitions

Shmulik Ravid (1):
      bnx2x: add support for retrieving dcb peer configuration

Shreyas Bhatewara (1):
      vmxnet3: Use single tx queue when CONFIG_PCI_MSI not defined

Shripad Nunjundarao (1):
      be2net: FW download for Lancer

Simon Horman (1):
      IPVS: combine consecutive #ifdef CONFIG_PROC_FS blocks

Simon Wunderlich (1):
      batman-adv: protect softif_neigh by rcu

Sjur Brændeland (2):
      caif: Don't resend if dev_queue_xmit fails.
      caif: Add BUG_ON if dev_info is missing in packet

Somnath Kotur (2):
      be2net: Support for FAT dump retrieval using ethtool --register-dump option
      be2net: Fixed a bug in be_cmd_get_regs().

Sony Chacko (3):
      qlcnic: Make PCI info available in all modes
      qlcnic: Memory leak fix
      qlcnic: Support for GBE port settings

Sritej Velaga (1):
      qlcnic: Use flt method to determine flash fw region

Stanislaw Gruszka (16):
      iwlegacy: MAINTAINERS
      iwlwifi: fix enqueue hcmd race conditions
      iwlwifi: more priv->mutex serialization
      iwlwifi: remove sync_cmd_mutex
      iwlwifi: fix possible data overwrite in hcmd callback
      iwlagn: fix tx power initialization
      iwlegacy: remove duplicate initialization in iwl4956_down()
      iwlegacy: enable only rfkill interrupt when device is down
      iwlegacy: simplify init geos
      iwlegacy: remove unneeded disable_hw_scan check
      iwlegacy: remove unneeded __packed
      iwlegacy: remove scan_tx_antennas
      iwlegacy: comment typo fix diable -> disable
      iwlegacy: fix enqueue hcmd race conditions
      iwlegacy: more priv->mutex serialization
      iwlegacy: remove sync_cmd_mutex

Stefan Assmann (2):
      igb: fix typo in igb_validate_nvm_checksum_82580
      igb: introduce igb_thermal_sensor_event for sensor checking

Stephen Boyd (2):
      iwlegacy: Silence DEBUG_STRICT_USER_COPY_CHECKS=y warning
      iwlwifi: Silence DEBUG_STRICT_USER_COPY_CHECKS=y warning

Stephen Hemminger (3):
      caif: code cleanup
      bridge: fix accidental creation of sysfs directory
      ethtool: remove phys_id from ethtool_ops

Sucheta Chakraborty (2):
      qlcnic: fix memory leak in qlcnic_blink_led.
      qlcnic: support rcv ring configuration through ethtool

Sujith Manoharan (53):
      ath9k_htc: Remove AR7010 v1.0 support
      ath9k_htc: Rename firmware
      ath9k_htc: Add a WMI command to get the firmware version
      ath9k_htc: Fix WMI and beacon header
      ath9k_htc: Add beacon slots
      ath9k_htc: Add TSF adjust capability
      ath9k_htc: Configure the beacon queue
      ath9k_htc: Handle buffered frames in AP mode
      ath9k_htc: Fix beacon miss under heavy load
      ath9k_htc: Queue WMI events
      ath9k_htc: Move debug code to a separate file
      ath9k_htc: Add RX error statistics
      ath9k_htc: Fix RX length check
      ath9k_htc: Remove unused WMI commands
      ath9k_htc: Use SKB's private area for TX parameters
      ath9k_htc: Sync struct ath9k_htc_target_sta with FW
      ath9k_htc: Sync struct ath9k_htc_target_vif with FW
      ath9k_htc: Sync struct ath9k_htc_cap_target with FW
      ath9k_htc: Remove unused WMI_WLAN_TXCOMP_EVENTID
      ath9k_htc: Move TX specific stuff to a separate structure
      ath9k_htc: Reduce TX queue size
      ath9k_htc: Sync MGMT/DATA packet headers with firmware
      ath9k_htc: Add a new WMI event WMI_TXSTATUS_EVENTID
      ath9k_htc: Increase URB count for REG_IN pipe
      ath9k_htc: Fix TX queue management
      ath9k_htc: Introduce new HTC API
      ath9k_htc: Move endpoint header parsing to TX tasklet
      ath9k_htc: Add TX slots
      ath9k_htc: Use helper functions for TX processing
      ath9k_htc: Drain pending TX frames properly
      ath9k_htc: Optimize HTC start/stop API
      ath9k_htc: Drain packets on station removal
      ath9k_htc: Add support for TX completion
      ath9k_htc: Add a debugfs file to dump TX slot information
      ath9k_htc: Add a debugfs file showing endpoint status
      ath9k_htc: Add a timer to cleanup WMI events
      ath9k_htc: Use separate URB pool for management frames
      ath9k_htc: Use helper routines for transmission
      ath9k_htc: Add detailed firmware statistics
      ath9k_htc: Enable AP and P2P modes
      ath9k: Fix warnings from -Wunused-but-set-variable
      ath9k_htc: Fix AMPDU subframe handling
      ath9k_htc: Fix max A-MPDU size handling
      ath9k_htc: Use power save wrappers when accessing HW
      ath9k_htc: Remove unused macros and structures
      mac80211: Add new API for rate selection
      ath9k_htc: Increase credit size for AR7010 devices
      ath9k_htc: Remove unused WMI_AGGR_LIMIT_CMD
      ath9k_htc: Add a new WMI command to set a rate mask
      ath9k_htc: Add set_bitrate_mask() callback
      ath9k_htc: Dump base eeprom header for UB91/94/95
      ath9k_htc: Dump modal eeprom header for UB91/94/95
      ath9k_htc: Revamp LED management

Suraj Sumangala (1):
      Bluetooth: Increment unacked_frames count only the first transmit

Sven Eckelmann (4):
      batman-adv: Remove unnecessary hardif_list_lock
      batman-adv: Avoid deadlock between rtnl_lock and s_active
      batman-adv: Remove multiline comments from line ending
      batman-adv: Add missing hardif_free_ref in forw_packet_free

Szymon Janc (16):
      Bluetooth: Opencode macros in bnep/core.c
      Bluetooth: Fix checkpatch errors and some code style issues in bnep
      Bluetooth: Use #include <linux/uaccess.h> instead of <asm/uaccess.h>
      Bluetooth: Fix checkpatch errors, code style issues and typos in hidp
      Bluetooth: Do not use assignments in IF conditions
      Bluetooth: Use #include <linux/uaccess.h> instead of <asm/uaccess.h>
      Bluetooth: Fix checkpatch error in cmtp.h
      Bluetooth: Rename cmd to param in pending_cmd
      Bluetooth: Allow for NULL data in mgmt_pending_add
      Bluetooth: Add read_local_oob_data management command
      Bluetooth: Add add/remove_remote_oob_data management commands
      Bluetooth: Enable support for out of band association model
      Bluetooth: Use kthread API in hidp
      Bluetooth: Use kthread API in bnep
      Bluetooth: Use kthread API in cmtp
      Bluetooth: Fix Out Of Band pairing when mgmt interface is disabled

Thiago Farina (1):
      drivers/net/usb/usbnet.c: Use FIELD_SIZEOF macro in usbnet_init() function.

Thomas Gleixner (1):
      Bluetooth: Fix warning with hci_cmd_timer

Thomas Pedersen (3):
      nl80211: allow installing keys for a meshif
      nl80211: allow setting MFP flag for a meshif
      mac80211: Self-protected management frames are not robust

Tom Herbert (1):
      net: Allow no-cache copy from user on transmit

Ursula Braun (3):
      ctcm: get rid of compile warning
      iucv: get rid of compile warning
      af_iucv: get rid of compile warning

Vasanthakumar Thiagarajan (27):
      ath9k_hw: Use appropriate rx gain table for AR9485
      ath9k: Implement integer mode for AR9485
      ath9k: Register id table for platform device
      ath9k_hw: Define devid and mac version for AR9340
      ath9k_hw: Take care of few host interface register changes for AR9340
      ath9k_hw: Get AHB clock information from ath9k_platform_data
      ath9k_hw: Configure pll control register accordingly for AR9340
      ath9k_hw: Add initvals.h for ar9340
      ath9k_hw: Initialize mode registers from initvals.h for AR9340
      ath9k_hw: Don't do ani initialization for AR9340
      ath9k_hw: Initialize tx and rx gain table from initvals.h for ar9340
      ath9k_hw: Read spur frequency information from eeprom for AR9340
      ath9k_hw: Configure RF channel freqency for AR9340
      ath9k_hw: Clean up rx/tx chain configuration before AGC/IQ cal
      ath9k_hw: Fix register offset AR_PHY_65NM_CH0_THERM for AR9340
      ath9k_hw: Don't configure AR_CH0_THERM for AR9340
      ath9k_hw: Skip internal regulator configuration for AR9340
      ath9k_hw: Configure tuning capacitance value for AR9340 as well
      ath9k_hw: Enable byte Tx/Rx data swap for AR9340
      ath9k_hw: Configure chain switch table and attenuation control only for active chains
      ath9k_hw: Read iq calibration data only for active chains
      ath9k: Add AR9340 platform id to id table
      ath9k_hw: Assign macversion based on devid for built-in wmac
      ath9k_hw: Disable INTR_HOST1_FATAL to avoid interrupt strom with ar9430
      ath9k_hw: Enable AR9340 support
      ath9k: Fix bug in configuring hw timer
      ath9k: Fix warning: symbol 'ath9k_platform_id_table' was not declared. Should it be static?

Vasiliy Kulikov (2):
      net: ipv4: add IPPROTO_ICMP socket kind
      net: ping: fix build failure

Vasily Khoruzhick (1):
      libertas_spi: Add support for suspend/resume

Vinicius Costa Gomes (3):
      Bluetooth: Fix sending LE data over USB
      Bluetooth: Add support for sending connection events for LE links
      Bluetooth: Add support for disconnecting LE links via mgmt

Viresh KUMAR (1):
      net/stmmac: Move "#include <linux/platform_device.h>" to linux/stmmac.h

Vivek Natarajan (6):
      mac80211: Check for queued frames before entering power save.
      ath9k: Implement dev_tx_frames_pending callback.
      ath9k_hw: Move bt_stomp to hw from common.
      ath9k_hw: Add support for btcoexistence in AR9300.
      ath9k_hw: Enable generic timer interrupt.
      ath9k: Use ps wrappers for btcoex logic.

Vlad Yasevich (9):
      sctp: teach CACC algorithm about removed transports
      sctp: Allow bindx_del to accept 0 port
      sctp: Release all routes when processing acks ADD_IP or DEL_IP
      sctp: remove completely unsed EMPTY state
      sctp: bail from sctp_endpoint_lookup_assoc() if not bound
      sctp: cache the ipv6 source after route lookup
      sctp: make sctp over IPv6 work with IPsec
      sctp: remove useless arguments from get_saddr() call
      sctp: clean up route lookup calls

Vladislav Zolotarov (1):
      bnx2x: link report improvements

Waldemar Rymarkiewicz (7):
      Bluetooth: Add definitions for link key types
      Bluetooth: Don't modify sec_level if auth failed
      Bluetooth: Map sec_level to link key requirements
      Bluetooth: Ignore key unauthenticated for high security
      Bluetooth: Respect local MITM req in io_cap reply
      Bluetooth: Add secure flag for mgmt_pin_code_req
      Bluetooth: Double check sec req for pre 2.1 device

Wei Yongjun (7):
      net: fix skb_add_data_nocache() to calc csum correctly
      sctp: fix to check the source address of COOKIE-ECHO chunk
      sctp: make heartbeat information in sctp_make_heartbeat()
      sctp: move chunk from retransmit queue to abandoned list
      sctp: implement socket option SCTP_GET_ASSOC_ID_LIST
      sctp: change auth event type name to SCTP_AUTHENTICATION_EVENT
      sctp: implement event notification SCTP_SENDER_DRY_EVENT

Weixing Shi (1):
      sctp: fix sctp to work with ipv6 source address routing

Wey-Yi Guy (34):
      iwlegacy: MAINTAINERS
      iwlagn: use 6030 configuration for 6035 series
      iwlwifi: remove legacy isr tasklet
      iwlagn: remove 3945 only station code
      iwlagn: remove reference to 3945 and 4965
      iwlagn: remove deprecated module parameters
      iwlagn: remove more 3945/4965 related defines
      iwlagn: return send calibration result
      iwlagn: change Copyright to 2011
      iwlagn: check more error return code
      iwlagn: remove un-necessary function pointer
      iwlagn: PAPD read for 2000 series devices
      iwlagn: no 3945 define needed
      iwlagn: remove unused 3945 define
      iwlagn: cleanup to remove the reference for 3945
      iwlagn: remove more reference to legacy devices
      iwlagn: remove un-needed configuration
      iwlagn: more cleanup to remove unused reference
      iwlagn: all _agn devices support power save mode
      iwlagn: tx power calib always done in firmware
      iwlagn: sensitivity and chain noise done by driver
      iwlagn: use direct call for led functions
      iwlagn: always support uCode trace
      iwlagn: temperature should be measure for all _agn devices
      iwlagn: no 5.2GHz/HT40 support for bgn devices
      iwlagn: remove un-necessary ieee80211_ops
      iwlagn: remove legacy ops
      iwlagn: remove led_ops
      iwlagn: make rxon_assoc static function
      iwlagn: remove 5000 from rxon_assoc structure
      iwlagn: connect and disconnect sequence for RXON
      iwlagn: new 105 series device
      iwlagn: remove un-necessary debugfs callback
      iwlagn: led stay solid on when no traffic

Xose Vazquez Perez (1):
      wireless: rt2x00: rt{2500,73}usb.c fix duplicate ids

Yaniv Rosner (1):
      ethtool: Add 20G bit definitions

Yi Zou (2):
      ixgbe: do not clear FCoE DDP error status for received ABTS
      net: group FCoE related feature flags

Yogesh Ashok Powar (14):
      mwifiex: remove helper functions for displaying 11n capabilities
      mwifiex: remove redundant encryption_mode mapping
      mwifiex: use common keyinfo bitmap for different key types
      mwl8k: Fix checkpatch.pl and sparse warnings and errors
      mwifiex: remove redundant "return" at end of void function
      mwifiex: remove redundant local variables and comments
      mac80211: Skip tailroom reservation for full HW-crypto devices
      mwl8k: Reducing extra_tx_headroom for tx optimization in AP mode
      mwifiex: remove unnecessary variable initialization
      mwl8k: Fix broken WEP
      mwl8k: Do not ask mac80211 to generate IV for crypto keys
      mac80211: Fix mesh-related build breakage...
      cfg80211: make stripping of 802.11 header optional from AMSDU
      mwifiex: use ieee80211_amsdu_to_8023s routine

amit salecha (2):
      net: ethtool support to configure number of channels
      pktgen: create num frags requested

cozybit Inc (1):
      mac80211: Allocate new mesh path and portal tables before taking locks

hayeswang (3):
      net/r8169: add a new chip for RTL8105
      net/r8169: add a new chip for RTL8168DP
      net/r8169: support RTL8168E

roel (2):
      ath9k_hw: index out of bounds
      ath9k: index out of bounds

root (1):
      iwlwifi: remove extranious macro from firmware define

simon (3):
      usb: plusb: Whitespace
      usb: plusb: Add support for PL-25A1
      usb: plusb: Add debug to reset function

sjur.brandeland@stericsson.com (10):
      caif: Use rcu_read_lock in CAIF mux layer.
      caif: Use RCU instead of spin-lock in caif_dev.c
      caif: Use RCU and lists in cfcnfg.c for managing caif link layers
      caif: Add ref-count to framing layer
      caif: Move refcount from service layer to sock and dev.
      caif: Protected in-flight packets using dev or sock refcont.
      caif: prepare support for namespaces
      caif: Handle dev_queue_xmit errors.
      caif: Bugfix debugfs directory name must be unique.
      caif: remove unesesarry exports

stephen hemminger (25):
      pkt_sched: QFQ - quick fair queue scheduler
      bridge: change arguments to fdb_create
      bridge: track last used time in forwarding table
      bridge: split rcu and no-rcu cases of fdb lookup
      bridge: add netlink notification on forward entry changes
      bridge: allow creating/deleting fdb entries via netlink
      bridge: allow creating bridge devices with netlink
      bridge: range check STP parameters
      sky2: support ethtool set_phys_id
      skge: implement set_phys_id
      tg3: implement ethtool set_phys_id
      cxgb3: implement set_phys_id
      vxge: convert to set_phys_id
      bnx2: convert to set_phys_id
      bnx2x: convert to set_phys_id
      benet: convert to set_phys_id
      pcnet32: convert to set_phys_id
      niu: convert to new ethtool set_phys_id
      s2io: convert to set_phys_id (v2)
      qlcnic: convert to set_phys_id
      ewrk3: convert to set_phys_id
      qlge: use ethtool set_phys_id
      sfc: make function tables const
      qlge: make nic_operations struct const
      igbvf: remove bogus phys_id

 Documentation/ABI/testing/sysfs-bus-bcma           |   31 +
 Documentation/feature-removal-schedule.txt         |   21 -
 Documentation/networking/batman-adv.txt            |   11 +-
 Documentation/networking/bonding.txt               |   34 +-
 Documentation/networking/igb.txt                   |   13 +
 Documentation/sysctl/net.txt                       |   11 +
 MAINTAINERS                                        |   21 +-
 arch/mips/txx9/generic/setup_tx4939.c              |   21 +-
 arch/powerpc/include/asm/systbl.h                  |    1 +
 arch/powerpc/include/asm/unistd.h                  |    3 +-
 arch/sparc/include/asm/unistd.h                    |    3 +-
 arch/sparc/kernel/systbls_32.S                     |    2 +-
 arch/sparc/kernel/systbls_64.S                     |    4 +-
 arch/x86/Kbuild                                    |    1 +
 arch/x86/Kconfig                                   |    1 +
 arch/x86/ia32/ia32entry.S                          |    1 +
 arch/x86/include/asm/unistd_32.h                   |    3 +-
 arch/x86/include/asm/unistd_64.h                   |    2 +
 arch/x86/kernel/syscall_table_32.S                 |    1 +
 arch/x86/net/Makefile                              |    4 +
 arch/x86/net/bpf_jit.S                             |  140 +
 arch/x86/net/bpf_jit_comp.c                        |  654 +
 drivers/Kconfig                                    |    2 +
 drivers/Makefile                                   |    1 +
 drivers/atm/eni.c                                  |    5 -
 drivers/atm/he.c                                   |    4 +-
 drivers/atm/idt77252.c                             |   52 +-
 drivers/atm/iphase.c                               |   14 +-
 drivers/atm/solos-pci.c                            |    3 +-
 drivers/bcma/Kconfig                               |   33 +
 drivers/bcma/Makefile                              |    7 +
 drivers/bcma/README                                |   19 +
 drivers/bcma/TODO                                  |    3 +
 drivers/bcma/bcma_private.h                        |   28 +
 drivers/bcma/core.c                                |   51 +
 drivers/bcma/driver_chipcommon.c                   |   89 +
 drivers/bcma/driver_chipcommon_pmu.c               |  134 +
 drivers/bcma/driver_pci.c                          |  163 +
 drivers/bcma/host_pci.c                            |  196 +
 drivers/bcma/main.c                                |  247 +
 drivers/bcma/scan.c                                |  360 +
 drivers/bcma/scan.h                                |   56 +
 drivers/bluetooth/Kconfig                          |    4 +-
 drivers/bluetooth/ath3k.c                          |    4 +-
 drivers/bluetooth/btmrvl_sdio.c                    |  124 +-
 drivers/bluetooth/btmrvl_sdio.h                    |   68 +-
 drivers/bluetooth/btusb.c                          |    1 +
 drivers/bluetooth/hci_ath.c                        |    7 +-
 drivers/bluetooth/hci_h4.c                         |    7 +-
 drivers/bluetooth/hci_ldisc.c                      |    6 +-
 drivers/ieee802154/fakehard.c                      |   10 -
 drivers/infiniband/core/addr.c                     |    9 +-
 drivers/infiniband/hw/cxgb3/iwch_cm.c              |    3 +-
 drivers/infiniband/hw/cxgb4/cm.c                   |    3 +-
 drivers/infiniband/hw/nes/nes_hw.c                 |    5 +-
 drivers/infiniband/hw/nes/nes_hw.h                 |    1 -
 drivers/infiniband/hw/nes/nes_nic.c                |   59 +-
 drivers/infiniband/ulp/ipoib/ipoib.h               |    1 -
 drivers/infiniband/ulp/ipoib/ipoib_cm.c            |   11 +-
 drivers/infiniband/ulp/ipoib/ipoib_ethtool.c       |   28 -
 drivers/infiniband/ulp/ipoib/ipoib_ib.c            |    2 +-
 drivers/infiniband/ulp/ipoib/ipoib_main.c          |   24 +-
 drivers/isdn/capi/Kconfig                          |   15 -
 drivers/isdn/capi/Makefile                         |    1 -
 drivers/isdn/capi/capi.c                           |  139 +-
 drivers/isdn/capi/capifs.c                         |  239 -
 drivers/isdn/capi/capifs.h                         |   28 -
 drivers/isdn/gigaset/bas-gigaset.c                 |    5 -
 drivers/isdn/gigaset/ev-layer.c                    |   26 +-
 drivers/isdn/hardware/eicon/debug.c                |    3 +-
 drivers/isdn/hardware/eicon/message.c              |   23 +-
 drivers/isdn/hardware/mISDN/hfcpci.c               |    6 +-
 drivers/isdn/hardware/mISDN/hfcsusb.c              |    5 +-
 drivers/isdn/hisax/arcofi.c                        |    4 +-
 drivers/isdn/hisax/elsa_cs.c                       |    2 -
 drivers/isdn/hisax/elsa_ser.c                      |    3 +-
 drivers/isdn/hisax/hfc_usb.c                       |    6 +-
 drivers/isdn/hisax/ipacx.c                         |    4 +-
 drivers/isdn/hisax/jade.c                          |    3 +-
 drivers/isdn/hisax/l3dss1.c                        |    4 +-
 drivers/isdn/hisax/l3ni1.c                         |    4 +-
 drivers/isdn/hisax/st5481.h                        |    1 -
 drivers/isdn/hisax/st5481_init.c                   |    6 +-
 drivers/isdn/hisax/teles_cs.c                      |    2 -
 drivers/isdn/hysdn/hysdn_proclog.c                 |   11 +-
 drivers/isdn/i4l/isdn_common.c                     |   11 +-
 drivers/isdn/i4l/isdn_net.c                        |    2 -
 drivers/isdn/i4l/isdn_tty.c                        |    2 -
 drivers/isdn/mISDN/layer2.c                        |   20 +-
 drivers/isdn/mISDN/socket.c                        |    3 +
 drivers/net/3c509.c                                |   16 +-
 drivers/net/3c59x.c                                |    4 +-
 drivers/net/8139cp.c                               |   46 +-
 drivers/net/acenic.c                               |   12 +-
 drivers/net/arm/etherh.c                           |    5 +-
 drivers/net/arm/ks8695net.c                        |    7 +-
 drivers/net/atl1c/atl1c_ethtool.c                  |   17 +-
 drivers/net/atl1c/atl1c_main.c                     |   27 +-
 drivers/net/atl1e/atl1e_ethtool.c                  |    7 +-
 drivers/net/atl1e/atl1e_main.c                     |   14 +-
 drivers/net/atlx/atl1.c                            |   29 +-
 drivers/net/atlx/atl2.c                            |   18 +-
 drivers/net/b44.c                                  |   13 +-
 drivers/net/bcm63xx_enet.c                         |    7 +-
 drivers/net/benet/be.h                             |   74 +-
 drivers/net/benet/be_cmds.c                        |  341 +-
 drivers/net/benet/be_cmds.h                        |  457 +-
 drivers/net/benet/be_ethtool.c                     |  227 +-
 drivers/net/benet/be_hw.h                          |    4 +
 drivers/net/benet/be_main.c                        |  637 +-
 drivers/net/bna/bfa_ioc.c                          |   13 +-
 drivers/net/bna/bna_ctrl.c                         |   21 -
 drivers/net/bna/bna_txrx.c                         |    7 +-
 drivers/net/bna/bnad.c                             |   22 +-
 drivers/net/bna/bnad.h                             |    2 -
 drivers/net/bna/bnad_ethtool.c                     |   70 +-
 drivers/net/bnx2.c                                 |  184 +-
 drivers/net/bnx2.h                                 |    3 +-
 drivers/net/bnx2x/bnx2x.h                          |   35 +-
 drivers/net/bnx2x/bnx2x_cmn.c                      |  643 +-
 drivers/net/bnx2x/bnx2x_cmn.h                      |  454 +-
 drivers/net/bnx2x/bnx2x_dcb.c                      |  202 +-
 drivers/net/bnx2x/bnx2x_dcb.h                      |   16 +-
 drivers/net/bnx2x/bnx2x_ethtool.c                  |  167 +-
 drivers/net/bnx2x/bnx2x_fw_defs.h                  |    2 +-
 drivers/net/bnx2x/bnx2x_fw_file_hdr.h              |    2 +-
 drivers/net/bnx2x/bnx2x_hsi.h                      |    4 +-
 drivers/net/bnx2x/bnx2x_init.h                     |    2 +-
 drivers/net/bnx2x/bnx2x_init_ops.h                 |    2 +-
 drivers/net/bnx2x/bnx2x_link.c                     |   14 +-
 drivers/net/bnx2x/bnx2x_main.c                     |  360 +-
 drivers/net/bnx2x/bnx2x_reg.h                      |    2 +-
 drivers/net/bnx2x/bnx2x_stats.c                    |    2 +-
 drivers/net/bnx2x/bnx2x_stats.h                    |    2 +-
 drivers/net/bonding/Makefile                       |    3 -
 drivers/net/bonding/bond_3ad.c                     |   43 +-
 drivers/net/bonding/bond_3ad.h                     |    4 +-
 drivers/net/bonding/bond_alb.c                     |   57 +-
 drivers/net/bonding/bond_alb.h                     |    1 -
 drivers/net/bonding/bond_main.c                    |  530 +-
 drivers/net/bonding/bond_procfs.c                  |    2 -
 drivers/net/bonding/bond_sysfs.c                   |   84 +-
 drivers/net/bonding/bonding.h                      |   56 +-
 drivers/net/cassini.c                              |   37 +-
 drivers/net/chelsio/common.h                       |    5 -
 drivers/net/chelsio/cxgb2.c                        |   59 +-
 drivers/net/chelsio/sge.c                          |   13 +-
 drivers/net/chelsio/tp.c                           |    5 -
 drivers/net/chelsio/tp.h                           |    1 -
 drivers/net/cnic.c                                 |   62 +-
 drivers/net/cnic.h                                 |    1 +
 drivers/net/cnic_if.h                              |    6 +-
 drivers/net/cris/eth_v10.c                         |    4 +-
 drivers/net/cxgb3/adapter.h                        |    7 -
 drivers/net/cxgb3/common.h                         |    1 -
 drivers/net/cxgb3/cxgb3_main.c                     |  117 +-
 drivers/net/cxgb3/sge.c                            |    7 +-
 drivers/net/cxgb4/cxgb4.h                          |    6 -
 drivers/net/cxgb4/cxgb4_main.c                     |  103 +-
 drivers/net/cxgb4/sge.c                            |    4 +-
 drivers/net/cxgb4vf/adapter.h                      |    6 -
 drivers/net/cxgb4vf/cxgb4vf_main.c                 |   73 +-
 drivers/net/cxgb4vf/sge.c                          |    4 +-
 drivers/net/depca.c                                |   35 +-
 drivers/net/dl2k.c                                 |   29 +-
 drivers/net/dm9000.c                               |   57 +-
 drivers/net/dummy.c                                |    4 -
 drivers/net/e100.c                                 |   78 +-
 drivers/net/e1000/e1000.h                          |    5 +-
 drivers/net/e1000/e1000_ethtool.c                  |   60 +-
 drivers/net/e1000/e1000_main.c                     |   42 +-
 drivers/net/e1000e/82571.c                         |   22 +-
 drivers/net/e1000e/e1000.h                         |   12 +-
 drivers/net/e1000e/es2lan.c                        |    5 +-
 drivers/net/e1000e/ethtool.c                       |  154 +-
 drivers/net/e1000e/hw.h                            |    1 +
 drivers/net/e1000e/ich8lan.c                       |   16 +-
 drivers/net/e1000e/lib.c                           |   18 +-
 drivers/net/e1000e/netdev.c                        |  213 +-
 drivers/net/e1000e/phy.c                           |    4 +-
 drivers/net/eepro.c                                |    2 +-
 drivers/net/ehea/ehea_ethtool.c                    |   46 +-
 drivers/net/ehea/ehea_main.c                       |    4 +-
 drivers/net/enc28j60.c                             |    5 +-
 drivers/net/enic/Makefile                          |    2 +-
 drivers/net/enic/enic.h                            |    5 +-
 drivers/net/enic/enic_dev.c                        |   62 +-
 drivers/net/enic/enic_dev.h                        |    7 +-
 drivers/net/enic/enic_main.c                       |  274 +-
 drivers/net/enic/enic_pp.c                         |  264 +
 drivers/net/enic/enic_pp.h                         |   27 +
 drivers/net/enic/enic_res.c                        |    4 +-
 drivers/net/enic/vnic_dev.c                        |   97 +-
 drivers/net/enic/vnic_dev.h                        |    6 +-
 drivers/net/enic/vnic_devcmd.h                     |   57 +-
 drivers/net/enic/vnic_vic.c                        |    5 +-
 drivers/net/enic/vnic_vic.h                        |   13 +-
 drivers/net/ewrk3.c                                |   58 +-
 drivers/net/forcedeth.c                            |  113 +-
 drivers/net/fs_enet/fs_enet-main.c                 |    2 -
 drivers/net/gianfar.c                              |   16 +-
 drivers/net/gianfar.h                              |   20 +-
 drivers/net/gianfar_ethtool.c                      |  110 +-
 drivers/net/greth.c                                |   46 +-
 drivers/net/greth.h                                |    4 -
 drivers/net/hamachi.c                              |   78 -
 drivers/net/hamradio/bpqether.c                    |    4 -
 drivers/net/hp100.c                                |   12 +-
 drivers/net/ibm_newemac/core.c                     |   17 +-
 drivers/net/ibmlana.c                              |    7 +-
 drivers/net/ibmveth.c                              |   98 +-
 drivers/net/ifb.c                                  |    4 -
 drivers/net/igb/e1000_82575.c                      |   11 +-
 drivers/net/igb/igb.h                              |    2 +-
 drivers/net/igb/igb_ethtool.c                      |   48 +-
 drivers/net/igb/igb_main.c                         |   90 +-
 drivers/net/igbvf/ethtool.c                        |   14 +-
 drivers/net/ioc3-eth.c                             |   30 +-
 drivers/net/irda/smsc-ircc2.c                      |   44 +-
 drivers/net/ixgb/ixgb.h                            |    3 -
 drivers/net/ixgb/ixgb_ethtool.c                    |   53 +-
 drivers/net/ixgbe/ixgbe.h                          |  111 +-
 drivers/net/ixgbe/ixgbe_82598.c                    |   61 +-
 drivers/net/ixgbe/ixgbe_82599.c                    |  178 +-
 drivers/net/ixgbe/ixgbe_common.c                   |  532 +-
 drivers/net/ixgbe/ixgbe_common.h                   |   12 +-
 drivers/net/ixgbe/ixgbe_dcb_82598.c                |    2 +-
 drivers/net/ixgbe/ixgbe_dcb_82599.c                |   77 +-
 drivers/net/ixgbe/ixgbe_dcb_82599.h                |    2 +
 drivers/net/ixgbe/ixgbe_dcb_nl.c                   |  109 +-
 drivers/net/ixgbe/ixgbe_ethtool.c                  |  191 +-
 drivers/net/ixgbe/ixgbe_fcoe.c                     |    4 +-
 drivers/net/ixgbe/ixgbe_main.c                     | 1037 +-
 drivers/net/ixgbe/ixgbe_mbx.h                      |    4 +-
 drivers/net/ixgbe/ixgbe_phy.c                      |   20 +-
 drivers/net/ixgbe/ixgbe_sriov.c                    |  100 +-
 drivers/net/ixgbe/ixgbe_type.h                     |  218 +-
 drivers/net/ixgbe/ixgbe_x540.c                     |  317 +-
 drivers/net/ixgbevf/ethtool.c                      |    8 +-
 drivers/net/ixgbevf/ixgbevf_main.c                 |   30 +
 drivers/net/ixgbevf/mbx.h                          |    1 +
 drivers/net/ixgbevf/vf.c                           |   34 +
 drivers/net/ixgbevf/vf.h                           |    1 +
 drivers/net/jme.c                                  |   80 +-
 drivers/net/jme.h                                  |    2 -
 drivers/net/ksz884x.c                              |   82 +-
 drivers/net/loopback.c                             |    3 +-
 drivers/net/macb.c                                 |   11 +-
 drivers/net/macvlan.c                              |   34 +-
 drivers/net/mdio.c                                 |   23 +-
 drivers/net/mii.c                                  |   31 +-
 drivers/net/mlx4/en_ethtool.c                      |   49 +-
 drivers/net/mlx4/en_netdev.c                       |   26 +-
 drivers/net/mlx4/en_rx.c                           |    2 +-
 drivers/net/mlx4/mlx4_en.h                         |    1 -
 drivers/net/mv643xx_eth.c                          |   34 +-
 drivers/net/myri10ge/myri10ge.c                    |   68 +-
 drivers/net/natsemi.c                              |   11 +-
 drivers/net/ne3210.c                               |   15 +-
 drivers/net/netconsole.c                           |   82 +-
 drivers/net/netxen/netxen_nic.h                    |    2 +-
 drivers/net/netxen/netxen_nic_ethtool.c            |  117 +-
 drivers/net/netxen/netxen_nic_init.c               |    3 +-
 drivers/net/netxen/netxen_nic_main.c               |   55 +-
 drivers/net/niu.c                                  |   63 +-
 drivers/net/niu.h                                  |    1 +
 drivers/net/ns83820.c                              |    8 +-
 drivers/net/pch_gbe/pch_gbe.h                      |    4 -
 drivers/net/pch_gbe/pch_gbe_ethtool.c              |   65 +-
 drivers/net/pch_gbe/pch_gbe_main.c                 |   48 +-
 drivers/net/pch_gbe/pch_gbe_param.c                |   16 +-
 drivers/net/pch_gbe/pch_gbe_phy.c                  |    4 +-
 drivers/net/pcmcia/smc91c92_cs.c                   |    6 +-
 drivers/net/pcnet32.c                              |   90 +-
 drivers/net/phy/phy.c                              |   12 +-
 drivers/net/pptp.c                                 |   10 +-
 drivers/net/ps3_gelic_net.c                        |   34 +-
 drivers/net/ps3_gelic_net.h                        |    3 -
 drivers/net/ps3_gelic_wireless.c                   |    4 -
 drivers/net/qla3xxx.c                              |    4 +-
 drivers/net/qlcnic/qlcnic.h                        |  416 +-
 drivers/net/qlcnic/qlcnic_ctx.c                    |  250 +-
 drivers/net/qlcnic/qlcnic_ethtool.c                |  417 +-
 drivers/net/qlcnic/qlcnic_hdr.h                    |   40 +-
 drivers/net/qlcnic/qlcnic_hw.c                     |  578 +-
 drivers/net/qlcnic/qlcnic_init.c                   |   66 +-
 drivers/net/qlcnic/qlcnic_main.c                   |  634 +-
 drivers/net/qlge/qlge.h                            |    2 +-
 drivers/net/qlge/qlge_ethtool.c                    |   74 +-
 drivers/net/qlge/qlge_main.c                       |   25 +-
 drivers/net/r8169.c                                | 1006 +-
 drivers/net/s2io.c                                 |  197 +-
 drivers/net/s2io.h                                 |   13 +-
 drivers/net/sc92031.c                              |    8 +-
 drivers/net/sfc/efx.c                              |   49 +-
 drivers/net/sfc/efx.h                              |    2 +-
 drivers/net/sfc/ethtool.c                          |  118 +-
 drivers/net/sfc/falcon.c                           |    4 +-
 drivers/net/sfc/falcon_xmac.c                      |    2 +-
 drivers/net/sfc/mac.h                              |    4 +-
 drivers/net/sfc/mcdi_mac.c                         |    2 +-
 drivers/net/sfc/mcdi_phy.c                         |    8 +-
 drivers/net/sfc/mdio_10g.c                         |    6 +-
 drivers/net/sfc/mdio_10g.h                         |    2 +-
 drivers/net/sfc/net_driver.h                       |   24 +-
 drivers/net/sfc/nic.c                              |    6 +-
 drivers/net/sfc/nic.h                              |    6 +-
 drivers/net/sfc/phy.h                              |    8 +-
 drivers/net/sfc/qt202x_phy.c                       |    2 +-
 drivers/net/sfc/rx.c                               |    3 +
 drivers/net/sfc/selftest.c                         |   11 +-
 drivers/net/sfc/siena.c                            |    2 +-
 drivers/net/sfc/tenxpress.c                        |    4 +-
 drivers/net/sfc/tx.c                               |    9 +-
 drivers/net/sfc/txc43128_phy.c                     |    2 +-
 drivers/net/skge.c                                 |   93 +-
 drivers/net/skge.h                                 |    1 -
 drivers/net/sky2.c                                 |  195 +-
 drivers/net/sky2.h                                 |    1 -
 drivers/net/smc-mca.c                              |    6 +-
 drivers/net/smc911x.c                              |    4 +-
 drivers/net/smc91x.c                               |    4 +-
 drivers/net/smsc911x.c                             |  448 +-
 drivers/net/smsc911x.h                             |   22 +-
 drivers/net/spider_net.c                           |   15 +-
 drivers/net/spider_net.h                           |    7 -
 drivers/net/spider_net_ethtool.c                   |   23 +-
 drivers/net/stmmac/dwmac1000_core.c                |    5 +-
 drivers/net/stmmac/stmmac.h                        |    1 -
 drivers/net/stmmac/stmmac_ethtool.c                |   33 +-
 drivers/net/stmmac/stmmac_main.c                   |   86 +-
 drivers/net/sungem.c                               |   18 +-
 drivers/net/sunhme.c                               |   25 +-
 drivers/net/tehuti.c                               |   28 +-
 drivers/net/tg3.c                                  | 3595 +++--
 drivers/net/tg3.h                                  |  281 +-
 drivers/net/tile/tilepro.c                         |    2 +-
 drivers/net/tokenring/madgemc.c                    |    2 +-
 drivers/net/tokenring/olympic.c                    |   57 +-
 drivers/net/tulip/21142.c                          |   14 +-
 drivers/net/tulip/Makefile                         |    2 +
 drivers/net/tulip/de2104x.c                        |  183 +-
 drivers/net/tulip/de4x5.c                          |    4 +-
 drivers/net/tulip/dmfe.c                           |    9 +-
 drivers/net/tulip/eeprom.c                         |    4 +-
 drivers/net/tulip/interrupt.c                      |   48 +-
 drivers/net/tulip/media.c                          |   49 +-
 drivers/net/tulip/pnic.c                           |   22 +-
 drivers/net/tulip/pnic2.c                          |   16 +-
 drivers/net/tulip/timer.c                          |   47 +-
 drivers/net/tulip/tulip.h                          |    8 +-
 drivers/net/tulip/tulip_core.c                     |   50 +-
 drivers/net/tulip/uli526x.c                        |   71 +-
 drivers/net/tulip/winbond-840.c                    |   81 +-
 drivers/net/tulip/xircom_cb.c                      |  268 +-
 drivers/net/tun.c                                  |   69 +-
 drivers/net/typhoon.c                              |   58 +-
 drivers/net/ucc_geth_ethtool.c                     |    1 -
 drivers/net/usb/Kconfig                            |    2 +-
 drivers/net/usb/asix.c                             |   28 +-
 drivers/net/usb/catc.c                             |    2 +-
 drivers/net/usb/cdc_ncm.c                          |   13 +-
 drivers/net/usb/dm9601.c                           |    6 +-
 drivers/net/usb/plusb.c                            |   32 +-
 drivers/net/usb/rndis_host.c                       |   39 +-
 drivers/net/usb/rtl8150.c                          |   11 +-
 drivers/net/usb/smsc75xx.c                         |  131 +-
 drivers/net/usb/smsc95xx.c                         |   90 +-
 drivers/net/usb/usbnet.c                           |    6 +-
 drivers/net/veth.c                                 |   48 +-
 drivers/net/via-rhine.c                            |  242 +-
 drivers/net/via-velocity.c                         |   28 +-
 drivers/net/virtio_net.c                           |   46 +-
 drivers/net/vmxnet3/vmxnet3_drv.c                  |   43 +-
 drivers/net/vmxnet3/vmxnet3_ethtool.c              |   73 +-
 drivers/net/vmxnet3/vmxnet3_int.h                  |   11 +-
 drivers/net/vxge/vxge-config.c                     |   48 +-
 drivers/net/vxge/vxge-config.h                     |   70 +-
 drivers/net/vxge/vxge-ethtool.c                    |  104 +-
 drivers/net/vxge/vxge-main.c                       |  143 +-
 drivers/net/vxge/vxge-main.h                       |   14 +-
 drivers/net/vxge/vxge-traffic.h                    |    2 +-
 drivers/net/vxge/vxge-version.h                    |    4 +-
 drivers/net/wan/dlci.c                             |    4 -
 drivers/net/wan/hdlc_fr.c                          |    9 +-
 drivers/net/wan/lapbether.c                        |    4 -
 drivers/net/wireless/Kconfig                       |    1 +
 drivers/net/wireless/Makefile                      |    2 +
 drivers/net/wireless/ath/Kconfig                   |    1 -
 drivers/net/wireless/ath/Makefile                  |    1 -
 drivers/net/wireless/ath/ar9170/Kconfig            |   20 -
 drivers/net/wireless/ath/ar9170/Makefile           |    3 -
 drivers/net/wireless/ath/ar9170/ar9170.h           |  258 -
 drivers/net/wireless/ath/ar9170/cmd.c              |  127 -
 drivers/net/wireless/ath/ar9170/cmd.h              |   92 -
 drivers/net/wireless/ath/ar9170/eeprom.h           |  179 -
 drivers/net/wireless/ath/ar9170/hw.h               |  430 -
 drivers/net/wireless/ath/ar9170/led.c              |  181 -
 drivers/net/wireless/ath/ar9170/mac.c              |  519 -
 drivers/net/wireless/ath/ar9170/main.c             | 2190 ---
 drivers/net/wireless/ath/ar9170/phy.c              | 1719 ---
 drivers/net/wireless/ath/ar9170/usb.c              | 1008 --
 drivers/net/wireless/ath/ar9170/usb.h              |   82 -
 drivers/net/wireless/ath/ath.h                     |   10 +-
 drivers/net/wireless/ath/ath5k/ahb.c               |   28 +
 drivers/net/wireless/ath/ath5k/ath5k.h             |   31 +-
 drivers/net/wireless/ath/ath5k/attach.c            |    7 +-
 drivers/net/wireless/ath/ath5k/base.c              |   73 +-
 drivers/net/wireless/ath/ath5k/base.h              |    7 +-
 drivers/net/wireless/ath/ath5k/caps.c              |    3 +
 drivers/net/wireless/ath/ath5k/debug.c             |   65 +-
 drivers/net/wireless/ath/ath5k/debug.h             |   17 -
 drivers/net/wireless/ath/ath5k/desc.c              |  158 +-
 drivers/net/wireless/ath/ath5k/eeprom.c            |  158 +-
 drivers/net/wireless/ath/ath5k/mac80211-ops.c      |    9 +
 drivers/net/wireless/ath/ath5k/pci.c               |   32 +
 drivers/net/wireless/ath/ath5k/pcu.c               |   35 +-
 drivers/net/wireless/ath/ath5k/qcu.c               |    4 +-
 drivers/net/wireless/ath/ath5k/reset.c             |    5 +
 drivers/net/wireless/ath/ath9k/Kconfig             |   21 +-
 drivers/net/wireless/ath/ath9k/Makefile            |    6 +-
 drivers/net/wireless/ath/ath9k/ahb.c               |   18 +-
 drivers/net/wireless/ath/ath9k/ani.c               |    6 -
 drivers/net/wireless/ath/ath9k/ar5008_phy.c        |   45 +-
 drivers/net/wireless/ath/ath9k/ar9002_calib.c      |   43 +-
 drivers/net/wireless/ath/ath9k/ar9002_mac.c        |   34 +-
 drivers/net/wireless/ath/ath9k/ar9002_phy.c        |   44 +-
 drivers/net/wireless/ath/ath9k/ar9002_phy.h        |    6 +
 .../net/wireless/ath/ath9k/ar9003_2p2_initvals.h   |  178 +-
 drivers/net/wireless/ath/ath9k/ar9003_calib.c      |  387 +-
 drivers/net/wireless/ath/ath9k/ar9003_eeprom.c     |  125 +-
 drivers/net/wireless/ath/ath9k/ar9003_hw.c         |  189 +-
 drivers/net/wireless/ath/ath9k/ar9003_mac.c        |   35 +-
 drivers/net/wireless/ath/ath9k/ar9003_phy.c        |   99 +-
 drivers/net/wireless/ath/ath9k/ar9003_phy.h        |   47 +-
 drivers/net/wireless/ath/ath9k/ar9340_initvals.h   | 1525 ++
 drivers/net/wireless/ath/ath9k/ar9485_initvals.h   |  935 +--
 drivers/net/wireless/ath/ath9k/ath9k.h             |   31 +-
 drivers/net/wireless/ath/ath9k/beacon.c            |  238 +-
 drivers/net/wireless/ath/ath9k/btcoex.c            |  100 +-
 drivers/net/wireless/ath/ath9k/btcoex.h            |   20 +-
 drivers/net/wireless/ath/ath9k/calib.c             |   21 +-
 drivers/net/wireless/ath/ath9k/calib.h             |    1 -
 drivers/net/wireless/ath/ath9k/common.c            |   33 +-
 drivers/net/wireless/ath/ath9k/common.h            |    8 -
 drivers/net/wireless/ath/ath9k/debug.c             |  139 +-
 drivers/net/wireless/ath/ath9k/debug.h             |   11 +
 drivers/net/wireless/ath/ath9k/eeprom.h            |    6 +-
 drivers/net/wireless/ath/ath9k/eeprom_4k.c         |   26 +
 drivers/net/wireless/ath/ath9k/eeprom_9287.c       |   34 +-
 drivers/net/wireless/ath/ath9k/eeprom_def.c        |   11 +
 drivers/net/wireless/ath/ath9k/gpio.c              |   33 +-
 drivers/net/wireless/ath/ath9k/hif_usb.c           |  334 +-
 drivers/net/wireless/ath/ath9k/hif_usb.h           |   10 +-
 drivers/net/wireless/ath/ath9k/htc.h               |  296 +-
 drivers/net/wireless/ath/ath9k/htc_drv_beacon.c    |  333 +-
 drivers/net/wireless/ath/ath9k/htc_drv_debug.c     |  960 ++
 drivers/net/wireless/ath/ath9k/htc_drv_gpio.c      |  216 +-
 drivers/net/wireless/ath/ath9k/htc_drv_init.c      |  165 +-
 drivers/net/wireless/ath/ath9k/htc_drv_main.c      |  415 +-
 drivers/net/wireless/ath/ath9k/htc_drv_txrx.c      |  788 +-
 drivers/net/wireless/ath/ath9k/htc_hst.c           |   50 +-
 drivers/net/wireless/ath/ath9k/htc_hst.h           |   25 +-
 drivers/net/wireless/ath/ath9k/hw-ops.h            |   17 +-
 drivers/net/wireless/ath/ath9k/hw.c                |  384 +-
 drivers/net/wireless/ath/ath9k/hw.h                |  103 +-
 drivers/net/wireless/ath/ath9k/init.c              |   55 +-
 drivers/net/wireless/ath/ath9k/mac.c               |  135 +-
 drivers/net/wireless/ath/ath9k/mac.h               |    1 -
 drivers/net/wireless/ath/ath9k/main.c              |  328 +-
 drivers/net/wireless/ath/ath9k/phy.h               |   18 +-
 drivers/net/wireless/ath/ath9k/rc.c                |   15 +-
 drivers/net/wireless/ath/ath9k/recv.c              |  228 +-
 drivers/net/wireless/ath/ath9k/reg.h               |  135 +-
 drivers/net/wireless/ath/ath9k/wmi.c               |  126 +-
 drivers/net/wireless/ath/ath9k/wmi.h               |   82 +-
 drivers/net/wireless/ath/ath9k/xmit.c              |  174 +-
 drivers/net/wireless/ath/carl9170/carl9170.h       |    2 +
 drivers/net/wireless/ath/carl9170/main.c           |   94 +-
 drivers/net/wireless/ath/carl9170/tx.c             |  164 +-
 drivers/net/wireless/ath/key.c                     |   38 +-
 drivers/net/wireless/ath/regd.c                    |    8 +-
 drivers/net/wireless/ath/regd_common.h             |    2 +
 drivers/net/wireless/b43/main.c                    |   69 +-
 drivers/net/wireless/b43/main.h                    |    1 +
 drivers/net/wireless/b43/phy_n.c                   |   20 +-
 drivers/net/wireless/b43legacy/main.c              |   52 +-
 drivers/net/wireless/hostap/hostap_main.c          |    7 +-
 drivers/net/wireless/iwlegacy/iwl-4965-lib.c       |    3 -
 drivers/net/wireless/iwlegacy/iwl-4965-rs.c        |    3 +-
 drivers/net/wireless/iwlegacy/iwl-core.c           |   20 +-
 drivers/net/wireless/iwlegacy/iwl-core.h           |    1 -
 drivers/net/wireless/iwlegacy/iwl-dev.h            |    4 +-
 drivers/net/wireless/iwlegacy/iwl-hcmd.c           |    4 +-
 drivers/net/wireless/iwlegacy/iwl-helpers.h        |    6 +
 drivers/net/wireless/iwlegacy/iwl-tx.c             |   52 +-
 drivers/net/wireless/iwlegacy/iwl3945-base.c       |   22 +-
 drivers/net/wireless/iwlegacy/iwl4965-base.c       |   47 +-
 drivers/net/wireless/iwlwifi/Kconfig               |   10 +
 drivers/net/wireless/iwlwifi/Makefile              |    6 +-
 drivers/net/wireless/iwlwifi/iwl-1000.c            |   61 +-
 drivers/net/wireless/iwlwifi/iwl-2000.c            |  170 +-
 drivers/net/wireless/iwlwifi/iwl-5000-hw.h         |    4 +-
 drivers/net/wireless/iwlwifi/iwl-5000.c            |  103 +-
 drivers/net/wireless/iwlwifi/iwl-6000-hw.h         |    4 +-
 drivers/net/wireless/iwlwifi/iwl-6000.c            |  139 +-
 drivers/net/wireless/iwlwifi/iwl-agn-calib.c       |   47 +-
 drivers/net/wireless/iwlwifi/iwl-agn-calib.h       |    8 +-
 drivers/net/wireless/iwlwifi/iwl-agn-debugfs.c     | 1073 --
 drivers/net/wireless/iwlwifi/iwl-agn-debugfs.h     |   70 -
 drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c      |   45 +-
 drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c        |   59 +-
 drivers/net/wireless/iwlwifi/iwl-agn-hw.h          |    4 +-
 drivers/net/wireless/iwlwifi/iwl-agn-ict.c         |    4 +-
 drivers/net/wireless/iwlwifi/iwl-agn-led.c         |   73 -
 drivers/net/wireless/iwlwifi/iwl-agn-lib.c         |  169 +-
 drivers/net/wireless/iwlwifi/iwl-agn-rs.c          |   31 +-
 drivers/net/wireless/iwlwifi/iwl-agn-rs.h          |   31 +-
 drivers/net/wireless/iwlwifi/iwl-agn-rxon.c        |  274 +-
 drivers/net/wireless/iwlwifi/iwl-agn-sta.c         |    4 +-
 drivers/net/wireless/iwlwifi/iwl-agn-tt.c          |    2 +-
 drivers/net/wireless/iwlwifi/iwl-agn-tt.h          |    2 +-
 drivers/net/wireless/iwlwifi/iwl-agn-tx.c          |  247 +-
 drivers/net/wireless/iwlwifi/iwl-agn-ucode.c       |  346 +-
 drivers/net/wireless/iwlwifi/iwl-agn.c             | 1223 +--
 drivers/net/wireless/iwlwifi/iwl-agn.h             |  113 +-
 drivers/net/wireless/iwlwifi/iwl-commands.h        |  812 +-
 drivers/net/wireless/iwlwifi/iwl-core.c            |  270 +-
 drivers/net/wireless/iwlwifi/iwl-core.h            |  121 +-
 drivers/net/wireless/iwlwifi/iwl-csr.h             |   43 +-
 drivers/net/wireless/iwlwifi/iwl-debug.h           |    4 +-
 drivers/net/wireless/iwlwifi/iwl-debugfs.c         | 1074 ++-
 drivers/net/wireless/iwlwifi/iwl-dev.h             |  349 +-
 drivers/net/wireless/iwlwifi/iwl-devtrace.c        |    2 +-
 drivers/net/wireless/iwlwifi/iwl-devtrace.h        |    2 +-
 drivers/net/wireless/iwlwifi/iwl-eeprom.c          |  106 +-
 drivers/net/wireless/iwlwifi/iwl-eeprom.h          |  195 +-
 drivers/net/wireless/iwlwifi/iwl-fh.h              |   42 +-
 drivers/net/wireless/iwlwifi/iwl-hcmd.c            |   25 +-
 drivers/net/wireless/iwlwifi/iwl-helpers.h         |   39 +-
 drivers/net/wireless/iwlwifi/iwl-io.c              |  294 +
 drivers/net/wireless/iwlwifi/iwl-io.h              |  498 +-
 drivers/net/wireless/iwlwifi/iwl-led.c             |   52 +-
 drivers/net/wireless/iwlwifi/iwl-led.h             |    3 +-
 drivers/net/wireless/iwlwifi/iwl-power.c           |   19 +-
 drivers/net/wireless/iwlwifi/iwl-power.h           |    2 +-
 drivers/net/wireless/iwlwifi/iwl-prph.h            |  358 +-
 drivers/net/wireless/iwlwifi/iwl-rx.c              |  375 +-
 drivers/net/wireless/iwlwifi/iwl-scan.c            |    2 +-
 drivers/net/wireless/iwlwifi/iwl-spectrum.h        |   92 -
 drivers/net/wireless/iwlwifi/iwl-sta.c             |   18 +-
 drivers/net/wireless/iwlwifi/iwl-sta.h             |    2 +-
 drivers/net/wireless/iwlwifi/iwl-sv-open.c         |  469 +
 drivers/net/wireless/iwlwifi/iwl-testmode.h        |  151 +
 drivers/net/wireless/iwlwifi/iwl-tx.c              |  116 +-
 drivers/net/wireless/iwmc3200wifi/rx.c             |    3 +-
 drivers/net/wireless/libertas/cfg.c                |   61 +-
 drivers/net/wireless/libertas/cmd.c                |  285 +-
 drivers/net/wireless/libertas/cmdresp.c            |   46 +-
 drivers/net/wireless/libertas/debugfs.c            |   41 +-
 drivers/net/wireless/libertas/decl.h               |    8 +-
 drivers/net/wireless/libertas/defs.h               |  120 +-
 drivers/net/wireless/libertas/dev.h                |   20 +-
 drivers/net/wireless/libertas/ethtool.c            |    3 +-
 drivers/net/wireless/libertas/host.h               |   33 +-
 drivers/net/wireless/libertas/if_cs.c              |   92 +-
 drivers/net/wireless/libertas/if_sdio.c            |   37 +-
 drivers/net/wireless/libertas/if_spi.c             |  282 +-
 drivers/net/wireless/libertas/if_spi.h             |   68 +-
 drivers/net/wireless/libertas/if_usb.c             |  157 +-
 drivers/net/wireless/libertas/if_usb.h             |   14 +-
 drivers/net/wireless/libertas/main.c               |  171 +-
 drivers/net/wireless/libertas/mesh.c               |  218 +-
 drivers/net/wireless/libertas/mesh.h               |    6 +-
 drivers/net/wireless/libertas/rx.c                 |   41 +-
 drivers/net/wireless/libertas/tx.c                 |   34 +-
 drivers/net/wireless/libertas/types.h              |   18 +-
 drivers/net/wireless/mac80211_hwsim.c              |   11 +-
 drivers/net/wireless/mwifiex/11n.c                 |  744 +
 drivers/net/wireless/mwifiex/11n.h                 |  161 +
 drivers/net/wireless/mwifiex/11n_aggr.c            |  298 +
 drivers/net/wireless/mwifiex/11n_aggr.h            |   32 +
 drivers/net/wireless/mwifiex/11n_rxreorder.c       |  616 +
 drivers/net/wireless/mwifiex/11n_rxreorder.h       |   65 +
 drivers/net/wireless/mwifiex/Kconfig               |   21 +
 drivers/net/wireless/mwifiex/Makefile              |   41 +
 drivers/net/wireless/mwifiex/README                |  204 +
 drivers/net/wireless/mwifiex/cfg80211.c            | 1417 ++
 drivers/net/wireless/mwifiex/cfg80211.h            |   31 +
 drivers/net/wireless/mwifiex/cfp.c                 |  360 +
 drivers/net/wireless/mwifiex/cmdevt.c              | 1414 ++
 drivers/net/wireless/mwifiex/debugfs.c             |  770 +
 drivers/net/wireless/mwifiex/decl.h                |  129 +
 drivers/net/wireless/mwifiex/fw.h                  | 1187 ++
 drivers/net/wireless/mwifiex/init.c                |  645 +
 drivers/net/wireless/mwifiex/ioctl.h               |  331 +
 drivers/net/wireless/mwifiex/join.c                | 1423 ++
 drivers/net/wireless/mwifiex/main.c                | 1055 ++
 drivers/net/wireless/mwifiex/main.h                | 1004 ++
 drivers/net/wireless/mwifiex/scan.c                | 3025 ++++
 drivers/net/wireless/mwifiex/sdio.c                | 1754 +++
 drivers/net/wireless/mwifiex/sdio.h                |  305 +
 drivers/net/wireless/mwifiex/sta_cmd.c             | 1219 ++
 drivers/net/wireless/mwifiex/sta_cmdresp.c         |  972 ++
 drivers/net/wireless/mwifiex/sta_event.c           |  406 +
 drivers/net/wireless/mwifiex/sta_ioctl.c           | 1593 ++
 drivers/net/wireless/mwifiex/sta_rx.c              |  200 +
 drivers/net/wireless/mwifiex/sta_tx.c              |  198 +
 drivers/net/wireless/mwifiex/txrx.c                |  200 +
 drivers/net/wireless/mwifiex/util.c                |  202 +
 drivers/net/wireless/mwifiex/util.h                |   32 +
 drivers/net/wireless/mwifiex/wmm.c                 | 1231 ++
 drivers/net/wireless/mwifiex/wmm.h                 |  110 +
 drivers/net/wireless/mwl8k.c                       |  875 +-
 drivers/net/wireless/p54/eeprom.c                  |    2 +-
 drivers/net/wireless/p54/fwio.c                    |   31 +
 drivers/net/wireless/p54/lmac.h                    |    1 +
 drivers/net/wireless/p54/main.c                    |   31 +
 drivers/net/wireless/p54/p54.h                     |    2 +
 drivers/net/wireless/p54/p54pci.c                  |    3 +-
 drivers/net/wireless/rt2x00/Kconfig                |   37 +-
 drivers/net/wireless/rt2x00/Makefile               |    1 -
 drivers/net/wireless/rt2x00/rt2400pci.c            |   35 +-
 drivers/net/wireless/rt2x00/rt2500pci.c            |   34 +-
 drivers/net/wireless/rt2x00/rt2500usb.c            |   91 +-
 drivers/net/wireless/rt2x00/rt2800.h               |  108 +
 drivers/net/wireless/rt2x00/rt2800lib.c            |  369 +-
 drivers/net/wireless/rt2x00/rt2800lib.h            |    1 +
 drivers/net/wireless/rt2x00/rt2800pci.c            |  267 +-
 drivers/net/wireless/rt2x00/rt2800usb.c            |  632 +-
 drivers/net/wireless/rt2x00/rt2x00.h               |  122 +-
 drivers/net/wireless/rt2x00/rt2x00config.c         |  108 +-
 drivers/net/wireless/rt2x00/rt2x00crypto.c         |    4 +-
 drivers/net/wireless/rt2x00/rt2x00debug.c          |   43 +-
 drivers/net/wireless/rt2x00/rt2x00dev.c            |  139 +-
 drivers/net/wireless/rt2x00/rt2x00firmware.c       |    2 +-
 drivers/net/wireless/rt2x00/rt2x00ht.c             |  133 -
 drivers/net/wireless/rt2x00/rt2x00lib.h            |   57 +-
 drivers/net/wireless/rt2x00/rt2x00link.c           |   61 +-
 drivers/net/wireless/rt2x00/rt2x00mac.c            |   95 +-
 drivers/net/wireless/rt2x00/rt2x00pci.c            |   19 +-
 drivers/net/wireless/rt2x00/rt2x00pci.h            |   17 +-
 drivers/net/wireless/rt2x00/rt2x00queue.c          |  177 +-
 drivers/net/wireless/rt2x00/rt2x00queue.h          |   34 +-
 drivers/net/wireless/rt2x00/rt2x00usb.c            |  129 +-
 drivers/net/wireless/rt2x00/rt2x00usb.h            |   33 +-
 drivers/net/wireless/rt2x00/rt61pci.c              |   70 +-
 drivers/net/wireless/rt2x00/rt73usb.c              |  192 +-
 drivers/net/wireless/rtlwifi/Kconfig               |   15 +-
 drivers/net/wireless/rtlwifi/Makefile              |    1 +
 drivers/net/wireless/rtlwifi/base.c                |  733 +-
 drivers/net/wireless/rtlwifi/base.h                |   60 +-
 drivers/net/wireless/rtlwifi/cam.c                 |  106 +-
 drivers/net/wireless/rtlwifi/cam.h                 |    5 +-
 drivers/net/wireless/rtlwifi/core.c                |  416 +-
 drivers/net/wireless/rtlwifi/core.h                |    1 +
 drivers/net/wireless/rtlwifi/efuse.c               |  234 +-
 drivers/net/wireless/rtlwifi/efuse.h               |    5 +-
 drivers/net/wireless/rtlwifi/pci.c                 |  609 +-
 drivers/net/wireless/rtlwifi/pci.h                 |   19 +-
 drivers/net/wireless/rtlwifi/ps.c                  |  261 +-
 drivers/net/wireless/rtlwifi/ps.h                  |    9 +
 drivers/net/wireless/rtlwifi/rc.c                  |  212 +-
 drivers/net/wireless/rtlwifi/rc.h                  |    9 +-
 drivers/net/wireless/rtlwifi/regd.c                |   97 +-
 drivers/net/wireless/rtlwifi/regd.h                |    2 +-
 drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c  |  525 +-
 drivers/net/wireless/rtlwifi/rtl8192c/dm_common.h  |    2 +
 drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c  |  115 +-
 drivers/net/wireless/rtlwifi/rtl8192c/fw_common.h  |    4 +-
 drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c |  128 +-
 drivers/net/wireless/rtlwifi/rtl8192c/phy_common.h |   76 +-
 drivers/net/wireless/rtlwifi/rtl8192ce/def.h       |   27 -
 drivers/net/wireless/rtlwifi/rtl8192ce/dm.c        |    2 +
 drivers/net/wireless/rtlwifi/rtl8192ce/dm.h        |    1 +
 drivers/net/wireless/rtlwifi/rtl8192ce/hw.c        |  509 +-
 drivers/net/wireless/rtlwifi/rtl8192ce/hw.h        |   34 +-
 drivers/net/wireless/rtlwifi/rtl8192ce/led.c       |   19 +-
 drivers/net/wireless/rtlwifi/rtl8192ce/led.h       |    3 -
 drivers/net/wireless/rtlwifi/rtl8192ce/phy.c       |  223 +-
 drivers/net/wireless/rtlwifi/rtl8192ce/phy.h       |   55 +-
 drivers/net/wireless/rtlwifi/rtl8192ce/reg.h       |   58 +-
 drivers/net/wireless/rtlwifi/rtl8192ce/rf.c        |   28 +-
 drivers/net/wireless/rtlwifi/rtl8192ce/rf.h        |   17 +-
 drivers/net/wireless/rtlwifi/rtl8192ce/sw.c        |  123 +-
 drivers/net/wireless/rtlwifi/rtl8192ce/sw.h        |   14 +-
 drivers/net/wireless/rtlwifi/rtl8192ce/trx.c       |  180 +-
 drivers/net/wireless/rtlwifi/rtl8192ce/trx.h       |   11 +-
 drivers/net/wireless/rtlwifi/rtl8192cu/hw.c        |   13 +-
 drivers/net/wireless/rtlwifi/rtl8192cu/hw.h        |    5 +-
 drivers/net/wireless/rtlwifi/rtl8192cu/phy.c       |   14 +-
 drivers/net/wireless/rtlwifi/rtl8192cu/phy.h       |   14 +
 drivers/net/wireless/rtlwifi/rtl8192cu/rf.c        |    4 +-
 drivers/net/wireless/rtlwifi/rtl8192cu/rf.h        |    4 +
 drivers/net/wireless/rtlwifi/rtl8192cu/sw.c        |    2 +-
 drivers/net/wireless/rtlwifi/rtl8192cu/trx.c       |   50 +-
 drivers/net/wireless/rtlwifi/rtl8192cu/trx.h       |    5 +-
 drivers/net/wireless/rtlwifi/rtl8192se/Makefile    |   15 +
 drivers/net/wireless/rtlwifi/rtl8192se/def.h       |  598 +
 drivers/net/wireless/rtlwifi/rtl8192se/dm.c        |  733 +
 drivers/net/wireless/rtlwifi/rtl8192se/dm.h        |  164 +
 drivers/net/wireless/rtlwifi/rtl8192se/fw.c        |  654 +
 drivers/net/wireless/rtlwifi/rtl8192se/fw.h        |  375 +
 drivers/net/wireless/rtlwifi/rtl8192se/hw.c        | 2512 ++++
 drivers/net/wireless/rtlwifi/rtl8192se/hw.h        |   79 +
 drivers/net/wireless/rtlwifi/rtl8192se/led.c       |  149 +
 drivers/net/wireless/rtlwifi/rtl8192se/led.h       |   37 +
 drivers/net/wireless/rtlwifi/rtl8192se/phy.c       | 1740 +++
 drivers/net/wireless/rtlwifi/rtl8192se/phy.h       |  101 +
 drivers/net/wireless/rtlwifi/rtl8192se/reg.h       | 1188 ++
 drivers/net/wireless/rtlwifi/rtl8192se/rf.c        |  546 +
 drivers/net/wireless/rtlwifi/rtl8192se/rf.h        |   43 +
 drivers/net/wireless/rtlwifi/rtl8192se/sw.c        |  423 +
 .../iwl-agn-led.h => rtlwifi/rtl8192se/sw.h}       |   19 +-
 drivers/net/wireless/rtlwifi/rtl8192se/table.c     |  634 +
 drivers/net/wireless/rtlwifi/rtl8192se/table.h     |   49 +
 drivers/net/wireless/rtlwifi/rtl8192se/trx.c       |  976 ++
 drivers/net/wireless/rtlwifi/rtl8192se/trx.h       |   45 +
 drivers/net/wireless/rtlwifi/usb.c                 |   19 +-
 drivers/net/wireless/rtlwifi/usb.h                 |    2 +
 drivers/net/wireless/rtlwifi/wifi.h                |  173 +-
 drivers/net/wireless/wl1251/cmd.h                  |    4 +-
 drivers/net/wireless/wl1251/event.c                |    6 +-
 drivers/net/wireless/wl1251/main.c                 |   22 +-
 drivers/net/wireless/wl1251/ps.c                   |   23 +-
 drivers/net/wireless/wl1251/ps.h                   |    2 +-
 drivers/net/wireless/wl1251/wl1251.h               |    9 +-
 drivers/net/wireless/wl12xx/Kconfig                |    2 +-
 drivers/net/wireless/wl12xx/acx.c                  |  201 +-
 drivers/net/wireless/wl12xx/acx.h                  |  102 +-
 drivers/net/wireless/wl12xx/boot.c                 |  283 +-
 drivers/net/wireless/wl12xx/boot.h                 |   52 +
 drivers/net/wireless/wl12xx/cmd.c                  |  113 +-
 drivers/net/wireless/wl12xx/cmd.h                  |   34 +
 drivers/net/wireless/wl12xx/conf.h                 |  116 +-
 drivers/net/wireless/wl12xx/debugfs.c              |  242 +-
 drivers/net/wireless/wl12xx/event.c                |   34 +-
 drivers/net/wireless/wl12xx/event.h                |    5 +-
 drivers/net/wireless/wl12xx/ini.h                  |   98 +-
 drivers/net/wireless/wl12xx/init.c                 |  149 +-
 drivers/net/wireless/wl12xx/init.h                 |    3 +
 drivers/net/wireless/wl12xx/io.c                   |   11 +
 drivers/net/wireless/wl12xx/io.h                   |    3 +
 drivers/net/wireless/wl12xx/main.c                 |  827 +-
 drivers/net/wireless/wl12xx/ps.c                   |   33 +-
 drivers/net/wireless/wl12xx/ps.h                   |    2 +
 drivers/net/wireless/wl12xx/reg.h                  |   15 +-
 drivers/net/wireless/wl12xx/rx.c                   |   80 +-
 drivers/net/wireless/wl12xx/scan.c                 |  260 +-
 drivers/net/wireless/wl12xx/scan.h                 |  114 +
 drivers/net/wireless/wl12xx/sdio.c                 |   95 +-
 drivers/net/wireless/wl12xx/sdio_test.c            |   20 +-
 drivers/net/wireless/wl12xx/spi.c                  |   17 +-
 drivers/net/wireless/wl12xx/testmode.c             |    6 +-
 drivers/net/wireless/wl12xx/tx.c                   |  245 +-
 drivers/net/wireless/wl12xx/tx.h                   |   62 +-
 drivers/net/wireless/wl12xx/wl12xx.h               |   78 +-
 drivers/net/wireless/zd1211rw/zd_chip.c            |  262 +-
 drivers/net/wireless/zd1211rw/zd_chip.h            |  529 +-
 drivers/net/wireless/zd1211rw/zd_rf.h              |    2 +-
 drivers/net/wireless/zd1211rw/zd_rf_al2230.c       |  198 +-
 drivers/net/wireless/zd1211rw/zd_rf_al7230b.c      |  240 +-
 drivers/net/wireless/zd1211rw/zd_rf_rf2959.c       |   78 +-
 drivers/net/wireless/zd1211rw/zd_rf_uw2453.c       |   86 +-
 drivers/net/wireless/zd1211rw/zd_usb.c             |    4 +-
 drivers/net/wireless/zd1211rw/zd_usb.h             |    2 +-
 drivers/net/xen-netback/common.h                   |    7 +-
 drivers/net/xen-netback/interface.c                |   84 +-
 drivers/net/xen-netback/xenbus.c                   |    2 +-
 drivers/net/xen-netfront.c                         |  106 +-
 drivers/s390/net/claw.c                            |   22 +-
 drivers/s390/net/ctcm_main.c                       |    2 -
 drivers/s390/net/ctcm_mpc.c                        |   13 +-
 drivers/s390/net/lcs.c                             |   10 +-
 drivers/s390/net/netiucv.c                         |    2 -
 drivers/s390/net/qeth_core.h                       |   26 +-
 drivers/s390/net/qeth_core_main.c                  |  150 +-
 drivers/s390/net/qeth_core_mpc.h                   |   17 +-
 drivers/s390/net/qeth_core_sys.c                   |   61 +
 drivers/s390/net/qeth_l2_main.c                    |   21 +-
 drivers/s390/net/qeth_l3.h                         |    2 -
 drivers/s390/net/qeth_l3_main.c                    |  261 +-
 drivers/s390/net/qeth_l3_sys.c                     |  103 -
 drivers/scsi/bnx2fc/bnx2fc_fcoe.c                  |   11 +-
 drivers/scsi/cxgbi/libcxgbi.c                      |   10 +-
 drivers/scsi/fcoe/fcoe.c                           |   11 +-
 drivers/ssb/driver_chipcommon.c                    |   68 +-
 drivers/ssb/driver_chipcommon_pmu.c                |    2 +
 drivers/ssb/driver_pcicore.c                       |  255 +-
 drivers/ssb/main.c                                 |   54 +-
 drivers/ssb/scan.c                                 |    7 +-
 drivers/staging/hv/netvsc_drv.c                    |    3 +-
 firmware/Makefile                                  |    6 +-
 firmware/WHENCE                                    |    9 +-
 firmware/bnx2x/bnx2x-e1-6.2.5.0.fw.ihex            | 9483 ------------
 firmware/bnx2x/bnx2x-e1-6.2.9.0.fw.ihex            | 9484 ++++++++++++
 firmware/bnx2x/bnx2x-e1h-6.2.5.0.fw.ihex           |13181 -----------------
 firmware/bnx2x/bnx2x-e1h-6.2.9.0.fw.ihex           |13192 +++++++++++++++++
 firmware/bnx2x/bnx2x-e2-6.2.5.0.fw.ihex            |15456 -------------------
 firmware/bnx2x/bnx2x-e2-6.2.9.0.fw.ihex            |15473 ++++++++++++++++++++
 include/linux/ath9k_platform.h                     |    7 +
 include/linux/bcma/bcma.h                          |  224 +
 include/linux/bcma/bcma_driver_chipcommon.h        |  302 +
 include/linux/bcma/bcma_driver_pci.h               |   89 +
 include/linux/bcma/bcma_regs.h                     |   34 +
 include/linux/can/core.h                           |    4 +-
 include/linux/ethtool.h                            |  317 +-
 include/linux/filter.h                             |   76 +
 include/linux/ieee80211.h                          |   20 +-
 include/linux/if_ether.h                           |    1 +
 include/linux/if_vlan.h                            |   11 +-
 include/linux/mod_devicetable.h                    |   17 +
 include/linux/mroute.h                             |    1 +
 include/linux/net.h                                |    1 +
 include/linux/netdevice.h                          |   46 +-
 include/linux/netfilter/ipset/ip_set_getport.h     |    2 +
 include/linux/netfilter/x_tables.h                 |   96 +-
 include/linux/nl80211.h                            |  371 +-
 include/linux/pkt_sched.h                          |   15 +
 include/linux/rfkill-regulator.h                   |   48 +
 include/linux/skbuff.h                             |    2 +-
 include/linux/smsc911x.h                           |    1 +
 include/linux/socket.h                             |    2 +
 include/linux/ssb/ssb.h                            |    3 +-
 include/linux/ssb/ssb_driver_chipcommon.h          |   11 +-
 include/linux/ssb/ssb_regs.h                       |    2 +-
 include/linux/stmmac.h                             |    2 +
 include/linux/syscalls.h                           |    2 +
 include/linux/tipc.h                               |    2 +-
 include/linux/usb/rndis_host.h                     |    2 +
 include/linux/wl12xx.h                             |   29 +-
 include/net/addrconf.h                             |   25 +-
 include/net/af_rxrpc.h                             |    3 -
 include/net/af_unix.h                              |    2 -
 include/net/atmclip.h                              |    2 -
 include/net/bluetooth/hci.h                        |   51 +-
 include/net/bluetooth/hci_core.h                   |   42 +-
 include/net/bluetooth/l2cap.h                      |  182 +-
 include/net/bluetooth/mgmt.h                       |   57 +-
 include/net/caif/caif_dev.h                        |   50 +-
 include/net/caif/cfcnfg.h                          |   71 +-
 include/net/caif/cfctrl.h                          |   15 +-
 include/net/caif/cffrml.h                          |    7 +-
 include/net/caif/cfmuxl.h                          |    2 -
 include/net/caif/cfpkt.h                           |   76 -
 include/net/caif/cfsrvl.h                          |   32 +-
 include/net/cfg80211.h                             |  311 +-
 include/net/compat.h                               |    2 +
 include/net/dst.h                                  |   13 +-
 include/net/flow.h                                 |   25 +-
 include/net/garp.h                                 |    2 +
 include/net/if_inet6.h                             |   11 +-
 include/net/inet6_connection_sock.h                |    2 +-
 include/net/inet_connection_sock.h                 |    6 +-
 include/net/inet_sock.h                            |   26 +-
 include/net/inetpeer.h                             |    2 +-
 include/net/ip.h                                   |   29 +-
 include/net/ip6_fib.h                              |   13 +-
 include/net/ip6_route.h                            |   26 +-
 include/net/ip_fib.h                               |    9 +-
 include/net/ip_vs.h                                |   14 +-
 include/net/ipv6.h                                 |   30 +-
 include/net/ipx.h                                  |    2 -
 include/net/mac80211.h                             |   99 +
 include/net/ndisc.h                                |    9 +-
 include/net/netevent.h                             |    2 -
 include/net/netfilter/nf_conntrack.h               |    2 -
 include/net/netfilter/nf_conntrack_tuple.h         |    4 -
 include/net/netfilter/nf_nat.h                     |    4 -
 include/net/netns/ipv4.h                           |    2 +
 include/net/phonet/pn_dev.h                        |    2 +-
 include/net/ping.h                                 |   55 +
 include/net/rawv6.h                                |    4 -
 include/net/route.h                                |  163 +-
 include/net/sctp/command.h                         |    1 -
 include/net/sctp/constants.h                       |   18 +-
 include/net/sctp/sctp.h                            |    2 -
 include/net/sctp/sm.h                              |    5 +-
 include/net/sctp/structs.h                         |   21 +-
 include/net/sctp/ulpevent.h                        |    3 +
 include/net/sctp/user.h                            |   33 +-
 include/net/snmp.h                                 |   14 +
 include/net/sock.h                                 |   54 +
 include/net/transp_v6.h                            |    4 -
 include/net/wimax.h                                |    5 -
 include/net/xfrm.h                                 |   15 +-
 include/rdma/ib_addr.h                             |   13 +-
 kernel/sys_ni.c                                    |    2 +
 net/802/garp.c                                     |   22 +-
 net/8021q/vlan.c                                   |   38 +-
 net/8021q/vlan.h                                   |    2 -
 net/8021q/vlan_core.c                              |   85 +-
 net/8021q/vlan_dev.c                               |  225 +-
 net/9p/client.c                                    |    9 +-
 net/9p/trans_fd.c                                  |    2 -
 net/9p/trans_rdma.c                                |    2 -
 net/Kconfig                                        |   14 +
 net/atm/lec.c                                      |    4 -
 net/ax25/af_ax25.c                                 |   16 +-
 net/ax25/ax25_iface.c                              |    3 +-
 net/batman-adv/aggregation.c                       |   31 +-
 net/batman-adv/aggregation.h                       |    4 +-
 net/batman-adv/bat_debugfs.c                       |    4 +-
 net/batman-adv/bat_sysfs.c                         |   16 +-
 net/batman-adv/gateway_client.c                    |  296 +-
 net/batman-adv/gateway_client.h                    |    2 +-
 net/batman-adv/hard-interface.c                    |  107 +-
 net/batman-adv/hard-interface.h                    |   18 +
 net/batman-adv/icmp_socket.c                       |   37 +-
 net/batman-adv/main.c                              |   20 +-
 net/batman-adv/main.h                              |   44 +-
 net/batman-adv/originator.c                        |   82 +-
 net/batman-adv/originator.h                        |    1 +
 net/batman-adv/packet.h                            |    5 +-
 net/batman-adv/routing.c                           |  572 +-
 net/batman-adv/routing.h                           |    6 +-
 net/batman-adv/send.c                              |   72 +-
 net/batman-adv/send.h                              |    2 +-
 net/batman-adv/soft-interface.c                    |  463 +-
 net/batman-adv/translation-table.c                 |  474 +-
 net/batman-adv/translation-table.h                 |   24 +-
 net/batman-adv/types.h                             |   56 +-
 net/batman-adv/unicast.c                           |   20 +-
 net/batman-adv/vis.c                               |  146 +-
 net/bluetooth/bnep/bnep.h                          |  148 +-
 net/bluetooth/bnep/core.c                          |   71 +-
 net/bluetooth/bnep/sock.c                          |    2 +-
 net/bluetooth/cmtp/capi.c                          |    6 +-
 net/bluetooth/cmtp/cmtp.h                          |   11 +-
 net/bluetooth/cmtp/core.c                          |   28 +-
 net/bluetooth/cmtp/sock.c                          |    2 +-
 net/bluetooth/hci_conn.c                           |   95 +-
 net/bluetooth/hci_core.c                           |  154 +-
 net/bluetooth/hci_event.c                          |  267 +-
 net/bluetooth/hci_sysfs.c                          |   71 +-
 net/bluetooth/hidp/core.c                          |   96 +-
 net/bluetooth/hidp/hidp.h                          |    6 +-
 net/bluetooth/hidp/sock.c                          |    7 +-
 net/bluetooth/l2cap_core.c                         | 1966 ++--
 net/bluetooth/l2cap_sock.c                         |  330 +-
 net/bluetooth/mgmt.c                               |  612 +-
 net/bluetooth/rfcomm/core.c                        |   23 +-
 net/bluetooth/rfcomm/sock.c                        |    5 +-
 net/bridge/br.c                                    |    1 +
 net/bridge/br_device.c                             |  100 +-
 net/bridge/br_fdb.c                                |  311 +-
 net/bridge/br_if.c                                 |  104 +-
 net/bridge/br_input.c                              |    5 +-
 net/bridge/br_ioctl.c                              |   40 +-
 net/bridge/br_multicast.c                          |   12 +-
 net/bridge/br_netfilter.c                          |    4 +-
 net/bridge/br_netlink.c                            |   60 +-
 net/bridge/br_notify.c                             |   11 +-
 net/bridge/br_private.h                            |   22 +-
 net/bridge/br_private_stp.h                        |   13 +
 net/bridge/br_stp.c                                |   48 +
 net/bridge/br_stp_if.c                             |   21 +-
 net/bridge/br_sysfs_br.c                           |   39 +-
 net/bridge/br_sysfs_if.c                           |   26 +-
 net/caif/Makefile                                  |    2 +-
 net/caif/caif_config_util.c                        |   99 -
 net/caif/caif_dev.c                                |  387 +-
 net/caif/caif_socket.c                             |  106 +-
 net/caif/cfcnfg.c                                  |  507 +-
 net/caif/cfctrl.c                                  |  196 +-
 net/caif/cfdgml.c                                  |    7 +-
 net/caif/cffrml.c                                  |   60 +-
 net/caif/cfmuxl.c                                  |  162 +-
 net/caif/cfpkt_skbuff.c                            |  205 +-
 net/caif/cfrfml.c                                  |    4 +-
 net/caif/cfserl.c                                  |    7 +-
 net/caif/cfsrvl.c                                  |   40 +-
 net/caif/cfutill.c                                 |    7 +-
 net/caif/cfveil.c                                  |   11 +-
 net/caif/cfvidl.c                                  |    5 +-
 net/caif/chnl_net.c                                |   45 +-
 net/can/af_can.c                                   |   67 +-
 net/can/bcm.c                                      |    2 +-
 net/can/raw.c                                      |    2 +-
 net/compat.c                                       |   16 +-
 net/core/dev.c                                     |  187 +-
 net/core/dst.c                                     |   54 +-
 net/core/ethtool.c                                 |  196 +-
 net/core/fib_rules.c                               |    3 +-
 net/core/filter.c                                  |   65 +-
 net/core/net-sysfs.c                               |   26 +-
 net/core/net_namespace.c                           |   12 +-
 net/core/netpoll.c                                 |   28 +-
 net/core/pktgen.c                                  |  199 +-
 net/core/rtnetlink.c                               |   25 +-
 net/core/skbuff.c                                  |    3 +
 net/core/sysctl_net_core.c                         |    9 +
 net/core/utils.c                                   |   24 +
 net/dccp/ipv4.c                                    |   53 +-
 net/dccp/ipv6.c                                    |   10 +-
 net/dccp/output.c                                  |    4 +-
 net/decnet/dn_dev.c                                |   10 +-
 net/decnet/dn_route.c                              |   15 +-
 net/decnet/dn_table.c                              |    4 +-
 net/dsa/slave.c                                    |    1 -
 net/econet/af_econet.c                             |    8 -
 net/ipv4/Makefile                                  |    2 +-
 net/ipv4/af_inet.c                                 |   53 +-
 net/ipv4/ah4.c                                     |    7 +-
 net/ipv4/cipso_ipv4.c                              |  113 +-
 net/ipv4/datagram.c                                |   22 +-
 net/ipv4/devinet.c                                 |    4 +-
 net/ipv4/esp4.c                                    |    7 +-
 net/ipv4/fib_frontend.c                            |   16 +-
 net/ipv4/fib_trie.c                                |  110 +-
 net/ipv4/icmp.c                                    |  133 +-
 net/ipv4/igmp.c                                    |   22 +-
 net/ipv4/inet_connection_sock.c                    |   59 +-
 net/ipv4/inet_diag.c                               |    2 +-
 net/ipv4/inet_lro.c                                |    4 +-
 net/ipv4/ip_forward.c                              |    2 +-
 net/ipv4/ip_fragment.c                             |   58 +-
 net/ipv4/ip_gre.c                                  |   70 +-
 net/ipv4/ip_input.c                                |    4 +-
 net/ipv4/ip_options.c                              |   57 +-
 net/ipv4/ip_output.c                               |  158 +-
 net/ipv4/ip_sockglue.c                             |   37 +-
 net/ipv4/ipcomp.c                                  |    4 +-
 net/ipv4/ipconfig.c                                |   35 +-
 net/ipv4/ipip.c                                    |   36 +-
 net/ipv4/ipmr.c                                    |   39 +-
 net/ipv4/netfilter/arp_tables.c                    |   18 +-
 net/ipv4/netfilter/ip_tables.c                     |   28 +-
 net/ipv4/netfilter/nf_nat_helper.c                 |    2 +-
 net/ipv4/ping.c                                    |  935 ++
 net/ipv4/raw.c                                     |   92 +-
 net/ipv4/route.c                                   |  385 +-
 net/ipv4/syncookies.c                              |   22 +-
 net/ipv4/sysctl_net_ipv4.c                         |   68 +
 net/ipv4/tcp.c                                     |    7 +-
 net/ipv4/tcp_ipv4.c                                |   98 +-
 net/ipv4/tcp_output.c                              |    2 +-
 net/ipv4/udp.c                                     |   78 +-
 net/ipv4/xfrm4_policy.c                            |   38 +-
 net/ipv4/xfrm4_state.c                             |    2 +-
 net/ipv6/addrconf.c                                |   42 +-
 net/ipv6/af_inet6.c                                |    2 +-
 net/ipv6/anycast.c                                 |   16 +-
 net/ipv6/esp6.c                                    |    5 +-
 net/ipv6/icmp.c                                    |    8 +-
 net/ipv6/inet6_connection_sock.c                   |    2 +-
 net/ipv6/ip6_fib.c                                 |   20 +-
 net/ipv6/ip6_input.c                               |    6 +-
 net/ipv6/ip6_output.c                              |   50 +-
 net/ipv6/ip6_tunnel.c                              |   46 +-
 net/ipv6/ip6mr.c                                   |    4 +-
 net/ipv6/ipcomp6.c                                 |    5 +-
 net/ipv6/mcast.c                                   |   36 +-
 net/ipv6/mip6.c                                    |    8 +-
 net/ipv6/ndisc.c                                   |   51 +-
 net/ipv6/netfilter.c                               |   10 +-
 net/ipv6/netfilter/ip6_tables.c                    |   21 +-
 net/ipv6/netfilter/ip6table_mangle.c               |    3 +-
 net/ipv6/proc.c                                    |   40 +-
 net/ipv6/raw.c                                     |   18 +-
 net/ipv6/reassembly.c                              |    4 +-
 net/ipv6/route.c                                   |  157 +-
 net/ipv6/sit.c                                     |   40 +-
 net/ipv6/syncookies.c                              |   13 +-
 net/ipv6/tcp_ipv6.c                                |   50 +-
 net/ipv6/udp.c                                     |   22 +-
 net/ipv6/xfrm6_mode_beet.c                         |    2 -
 net/ipv6/xfrm6_mode_tunnel.c                       |    6 +-
 net/ipv6/xfrm6_policy.c                            |    2 +-
 net/ipv6/xfrm6_tunnel.c                            |   10 +-
 net/irda/ircomm/ircomm_core.c                      |    6 -
 net/irda/ircomm/ircomm_lmp.c                       |    5 +-
 net/irda/ircomm/ircomm_tty.c                       |   14 +-
 net/irda/irlan/irlan_filter.c                      |    4 -
 net/irda/irlan/irlan_provider.c                    |    3 -
 net/irda/irlap_event.c                             |    3 -
 net/irda/irproc.c                                  |    5 +-
 net/iucv/af_iucv.c                                 |    9 +-
 net/iucv/iucv.c                                    |   77 +-
 net/key/af_key.c                                   |    2 +-
 net/l2tp/l2tp_core.c                               |   28 +-
 net/l2tp/l2tp_ip.c                                 |   52 +-
 net/l2tp/l2tp_netlink.c                            |    3 +-
 net/mac80211/Kconfig                               |    1 -
 net/mac80211/aes_ccm.c                             |    6 +-
 net/mac80211/agg-rx.c                              |    3 +-
 net/mac80211/agg-tx.c                              |   59 +-
 net/mac80211/cfg.c                                 |  188 +-
 net/mac80211/debugfs.c                             |   91 +-
 net/mac80211/debugfs_key.c                         |   21 +-
 net/mac80211/debugfs_sta.c                         |   26 +
 net/mac80211/driver-ops.h                          |   87 +-
 net/mac80211/driver-trace.h                        |  275 +-
 net/mac80211/ht.c                                  |   27 +-
 net/mac80211/ibss.c                                |   21 +-
 net/mac80211/ieee80211_i.h                         |   51 +-
 net/mac80211/iface.c                               |    7 +-
 net/mac80211/key.c                                 |   51 +-
 net/mac80211/key.h                                 |    4 +
 net/mac80211/main.c                                |   69 +-
 net/mac80211/mesh.c                                |   62 +-
 net/mac80211/mesh.h                                |    9 +-
 net/mac80211/mesh_hwmp.c                           |   42 +-
 net/mac80211/mesh_pathtbl.c                        |  166 +-
 net/mac80211/mesh_plink.c                          |  112 +-
 net/mac80211/mlme.c                                |   48 +-
 net/mac80211/pm.c                                  |   29 +-
 net/mac80211/rc80211_minstrel.c                    |    4 +-
 net/mac80211/rc80211_minstrel_ht.c                 |   27 +-
 net/mac80211/rx.c                                  |   94 +-
 net/mac80211/scan.c                                |  122 +-
 net/mac80211/sta_info.c                            |   52 +-
 net/mac80211/sta_info.h                            |   56 +-
 net/mac80211/status.c                              |   19 +-
 net/mac80211/tkip.c                                |    4 +-
 net/mac80211/tkip.h                                |    4 +-
 net/mac80211/tx.c                                  |   27 +-
 net/mac80211/util.c                                |   21 +-
 net/mac80211/wep.c                                 |   34 +-
 net/mac80211/wep.h                                 |    4 +-
 net/mac80211/work.c                                |    6 +-
 net/mac80211/wpa.c                                 |   62 +-
 net/netfilter/ipset/ip_set_getport.c               |   16 +-
 net/netfilter/ipset/ip_set_hash_ipport.c           |    2 +-
 net/netfilter/ipset/ip_set_hash_ipportip.c         |    2 +-
 net/netfilter/ipset/ip_set_hash_ipportnet.c        |    2 +-
 net/netfilter/ipset/ip_set_hash_netport.c          |    2 +-
 net/netfilter/ipvs/ip_vs_core.c                    |   24 +-
 net/netfilter/ipvs/ip_vs_ctl.c                     |    3 -
 net/netfilter/ipvs/ip_vs_xmit.c                    |   97 +-
 net/netfilter/nf_conntrack_sip.c                   |   16 +-
 net/netfilter/nf_conntrack_standalone.c            |    2 +-
 net/netfilter/nfnetlink_log.c                      |    2 -
 net/netfilter/x_tables.c                           |    9 +-
 net/netlabel/netlabel_cipso_v4.c                   |    4 -
 net/netrom/af_netrom.c                             |   12 +-
 net/packet/af_packet.c                             |    2 +-
 net/phonet/pn_dev.c                                |    6 +-
 net/phonet/pn_netlink.c                            |    4 +-
 net/phonet/socket.c                                |   45 +-
 net/rfkill/Kconfig                                 |   11 +
 net/rfkill/Makefile                                |    1 +
 net/rfkill/core.c                                  |    2 +-
 net/rfkill/rfkill-regulator.c                      |  164 +
 net/rose/af_rose.c                                 |   16 +-
 net/rxrpc/ar-ack.c                                 |    2 -
 net/rxrpc/ar-connevent.c                           |    3 -
 net/rxrpc/ar-error.c                               |    5 +-
 net/rxrpc/ar-peer.c                                |    6 +-
 net/rxrpc/ar-transport.c                           |    3 +-
 net/sched/Kconfig                                  |   12 +
 net/sched/Makefile                                 |    1 +
 net/sched/sch_api.c                                |    2 -
 net/sched/sch_qfq.c                                | 1137 ++
 net/sched/sch_sfq.c                                |    2 +-
 net/sctp/bind_addr.c                               |   10 +-
 net/sctp/debug.c                                   |    1 -
 net/sctp/endpointola.c                             |   20 +-
 net/sctp/input.c                                   |   19 +-
 net/sctp/ipv6.c                                    |  185 +-
 net/sctp/outqueue.c                                |   19 +-
 net/sctp/protocol.c                                |   71 +-
 net/sctp/sm_make_chunk.c                           |   62 +-
 net/sctp/sm_sideeffect.c                           |    9 +-
 net/sctp/sm_statefuns.c                            |   89 +-
 net/sctp/sm_statetable.c                           |   78 +-
 net/sctp/socket.c                                  |   95 +-
 net/sctp/transport.c                               |   27 +-
 net/sctp/ulpevent.c                                |   30 +-
 net/socket.c                                       |  219 +-
 net/tipc/addr.h                                    |    7 +-
 net/tipc/bcast.c                                   |   22 +-
 net/tipc/bearer.c                                  |   45 +-
 net/tipc/core.c                                    |    3 +-
 net/tipc/discover.c                                |  150 +-
 net/tipc/discover.h                                |   11 +-
 net/tipc/link.c                                    |  104 +-
 net/tipc/link.h                                    |    1 +
 net/tipc/msg.c                                     |   25 +-
 net/tipc/msg.h                                     |  161 +-
 net/tipc/port.c                                    |   55 +-
 net/tipc/port.h                                    |   14 +-
 net/tipc/socket.c                                  |   27 +-
 net/tipc/subscr.c                                  |    4 +-
 net/wireless/core.c                                |  106 +-
 net/wireless/core.h                                |   33 +
 net/wireless/lib80211_crypt_wep.c                  |    3 +-
 net/wireless/mesh.c                                |   23 +-
 net/wireless/mlme.c                                |   19 +
 net/wireless/nl80211.c                             |  790 +-
 net/wireless/nl80211.h                             |   11 +
 net/wireless/reg.c                                 |   74 +-
 net/wireless/scan.c                                |   77 +-
 net/wireless/sysfs.c                               |    2 +-
 net/wireless/util.c                                |  126 +-
 net/xfrm/xfrm_policy.c                             |    3 +-
 net/xfrm/xfrm_state.c                              |   12 +-
 scripts/mod/file2alias.c                           |   22 +
 1198 files changed, 126876 insertions(+), 79638 deletions(-)
 create mode 100644 Documentation/ABI/testing/sysfs-bus-bcma
 create mode 100644 arch/x86/net/Makefile
 create mode 100644 arch/x86/net/bpf_jit.S
 create mode 100644 arch/x86/net/bpf_jit_comp.c
 create mode 100644 drivers/bcma/Kconfig
 create mode 100644 drivers/bcma/Makefile
 create mode 100644 drivers/bcma/README
 create mode 100644 drivers/bcma/TODO
 create mode 100644 drivers/bcma/bcma_private.h
 create mode 100644 drivers/bcma/core.c
 create mode 100644 drivers/bcma/driver_chipcommon.c
 create mode 100644 drivers/bcma/driver_chipcommon_pmu.c
 create mode 100644 drivers/bcma/driver_pci.c
 create mode 100644 drivers/bcma/host_pci.c
 create mode 100644 drivers/bcma/main.c
 create mode 100644 drivers/bcma/scan.c
 create mode 100644 drivers/bcma/scan.h
 delete mode 100644 drivers/isdn/capi/capifs.c
 delete mode 100644 drivers/isdn/capi/capifs.h
 create mode 100644 drivers/net/enic/enic_pp.c
 create mode 100644 drivers/net/enic/enic_pp.h
 delete mode 100644 drivers/net/wireless/ath/ar9170/Kconfig
 delete mode 100644 drivers/net/wireless/ath/ar9170/Makefile
 delete mode 100644 drivers/net/wireless/ath/ar9170/ar9170.h
 delete mode 100644 drivers/net/wireless/ath/ar9170/cmd.c
 delete mode 100644 drivers/net/wireless/ath/ar9170/cmd.h
 delete mode 100644 drivers/net/wireless/ath/ar9170/eeprom.h
 delete mode 100644 drivers/net/wireless/ath/ar9170/hw.h
 delete mode 100644 drivers/net/wireless/ath/ar9170/led.c
 delete mode 100644 drivers/net/wireless/ath/ar9170/mac.c
 delete mode 100644 drivers/net/wireless/ath/ar9170/main.c
 delete mode 100644 drivers/net/wireless/ath/ar9170/phy.c
 delete mode 100644 drivers/net/wireless/ath/ar9170/usb.c
 delete mode 100644 drivers/net/wireless/ath/ar9170/usb.h
 create mode 100644 drivers/net/wireless/ath/ath9k/ar9340_initvals.h
 create mode 100644 drivers/net/wireless/ath/ath9k/htc_drv_debug.c
 delete mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-debugfs.c
 delete mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-debugfs.h
 delete mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-led.c
 create mode 100644 drivers/net/wireless/iwlwifi/iwl-io.c
 delete mode 100644 drivers/net/wireless/iwlwifi/iwl-spectrum.h
 create mode 100644 drivers/net/wireless/iwlwifi/iwl-sv-open.c
 create mode 100644 drivers/net/wireless/iwlwifi/iwl-testmode.h
 create mode 100644 drivers/net/wireless/mwifiex/11n.c
 create mode 100644 drivers/net/wireless/mwifiex/11n.h
 create mode 100644 drivers/net/wireless/mwifiex/11n_aggr.c
 create mode 100644 drivers/net/wireless/mwifiex/11n_aggr.h
 create mode 100644 drivers/net/wireless/mwifiex/11n_rxreorder.c
 create mode 100644 drivers/net/wireless/mwifiex/11n_rxreorder.h
 create mode 100644 drivers/net/wireless/mwifiex/Kconfig
 create mode 100644 drivers/net/wireless/mwifiex/Makefile
 create mode 100644 drivers/net/wireless/mwifiex/README
 create mode 100644 drivers/net/wireless/mwifiex/cfg80211.c
 create mode 100644 drivers/net/wireless/mwifiex/cfg80211.h
 create mode 100644 drivers/net/wireless/mwifiex/cfp.c
 create mode 100644 drivers/net/wireless/mwifiex/cmdevt.c
 create mode 100644 drivers/net/wireless/mwifiex/debugfs.c
 create mode 100644 drivers/net/wireless/mwifiex/decl.h
 create mode 100644 drivers/net/wireless/mwifiex/fw.h
 create mode 100644 drivers/net/wireless/mwifiex/init.c
 create mode 100644 drivers/net/wireless/mwifiex/ioctl.h
 create mode 100644 drivers/net/wireless/mwifiex/join.c
 create mode 100644 drivers/net/wireless/mwifiex/main.c
 create mode 100644 drivers/net/wireless/mwifiex/main.h
 create mode 100644 drivers/net/wireless/mwifiex/scan.c
 create mode 100644 drivers/net/wireless/mwifiex/sdio.c
 create mode 100644 drivers/net/wireless/mwifiex/sdio.h
 create mode 100644 drivers/net/wireless/mwifiex/sta_cmd.c
 create mode 100644 drivers/net/wireless/mwifiex/sta_cmdresp.c
 create mode 100644 drivers/net/wireless/mwifiex/sta_event.c
 create mode 100644 drivers/net/wireless/mwifiex/sta_ioctl.c
 create mode 100644 drivers/net/wireless/mwifiex/sta_rx.c
 create mode 100644 drivers/net/wireless/mwifiex/sta_tx.c
 create mode 100644 drivers/net/wireless/mwifiex/txrx.c
 create mode 100644 drivers/net/wireless/mwifiex/util.c
 create mode 100644 drivers/net/wireless/mwifiex/util.h
 create mode 100644 drivers/net/wireless/mwifiex/wmm.c
 create mode 100644 drivers/net/wireless/mwifiex/wmm.h
 delete mode 100644 drivers/net/wireless/rt2x00/rt2x00ht.c
 create mode 100644 drivers/net/wireless/rtlwifi/rtl8192se/Makefile
 create mode 100644 drivers/net/wireless/rtlwifi/rtl8192se/def.h
 create mode 100644 drivers/net/wireless/rtlwifi/rtl8192se/dm.c
 create mode 100644 drivers/net/wireless/rtlwifi/rtl8192se/dm.h
 create mode 100644 drivers/net/wireless/rtlwifi/rtl8192se/fw.c
 create mode 100644 drivers/net/wireless/rtlwifi/rtl8192se/fw.h
 create mode 100644 drivers/net/wireless/rtlwifi/rtl8192se/hw.c
 create mode 100644 drivers/net/wireless/rtlwifi/rtl8192se/hw.h
 create mode 100644 drivers/net/wireless/rtlwifi/rtl8192se/led.c
 create mode 100644 drivers/net/wireless/rtlwifi/rtl8192se/led.h
 create mode 100644 drivers/net/wireless/rtlwifi/rtl8192se/phy.c
 create mode 100644 drivers/net/wireless/rtlwifi/rtl8192se/phy.h
 create mode 100644 drivers/net/wireless/rtlwifi/rtl8192se/reg.h
 create mode 100644 drivers/net/wireless/rtlwifi/rtl8192se/rf.c
 create mode 100644 drivers/net/wireless/rtlwifi/rtl8192se/rf.h
 create mode 100644 drivers/net/wireless/rtlwifi/rtl8192se/sw.c
 rename drivers/net/wireless/{iwlwifi/iwl-agn-led.h => rtlwifi/rtl8192se/sw.h} (69%)
 create mode 100644 drivers/net/wireless/rtlwifi/rtl8192se/table.c
 create mode 100644 drivers/net/wireless/rtlwifi/rtl8192se/table.h
 create mode 100644 drivers/net/wireless/rtlwifi/rtl8192se/trx.c
 create mode 100644 drivers/net/wireless/rtlwifi/rtl8192se/trx.h
 delete mode 100644 firmware/bnx2x/bnx2x-e1-6.2.5.0.fw.ihex
 create mode 100644 firmware/bnx2x/bnx2x-e1-6.2.9.0.fw.ihex
 delete mode 100644 firmware/bnx2x/bnx2x-e1h-6.2.5.0.fw.ihex
 create mode 100644 firmware/bnx2x/bnx2x-e1h-6.2.9.0.fw.ihex
 delete mode 100644 firmware/bnx2x/bnx2x-e2-6.2.5.0.fw.ihex
 create mode 100644 firmware/bnx2x/bnx2x-e2-6.2.9.0.fw.ihex
 create mode 100644 include/linux/bcma/bcma.h
 create mode 100644 include/linux/bcma/bcma_driver_chipcommon.h
 create mode 100644 include/linux/bcma/bcma_driver_pci.h
 create mode 100644 include/linux/bcma/bcma_regs.h
 create mode 100644 include/linux/rfkill-regulator.h
 create mode 100644 include/net/ping.h
 delete mode 100644 net/caif/caif_config_util.c
 create mode 100644 net/ipv4/ping.c
 create mode 100644 net/rfkill/rfkill-regulator.c
 create mode 100644 net/sched/sch_qfq.c

^ permalink raw reply	[flat|nested] 1456+ messages in thread
* [GIT] Networking
@ 2011-05-21  6:20 David Miller
  0 siblings, 0 replies; 1456+ messages in thread
From: David Miller @ 2011-05-21  6:20 UTC (permalink / raw)
  To: torvalds; +Cc: akpm, netdev, linux-kernel


I wanted to push this quickly to fix the build fallout:

1) SCTP build failed due to intersection of two commits
   happening in two different trees.

2) ipv6 RTA_PREFSRC support doesn't propagate the prefsrc
   value into new copied routes.

3) garp can use kfree_rcu() too

Please pull, thanks a lot!

The following changes since commit 557eed603159b4e007c57d97fad1333ecebd3c2e:

  Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev (2011-05-20 14:31:27 -0700)

are available in the git repository at:

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

David S. Miller (1):
      sctp: Fix build failure.

Eric Dumazet (1):
      garp: use kfree_rcu()

Florian Westphal (1):
      ipv6: copy prefsrc setting when copying route entry

 net/802/garp.c       |   20 ++------------------
 net/ipv6/route.c     |    1 +
 net/sctp/bind_addr.c |    2 +-
 3 files changed, 4 insertions(+), 19 deletions(-)

^ permalink raw reply	[flat|nested] 1456+ messages in thread
* [GIT] Networking
@ 2011-05-23  6:54 David Miller
  0 siblings, 0 replies; 1456+ messages in thread
From: David Miller @ 2011-05-23  6:54 UTC (permalink / raw)
  To: torvalds; +Cc: akpm, netdev, linux-kernel


Ok, this gets rid of the need to include linux/prefetch.h in
linux/skbuff.h, thanks largely to Part Gortmaker.

1) bnx2x bug sifxes from Vladislav Zolotarov and Dmitry Kravkov.

2) Unicast frame handling fix in macvlan from David Ward.

3) Dave Jones was hitting ip_rt_bug(), add a backtrace so we
   can diagnose it further.

4) Remove some spurious synchronize_{net,rcu}() calls during device
   teardown, from Eric Dumazet.

5) netpoll fixes wrt. bridging from Amerigo Wang.

6) CAIF bug fixes from Sjur Brandeland.

Please pull, thanks a lot!

The following changes since commit 71a8638480eb8fb6cfabe2ee9ca3fbc6e3453a14:

  Merge branch 'viafb-next' of git://github.com/schandinat/linux-2.6 (2011-05-22 12:39:58 -0700)

are available in the git repository at:

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

Amerigo Wang (4):
      netpoll: disable netpoll when enslave a device
      bridge: call NETDEV_JOIN notifiers when add a slave
      net: rename NETDEV_BONDING_DESLAVE to NETDEV_RELEASE
      rtnetlink: ignore NETDEV_RELEASE and NETDEV_JOIN event

Dave Jones (1):
      ipv4: Give backtrace in ip_rt_bug().

David S. Miller (5):
      net: Remove prefetches from SKB list handlers.
      rionet: Remove pointless printk of skb pointer.
      netlabel: Remove prefetches from list handlers.
      ipv4: Include linux/prefetch.h in fib_trie.c
      net: Remove linux/prefetch.h include from linux/skbuff.h

David Ward (1):
      macvlan: Forward unicast frames in bridge mode to lowerdev

Dmitry Kravkov (2):
      bnx2x: fix DMAE timeout according to hw specifications
      bnx2x: allow device properly initialize after hotplug

Emmanuel Grumbach (1):
      net: skb_trim explicitely check the linearity instead of data_len

Eric Dumazet (2):
      net: remove synchronize_net() from netdev_set_master()
      net: avoid synchronize_rcu() in dev_deactivate_many

Heiko Carstens (1):
      net: filter: move forward declarations to avoid compile warnings

Paul Gortmaker (1):
      drivers/net: add prefetch header for prefetch users

Vladislav Zolotarov (2):
      bnx2x: call dev_kfree_skb_any instead of dev_kfree_skb
      bnx2x: properly handle CFC DEL in cnic flow

WANG Cong (2):
      pktgen: use vzalloc_node() instead of vmalloc_node() + memset()
      pktgen: refactor pg_init() code

sjur.brandeland@stericsson.com (5):
      caif: Bugfix add check NULL pointer before calling functions.
      caif: Fixes freeze on Link layer removal.
      caif: Fix freezes when running CAIF loopback device
      caif: Update documentation of CAIF transmit and receive functions.
      caif: Plug memory leak for checksum error

 drivers/net/benet/be_main.c        |    1 +
 drivers/net/bna/bnad.c             |    1 +
 drivers/net/bnx2x/bnx2x_cmn.c      |    5 +-
 drivers/net/bnx2x/bnx2x_cmn.h      |    2 +-
 drivers/net/bnx2x/bnx2x_main.c     |   72 +++++++++++++----------------------
 drivers/net/bonding/bond_main.c    |    4 +-
 drivers/net/chelsio/sge.c          |    1 +
 drivers/net/cnic.c                 |    1 +
 drivers/net/cxgb3/sge.c            |    1 +
 drivers/net/cxgb4/sge.c            |    1 +
 drivers/net/cxgb4vf/sge.c          |    1 +
 drivers/net/e1000/e1000_main.c     |    1 +
 drivers/net/e1000e/netdev.c        |    1 +
 drivers/net/ehea/ehea_qmr.h        |    1 +
 drivers/net/enic/enic_main.c       |    1 +
 drivers/net/forcedeth.c            |    1 +
 drivers/net/igb/igb_main.c         |    1 +
 drivers/net/igbvf/netdev.c         |    1 +
 drivers/net/ixgb/ixgb_main.c       |    1 +
 drivers/net/ixgbe/ixgbe_main.c     |    1 +
 drivers/net/ixgbevf/ixgbevf_main.c |    1 +
 drivers/net/macvlan.c              |    6 +--
 drivers/net/myri10ge/myri10ge.c    |    1 +
 drivers/net/netconsole.c           |   26 ++++++++----
 drivers/net/pasemi_mac.c           |    1 +
 drivers/net/pch_gbe/pch_gbe_main.c |    1 +
 drivers/net/qla3xxx.c              |    1 +
 drivers/net/qlge/qlge_main.c       |    1 +
 drivers/net/r8169.c                |    1 +
 drivers/net/rionet.c               |    4 +-
 drivers/net/s2io.c                 |    1 +
 drivers/net/sb1250-mac.c           |    1 +
 drivers/net/sfc/rx.c               |    1 +
 drivers/net/skge.c                 |    1 +
 drivers/net/stmmac/stmmac_main.c   |    1 +
 drivers/net/tc35815.c              |    1 +
 drivers/net/vxge/vxge-main.c       |    1 +
 drivers/net/vxge/vxge-traffic.c    |    1 +
 include/linux/filter.h             |    7 ++-
 include/linux/notifier.h           |    3 +-
 include/linux/skbuff.h             |    9 ++--
 include/net/caif/caif_layer.h      |   36 ++++++++++-------
 net/bridge/br_if.c                 |    3 +
 net/caif/caif_dev.c                |    7 +++-
 net/caif/caif_socket.c             |   13 ++----
 net/caif/cfcnfg.c                  |   44 +++++++++------------
 net/caif/cfctrl.c                  |   44 +++++++++++++++------
 net/caif/cfmuxl.c                  |   49 +++++++++++++++++++-----
 net/core/dev.c                     |    4 +-
 net/core/pktgen.c                  |   22 ++++++----
 net/core/rtnetlink.c               |    2 +
 net/ipv4/fib_trie.c                |    1 +
 net/ipv4/route.c                   |    1 +
 net/netlabel/netlabel_addrlist.h   |    8 ++--
 net/sched/sch_generic.c            |   17 +++++++-
 55 files changed, 256 insertions(+), 164 deletions(-)

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


That majority of the bits here are just a merge with John Linville's
queued up wireless stuff.  This has been in his tree for more than
a week and I was just waiting for him to get back from a conference
to send the pull request to me.

Other noteworthy bits:

1) Erroneous socket filters can log kernel messages without control,
   fix from Joe Perches.

2) Fix regression in the locking of interface dumping, from Eric Dumazet.

3) Fix crash in bridging due to improperly initialized route object,
   also from Eric.

4) IP fragments give erroneous congestion notification signals in
   SFQ packet scheduler, also from Eric.

5) Rest of networking %pK conversions, from Dan Rosenberg via Andrew
   Morton.

6) When the RTNL mutex is held, synchonize_net() can use
   synchronize_rcu_expedited().  From Eric Dumazet.

7) Fix IGMP source filter clearing when users of the group still
   exist, from Veaceslav Falico.

8) __dst_destroy_metrics_generic() forgets to set "read-only" bit
   in the encoded pointer.  Fix from Eric Dumazet.

9) dev_disable_lro() needs to propagate to underlying physical device
   of a VLAN, from Neil Horman.

10) ASCONF memory leak in SCTP, fix from Wei Yongjun.

11) SFQ packet scheduler's ->peek() method returns different packets
    than ->dequeue() would, fix from Eric Dumazet.

12) Fix bonding deadlock in ALB mode, from Neil Horman.

Please pull, thanks a lot!

The following changes since commit 2a651c7f8d377cf88271374315cbb5fe82eac784:

  Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs (2011-05-25 09:21:56 -0700)

are available in the git repository at:

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

Alexey Dobriyan (1):
      airo: correct proc entry creation interfaces

Alexey Orishko (1):
      CDC NCM: release interfaces fix in unbind()

Breno Leitao (1):
      ehea: Fix multicast registration on semi-promiscuous mode

Christian Lamparter (2):
      p54usb: add zoom 4410 usbid
      carl9170: advertise interface combinations

Dan Rosenberg (1):
      net: convert %p usage to %pK

Daniel Halperin (1):
      iwlwifi: remove unused parameter from iwl_hcmd_queue_reclaim

David S. Miller (3):
      ipv6: Fix return of xfrm6_tunnel_rcv()
      bug.h: Fix build with CONFIG_PRINTK disabled.
      Merge branch 'for-davem' of ssh://master.kernel.org/.../linville/wireless-next-2.6

Dmitry Kravkov (2):
      bnx2x: fix inverted condition
      bnx2x: protect sequence increment with mutex

Eric Dumazet (8):
      net: ping: cleanups ping_v4_unhash()
      snap: remove one synchronize_net()
      sch_sfq: avoid giving spurious NET_XMIT_CN signals
      net: use synchronize_rcu_expedited()
      net: fix __dst_destroy_metrics_generic()
      bridge: initialize fake_rtable metrics
      sch_sfq: fix peek() implementation
      net: hold rtnl again in dump callbacks

Felix Fietkau (3):
      ath9k: fix ad-hoc mode beacon selection
      ath9k: fix ad-hoc nexttbtt calculation
      ath9k: implement .tx_last_beacon()

Flavio Leitner (1):
      bonding: documentation and code cleanup for resend_igmp

Ian Campbell (1):
      xen: netfront: hold RTNL when updating features.

Javier Cardona (2):
      mac80211: Deactivate mesh path timers when freeing nodes
      mac80211: Don't sleep when growing the mesh path

Joe Perches (2):
      bug.h: Add WARN_RATELIMIT
      net: filter: Use WARN_RATELIMIT

Johannes Berg (10):
      iwlagn: prepare for multi-TB commands
      iwlagn: clean up TXQ indirection
      iwlagn: remove unused pad argument
      iwlagn: support multiple TBs per command
      iwlagn: remove set but unused vars
      iwlagn: change default beacon interval
      mac80211: verify IBSS in interface combinations
      mac80211: add missing rcu_barrier
      mac80211: fix and simplify mesh locking
      mac80211: annotate and fix RCU in mesh code

John W. Linville (2):
      Merge branch 'wireless-next-2.6' of git://git.kernel.org/.../iwlwifi/iwlwifi-2.6
      Merge ssh://master.kernel.org/.../linville/wireless-next-2.6 into for-davem

Jouni Malinen (1):
      cfg80211: Use consistent BSS matching between scan and sme

Larry Finger (1):
      rtlwifi: rtl8192c-common: rtl8192ce: Fix for HT40 regression

Luciano Coelho (1):
      nl80211: remove some stack variables in trigger_scan and start_sched_scan

Marc Yang (5):
      mwifiex: reduce CPU usage by tracking tx_pkts_queued
      mwifiex: reduce CPU usage by tracking highest_queued_prio
      mwifiex: check mwifiex_wmm_lists_empty() before dequeue
      mwifiex: CPU mips optimization with NO_PKT_PRIO_TID
      mwifiex: adjust high/low water marks for tx_pending queue

Meelis Roos (1):
      Add Fujitsu 1000base-SX PCI ID to tg3

Mike Frysinger (1):
      net/irda: convert bfin_sir to common Blackfin UART header

Mohammed Shafi Shajakhan (2):
      ath_hw: Fix bssid mask documentation
      ath9k: use PS wakeup before REG_READ

Neil Horman (3):
      net: move is_vlan_dev into public header file (v2)
      net: make dev_disable_lro use physical device if passed a vlan dev (v2)
      bonding: prevent deadlock on slave store with alb mode (v3)

Prarit Bhargava (1):
      isdn: netjet - blacklist Digium TDM400P

Rafał Miłecki (8):
      b43: rename b43_wldev's field with ssb_device to sdev
      bcma: add PCI ID of the card found in Thinkpad X120e
      b43: add helpers for block R/W ops
      b43: make b43_wireless_init less bus specific
      b43: dma: cache translation (routing bits)
      b43: add helper for finding GPIO device
      b43: separate ssb core reset
      b43: read PHY info only when needed (for PHY-A)

Rajkumar Manoharan (2):
      mac80211: abort scan_work immediately when the device goes down
      ath9k: Fix power save wrappers in debug ops

Randy Dunlap (2):
      wireless: fix cfg80211.h new kernel-doc warnings
      wireless: fix fatal kernel-doc error + warning in mac80211.h

Rhyland Klein (1):
      net: rfkill: add generic gpio rfkill driver

Sathya Perla (1):
      be2net: hash key for rss-config cmd not set

Stephen Hemminger (1):
      dst: catch uninitialized metrics

Sujith Manoharan (9):
      ath9k_htc: Fix mode selection
      ath9k_htc: Fix station flags
      ath9k_htc: Recalculate the BSSID mask on interface
      ath9k_htc: Fix RX filter calculation
      ath9k_htc: Fix BSSID calculation
      ath9k_htc: Fix max subframe handling
      ath9k_htc: Change credit limit for UB94/95
      ath9k_htc: Fix packet timeout
      ath9k: Drag the driver to the year 2011

Ulrich Hecht (1):
      via-velocity: don't annotate MAC registers as packed

Veaceslav Falico (1):
      igmp: call ip_mc_clear_src() only when we have no users of ip_mc_list

Wei Yongjun (1):
      sctp: fix memory leak of the ASCONF queue when free asoc

Wey-Yi Guy (8):
      iwlagn: more ucode error log info
      iwlagn: add testmode trace command
      iwlagn: add eeprom command to testmode
      iwlagn: add testmode set fixed rate command
      iwlagn: clear STATUS_HCMD_ACTIVE bit if fail enqueue
      iwlagn: alwasy send RXON with disassociate falge before associate
      iwlagn: remove unused old_assoc parameter
      iwlagn: dbg_fixed_rate only used when CONFIG_MAC80211_DEBUGFS enabled

 Documentation/networking/bonding.txt               |   13 +-
 drivers/bcma/host_pci.c                            |    1 +
 drivers/isdn/hardware/mISDN/netjet.c               |    6 +
 drivers/net/benet/be_cmds.c                        |    3 +-
 drivers/net/bnx2x/bnx2x_cmn.c                      |    2 +-
 drivers/net/bnx2x/bnx2x_main.c                     |    3 +-
 drivers/net/bonding/bond_alb.c                     |    4 -
 drivers/net/bonding/bond_main.c                    |   28 +-
 drivers/net/bonding/bond_sysfs.c                   |   16 +-
 drivers/net/ehea/ehea_main.c                       |    2 +-
 drivers/net/irda/bfin_sir.c                        |   59 ++--
 drivers/net/irda/bfin_sir.h                        |   63 +----
 drivers/net/tg3.c                                  |    1 +
 drivers/net/usb/cdc_ncm.c                          |   73 ++---
 drivers/net/via-velocity.h                         |    2 +-
 drivers/net/wireless/airo.c                        |   33 +--
 drivers/net/wireless/ath/ath9k/ahb.c               |    2 +-
 drivers/net/wireless/ath/ath9k/ani.c               |    2 +-
 drivers/net/wireless/ath/ath9k/ani.h               |    2 +-
 drivers/net/wireless/ath/ath9k/ar5008_initvals.h   |    2 +-
 drivers/net/wireless/ath/ath9k/ar5008_phy.c        |    2 +-
 drivers/net/wireless/ath/ath9k/ar9001_initvals.h   |    2 +-
 drivers/net/wireless/ath/ath9k/ar9002_calib.c      |    2 +-
 drivers/net/wireless/ath/ath9k/ar9002_hw.c         |    2 +-
 drivers/net/wireless/ath/ath9k/ar9002_initvals.h   |    2 +-
 drivers/net/wireless/ath/ath9k/ar9002_mac.c        |    2 +-
 drivers/net/wireless/ath/ath9k/ar9002_phy.c        |    2 +-
 drivers/net/wireless/ath/ath9k/ar9002_phy.h        |    2 +-
 .../net/wireless/ath/ath9k/ar9003_2p2_initvals.h   |    2 +-
 drivers/net/wireless/ath/ath9k/ar9003_calib.c      |    2 +-
 drivers/net/wireless/ath/ath9k/ar9003_eeprom.c     |    2 +-
 drivers/net/wireless/ath/ath9k/ar9003_eeprom.h     |   16 +
 drivers/net/wireless/ath/ath9k/ar9003_hw.c         |    2 +-
 drivers/net/wireless/ath/ath9k/ar9003_mac.c        |    2 +-
 drivers/net/wireless/ath/ath9k/ar9003_mac.h        |    2 +-
 drivers/net/wireless/ath/ath9k/ar9003_paprd.c      |    2 +-
 drivers/net/wireless/ath/ath9k/ar9003_phy.c        |    2 +-
 drivers/net/wireless/ath/ath9k/ar9003_phy.h        |    2 +-
 drivers/net/wireless/ath/ath9k/ar9485_initvals.h   |    2 +-
 drivers/net/wireless/ath/ath9k/ath9k.h             |    5 +-
 drivers/net/wireless/ath/ath9k/beacon.c            |   48 ++-
 drivers/net/wireless/ath/ath9k/btcoex.c            |    2 +-
 drivers/net/wireless/ath/ath9k/btcoex.h            |    2 +-
 drivers/net/wireless/ath/ath9k/calib.c             |    2 +-
 drivers/net/wireless/ath/ath9k/calib.h             |    2 +-
 drivers/net/wireless/ath/ath9k/common.c            |    2 +-
 drivers/net/wireless/ath/ath9k/common.h            |    2 +-
 drivers/net/wireless/ath/ath9k/debug.c             |   10 +-
 drivers/net/wireless/ath/ath9k/debug.h             |    2 +-
 drivers/net/wireless/ath/ath9k/eeprom.c            |    2 +-
 drivers/net/wireless/ath/ath9k/eeprom.h            |    2 +-
 drivers/net/wireless/ath/ath9k/eeprom_4k.c         |    2 +-
 drivers/net/wireless/ath/ath9k/eeprom_9287.c       |    2 +-
 drivers/net/wireless/ath/ath9k/eeprom_def.c        |    2 +-
 drivers/net/wireless/ath/ath9k/gpio.c              |    2 +-
 drivers/net/wireless/ath/ath9k/hif_usb.c           |    2 +-
 drivers/net/wireless/ath/ath9k/hif_usb.h           |    4 +-
 drivers/net/wireless/ath/ath9k/htc.h               |   25 +-
 drivers/net/wireless/ath/ath9k/htc_drv_beacon.c    |    2 +-
 drivers/net/wireless/ath/ath9k/htc_drv_gpio.c      |    2 +-
 drivers/net/wireless/ath/ath9k/htc_drv_init.c      |    9 +-
 drivers/net/wireless/ath/ath9k/htc_drv_main.c      |   79 +++--
 drivers/net/wireless/ath/ath9k/htc_drv_txrx.c      |    6 +-
 drivers/net/wireless/ath/ath9k/htc_hst.c           |    2 +-
 drivers/net/wireless/ath/ath9k/htc_hst.h           |    2 +-
 drivers/net/wireless/ath/ath9k/hw-ops.h            |    2 +-
 drivers/net/wireless/ath/ath9k/hw.c                |    2 +-
 drivers/net/wireless/ath/ath9k/hw.h                |    2 +-
 drivers/net/wireless/ath/ath9k/init.c              |    2 +-
 drivers/net/wireless/ath/ath9k/mac.c               |    2 +-
 drivers/net/wireless/ath/ath9k/mac.h               |    2 +-
 drivers/net/wireless/ath/ath9k/main.c              |   42 +++-
 drivers/net/wireless/ath/ath9k/pci.c               |    2 +-
 drivers/net/wireless/ath/ath9k/phy.h               |    2 +-
 drivers/net/wireless/ath/ath9k/rc.c                |    2 +-
 drivers/net/wireless/ath/ath9k/rc.h                |    2 +-
 drivers/net/wireless/ath/ath9k/recv.c              |    2 +-
 drivers/net/wireless/ath/ath9k/reg.h               |    2 +-
 drivers/net/wireless/ath/ath9k/wmi.c               |    2 +-
 drivers/net/wireless/ath/ath9k/wmi.h               |    2 +-
 drivers/net/wireless/ath/ath9k/xmit.c              |    2 +-
 drivers/net/wireless/ath/carl9170/carl9170.h       |    4 +
 drivers/net/wireless/ath/carl9170/fw.c             |   19 +-
 drivers/net/wireless/ath/carl9170/main.c           |   10 +-
 drivers/net/wireless/ath/hw.c                      |   10 +-
 drivers/net/wireless/b43/b43.h                     |   24 +-
 drivers/net/wireless/b43/dma.c                     |   37 +-
 drivers/net/wireless/b43/leds.c                    |    4 +-
 drivers/net/wireless/b43/lo.c                      |    4 +-
 drivers/net/wireless/b43/main.c                    |  194 ++++++-----
 drivers/net/wireless/b43/phy_a.c                   |   16 +-
 drivers/net/wireless/b43/phy_common.c              |    8 +-
 drivers/net/wireless/b43/phy_g.c                   |   48 ++--
 drivers/net/wireless/b43/phy_lp.c                  |   22 +-
 drivers/net/wireless/b43/phy_n.c                   |   24 +-
 drivers/net/wireless/b43/pio.c                     |   30 +-
 drivers/net/wireless/b43/rfkill.c                  |    6 +-
 drivers/net/wireless/b43/sdio.c                    |    4 +-
 drivers/net/wireless/b43/sysfs.c                   |    4 +-
 drivers/net/wireless/b43/tables_lpphy.c            |    4 +-
 drivers/net/wireless/b43/wa.c                      |    4 +-
 drivers/net/wireless/b43/xmit.c                    |    2 +-
 drivers/net/wireless/iwlwifi/iwl-1000.c            |    4 -
 drivers/net/wireless/iwlwifi/iwl-2000.c            |    8 +-
 drivers/net/wireless/iwlwifi/iwl-5000.c            |   12 +-
 drivers/net/wireless/iwlwifi/iwl-6000.c            |   12 +-
 drivers/net/wireless/iwlwifi/iwl-agn-calib.c       |   14 +-
 drivers/net/wireless/iwlwifi/iwl-agn-lib.c         |   14 +-
 drivers/net/wireless/iwlwifi/iwl-agn-rs.c          |   86 +++--
 drivers/net/wireless/iwlwifi/iwl-agn-rxon.c        |    9 +-
 drivers/net/wireless/iwlwifi/iwl-agn-sta.c         |    4 +-
 drivers/net/wireless/iwlwifi/iwl-agn-tx.c          |   16 +-
 drivers/net/wireless/iwlwifi/iwl-agn-ucode.c       |    6 +-
 drivers/net/wireless/iwlwifi/iwl-agn.c             |  250 +++-----------
 drivers/net/wireless/iwlwifi/iwl-agn.h             |   13 +-
 drivers/net/wireless/iwlwifi/iwl-commands.h        |    5 +-
 drivers/net/wireless/iwlwifi/iwl-core.h            |   10 -
 drivers/net/wireless/iwlwifi/iwl-dev.h             |   66 +++--
 drivers/net/wireless/iwlwifi/iwl-devtrace.h        |   58 +++-
 drivers/net/wireless/iwlwifi/iwl-eeprom.c          |    7 +-
 drivers/net/wireless/iwlwifi/iwl-hcmd.c            |    9 +-
 drivers/net/wireless/iwlwifi/iwl-led.c             |    4 +-
 drivers/net/wireless/iwlwifi/iwl-sta.c             |   12 +-
 drivers/net/wireless/iwlwifi/iwl-sv-open.c         |  177 ++++++++++-
 drivers/net/wireless/iwlwifi/iwl-testmode.h        |   34 ++
 drivers/net/wireless/iwlwifi/iwl-tx.c              |  364 ++++++++++++++------
 drivers/net/wireless/iwmc3200wifi/rx.c             |    4 +-
 drivers/net/wireless/mwifiex/11n_aggr.c            |    4 +
 drivers/net/wireless/mwifiex/main.h                |    9 +-
 drivers/net/wireless/mwifiex/txrx.c                |    4 +-
 drivers/net/wireless/mwifiex/wmm.c                 |   59 +++-
 drivers/net/wireless/p54/p54usb.c                  |    1 +
 drivers/net/wireless/rndis_wlan.c                  |    3 +-
 drivers/net/wireless/rtlwifi/ps.c                  |    2 +-
 drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c |    2 +-
 drivers/net/wireless/rtlwifi/rtl8192ce/phy.c       |   69 ++++
 drivers/net/wireless/rtlwifi/rtl8192ce/phy.h       |    1 +
 drivers/net/wireless/rtlwifi/rtl8192ce/sw.c        |    1 +
 drivers/net/xen-netfront.c                         |    2 +
 drivers/staging/ath6kl/os/linux/cfg80211.c         |    2 +-
 drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c   |    4 +-
 drivers/staging/wlan-ng/cfg80211.c                 |    2 +-
 fs/proc/generic.c                                  |    1 +
 include/asm-generic/bug.h                          |   37 ++
 include/linux/if_vlan.h                            |    5 +
 include/linux/rfkill-gpio.h                        |   43 +++
 include/net/cfg80211.h                             |    8 +-
 include/net/dst.h                                  |    2 +
 net/802/psnap.c                                    |    1 -
 net/8021q/vlan.h                                   |    5 -
 net/atm/proc.c                                     |    4 +-
 net/bridge/br_netfilter.c                          |    6 +-
 net/can/bcm.c                                      |    6 +-
 net/core/dev.c                                     |   12 +-
 net/core/dst.c                                     |    2 +-
 net/core/fib_rules.c                               |    1 +
 net/core/filter.c                                  |    4 +-
 net/core/rtnetlink.c                               |    9 +-
 net/ipv4/igmp.c                                    |   10 +-
 net/ipv4/ping.c                                    |    3 -
 net/ipv4/raw.c                                     |    2 +-
 net/ipv4/tcp_ipv4.c                                |    6 +-
 net/ipv4/udp.c                                     |    2 +-
 net/ipv6/raw.c                                     |    2 +-
 net/ipv6/tcp_ipv6.c                                |    6 +-
 net/ipv6/udp.c                                     |    2 +-
 net/ipv6/xfrm6_tunnel.c                            |    2 +-
 net/key/af_key.c                                   |    2 +-
 net/mac80211/iface.c                               |    4 +-
 net/mac80211/main.c                                |   22 +-
 net/mac80211/mesh.h                                |    7 +-
 net/mac80211/mesh_pathtbl.c                        |  204 +++++++----
 net/mac80211/scan.c                                |    5 +
 net/netlink/af_netlink.c                           |    2 +-
 net/packet/af_packet.c                             |    2 +-
 net/phonet/socket.c                                |    2 +-
 net/rfkill/Kconfig                                 |    9 +
 net/rfkill/Makefile                                |    1 +
 net/rfkill/rfkill-gpio.c                           |  227 ++++++++++++
 net/sched/sch_sfq.c                                |   22 +-
 net/sctp/associola.c                               |   16 +
 net/sctp/proc.c                                    |    4 +-
 net/unix/af_unix.c                                 |    2 +-
 net/wireless/core.h                                |    5 +-
 net/wireless/nl80211.c                             |   12 +-
 net/wireless/sme.c                                 |   19 +-
 net/wireless/util.c                                |    2 +-
 187 files changed, 2050 insertions(+), 1204 deletions(-)
 create mode 100644 include/linux/rfkill-gpio.h
 create mode 100644 net/rfkill/rfkill-gpio.c

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


Last networking pull request for this merge window:

1) Fix build regressions in some configurations due to the ratelimited
   WARN interfaces, reported by Ingo.

   And Ingo also pointed out the ugly ratelimit.h dependency that
   linux/net.h has, get rid of that too.

2) Fix races that cause ugly crashes in inetpeer cleanups, from Eric
   Dumazet.

3) Namespace fix in IPVS from Hans Schillstrom.

4) ipset bug fixes from Jozsef Kadlecsik, mostly return code corrections
   and fixing timeout comparisons with jiffies.

5) ->set_features vs. ->set_flags compatability would accidently truncate
   flag values down to a bool, fix from Michał Mirosław.

6) Missing %pK conversions in CAN socket layer from Oliver Hartkopp.

Please pull, thanks a lot!

The following changes since commit a74b81b0aff4a01e0816df5915c854fb52c5e87f:

  Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2 (2011-05-26 10:55:15 -0700)

are available in the git repository at:

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

Andy Gospodarek (1):
      bonding: cleanup module option descriptions

Dan Williams (1):
      atm: expose ATM device index in sysfs

David Miller (1):
      netfilter: Fix several warnings in compat_mtw_from_user().

David S. Miller (5):
      bug.h: Move ratelimit warn interfaces to ratelimit.h
      Merge branch 'pablo/nf-2.6-updates' of git://1984.lsi.us.es/net-2.6
      net: Kill ether_table[] declaration.
      net: Add linux/sysctl.h includes where needed.
      net: Kill ratelimit.h dependency in linux/net.h

Eric Dumazet (1):
      inetpeer: fix race in unused_list manipulations

Hans Schillstrom (1):
      IPVS: bug in ip_vs_ftp, same list heaad used in all netns.

Johan Hovold (1):
      net: davinci_emac: fix dev_err use at probe

Jozsef Kadlecsik (3):
      netfilter: ipset: Use proper timeout value to jiffies conversion
      netfilter: ipset: remove unused variable from type_pf_tdel()
      netfilter: ipset: fix ip_set_flush return code

Justin Mattock (1):
      net:8021q:vlan.c Fix pr_info to just give the vlan fullname and version.

Michał Mirosław (1):
      net: fix ETHTOOL_SFEATURES compatibility with old ethtool_ops.set_flags

Oliver Hartkopp (1):
      can: convert to %pK for kptr_restrict support

 drivers/net/bonding/bond_main.c                |   34 ++++++++++++-------
 drivers/net/davinci_emac.c                     |   22 ++++++------
 include/asm-generic/bug.h                      |   40 ----------------------
 include/linux/if_ether.h                       |    4 --
 include/linux/net.h                            |    6 ---
 include/linux/netfilter.h                      |    1 +
 include/linux/netfilter/ipset/ip_set_ahash.h   |    4 +-
 include/linux/netfilter/ipset/ip_set_timeout.h |   18 ++++++----
 include/linux/ratelimit.h                      |   40 ++++++++++++++++++++++
 include/net/ip_vs.h                            |    3 +-
 include/net/net_namespace.h                    |    1 +
 include/net/net_ratelimit.h                    |    8 ++++
 net/8021q/vlan.c                               |    5 +--
 net/atm/atm_sysfs.c                            |   10 ++++++
 net/bridge/netfilter/ebtables.c                |    6 ++-
 net/can/proc.c                                 |    7 ++--
 net/core/ethtool.c                             |   25 +++++++++++++-
 net/core/filter.c                              |    1 +
 net/core/sysctl_net_core.c                     |    1 +
 net/core/utils.c                               |    1 +
 net/ipv4/inetpeer.c                            |   42 +++++++++++++++--------
 net/netfilter/ipset/ip_set_core.c              |    2 +-
 net/netfilter/ipvs/ip_vs_ftp.c                 |   27 +++++++++++----
 23 files changed, 189 insertions(+), 119 deletions(-)
 create mode 100644 include/net/net_ratelimit.h

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


This is the first batch of networking bug fixes after -rc1:

1) TG3 iterates one too many frags when doing DMA unmaps,
   fix from Matt Carlson based upon a report by Alex
   Williamson.

2) net_dev_xmit tracepoint uses SKB after it may have been
   freed up, fix from Koki Sanagi.

3) flexcan and davinci_emac drivers missing clk_put(), fix from Julia
   Lawall.

4) RTNL locking race fix in CAIF protocol, from Sjur Brændeland.

5) Validate family of sockaddr in ipv4 bind(), from Marcus Meissner.

6) Packet capture reports VLAN ID but doesn't indicate whether there
   was really a VLAN header there.  This is important because VLAN ID
   0 is legitimate.  Add a TP_STATUS_* flag to indicate this state,
   from Ben Greear.

7) Fix stats update locking bug in vlan_dev_hard_start_xmit(), from
   Wei Yongjun.

8) Add missing ->reset_resume() to cdc_ncm USB net driver.  From
   Stefan Metzmacher.

9) Fix broken handling of even header lengths in mwifiex driver,
   from Yogesh Ashok Powar.

10) Don't panic on RX buffer alloc failure in rtlwifi, from Larry
    Finger.

11) Fix oops in sched_scan of wl12xx driver, from Luciano Coelho.

12) Fix zs1211rw with OHCI controllers, from Jussi Kivilinna.

13) Fix under-allocation of SKB buffer space when receiving in PIO
    mode of ks8842 driver.  From Dennis Aberilla.

14) Pending timer and queue purging fix in SCTP from Wei Yongjun.

15) catc USB driver does GFP_KERNEL alloc with locks held, fix from
    Alexey Khoroshilov.

16) Revert an attempt to fix some section mismatches, it causes new
    problems.

17) Locking in l2cap_global_chan_by_psm() is busted, using read_unlock_bh()
    when should be using plain read_unlock().  Fix from Johannes Berg.

Please pull, thanks a lot!

The following changes since commit 4f1ba49efafccbc73017f824efa2505c81b247cd:

  Merge branch 'for-linus' of git://git.kernel.dk/linux-block (2011-06-04 08:11:26 +0900)

are available in the git repository at:

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

Adrian Chadd (1):
      ath9k: Fix AR9287 calibration

Alexey Khoroshilov (1):
      drivers/net/usb/catc.c: Fix potential deadlock in catc_ctrl_run()

Ben Greear (1):
      af-packet: Add flag to distinguish VID 0 from no-vlan.

Chris Metcalf (1):
      ip_options_compile: properly handle unaligned pointer

Daniel Drake (1):
      libertas: Set command sequence number later to ensure consistency

Daniel Halperin (1):
      ath9k: fix two more bugs in tx power

David S. Miller (1):
      Revert "net: fix section mismatches"

Dennis Aberilla (1):
      drivers/net: ks8842 Fix crash on received packet when in PIO mode.

Eliad Peller (2):
      mac80211: clear local->ps_data on disassoc
      cfg80211: don't drop p2p probe responses

Jesper Juhl (1):
      mac80211: Remove duplicate linux/slab.h include from net/mac80211/scan.c

Johannes Berg (1):
      bluetooth l2cap: fix locking in l2cap_global_chan_by_psm

John W. Linville (2):
      Merge git://git.kernel.org/.../linville/wireless-next-2.6 into for-davem
      Merge branch 'master' of git://git.kernel.org/.../linville/wireless-2.6 into for-davem

Julia Lawall (2):
      drivers/net/davinci_emac.c: add missing clk_put
      drivers/net/can/flexcan.c: add missing clk_put

Jussi Kivilinna (1):
      zd1211rw: fix to work on OHCI

Koki Sanagi (1):
      net: tracepoint of net_dev_xmit sees freed skb and causes panic

Larry Finger (2):
      rtlwifi: Fix kernel panic resulting from RX buffer allocation failure
      rtlwifi: Use order 2 RX buffer allocation only if necessary

Luciano Coelho (5):
      nl80211: fix check for valid SSID size in scan operations
      wl12xx: fix passive and radar channel generation for scheduled scan
      wl12xx: fix DFS channels handling in scheduled scan
      wl12xx: add separate config value for DFS dwell time on sched scan
      wl12xx: fix oops in sched_scan when forcing a passive scan

Marcus Meissner (1):
      net/ipv4: Check for mistakenly passed in non-IPv4 address

Mark Brown (1):
      net: dm9000: Get the chip in a known good state before enabling interrupts

Matt Carlson (1):
      tg3: Fix tg3_skb_error_unmap()

Rafał Miłecki (1):
      b43: N-PHY: initialize last var in calibration function

Rajkumar Manoharan (4):
      ath9k: Reset chip on baseband hang
      ath9k_hw: disable phy restart on baseband panic caused by RXSM
      ath9k: set 40 Mhz rate only if hw is configured in ht40
      mac80211: stop queues before rate control updation

Stanislaw Gruszka (2):
      iwl4965: fix 5GHz operation
      iwl4965: correctly validate temperature value

Stefan Metzmacher (1):
      usbnet/cdc_ncm: add missing .reset_resume hook

Tao Ma (1):
      wireless: Default to 'n' for 2 new added devices in Kconfig.

Wei Yongjun (2):
      sctp: stop pending timers and purge queues when peer restart asoc
      vlan: fix typo in vlan_dev_hard_start_xmit()

Wey-Yi Guy (1):
      iwlagn: fix incorrect PCI subsystem id for 6150 devices

Yogesh Ashok Powar (1):
      mwifiex: correct event header length

sjur.brandeland@stericsson.com (1):
      caif: Fix race when conditionally taking rtnl lock

 drivers/net/3c509.c                            |   14 +++---
 drivers/net/3c59x.c                            |    4 +-
 drivers/net/can/flexcan.c                      |    5 +-
 drivers/net/davinci_emac.c                     |   10 +++--
 drivers/net/depca.c                            |   35 ++++++++--------
 drivers/net/dm9000.c                           |    6 +-
 drivers/net/hp100.c                            |   12 +++---
 drivers/net/ibmlana.c                          |    4 +-
 drivers/net/irda/smsc-ircc2.c                  |   44 ++++++++++----------
 drivers/net/ks8842.c                           |    2 +-
 drivers/net/ne3210.c                           |   15 +++----
 drivers/net/smc-mca.c                          |    6 +-
 drivers/net/tg3.c                              |    2 +-
 drivers/net/tokenring/madgemc.c                |    2 +-
 drivers/net/tulip/de4x5.c                      |    4 +-
 drivers/net/usb/catc.c                         |    2 +-
 drivers/net/usb/cdc_ncm.c                      |    3 +-
 drivers/net/wireless/ath/ath9k/Kconfig         |    1 -
 drivers/net/wireless/ath/ath9k/ar9002_calib.c  |    2 +-
 drivers/net/wireless/ath/ath9k/ar9003_eeprom.c |   10 ++++-
 drivers/net/wireless/ath/ath9k/ar9003_phy.c    |   22 ++++++++++
 drivers/net/wireless/ath/ath9k/eeprom_9287.c   |   10 ++++-
 drivers/net/wireless/ath/ath9k/hw.c            |    5 ++-
 drivers/net/wireless/ath/ath9k/hw.h            |    2 +
 drivers/net/wireless/ath/ath9k/main.c          |    4 +-
 drivers/net/wireless/ath/ath9k/rc.c            |    3 +-
 drivers/net/wireless/b43/phy_n.c               |    2 +-
 drivers/net/wireless/iwlegacy/iwl-4965-lib.c   |    4 +-
 drivers/net/wireless/iwlegacy/iwl-4965.c       |    2 +-
 drivers/net/wireless/iwlwifi/iwl-6000.c        |   28 ++++++++----
 drivers/net/wireless/iwlwifi/iwl-agn.c         |    6 +-
 drivers/net/wireless/iwlwifi/iwl-agn.h         |    1 +
 drivers/net/wireless/libertas/cmd.c            |    6 +-
 drivers/net/wireless/mwifiex/sdio.h            |    4 +-
 drivers/net/wireless/rt2x00/Kconfig            |    1 -
 drivers/net/wireless/rtlwifi/pci.c             |   35 ++++++++++------
 drivers/net/wireless/wl12xx/conf.h             |    3 +
 drivers/net/wireless/wl12xx/main.c             |    1 +
 drivers/net/wireless/wl12xx/scan.c             |   49 +++++++++++++++-------
 drivers/net/wireless/wl12xx/scan.h             |    3 +
 drivers/net/wireless/zd1211rw/zd_usb.c         |   53 +++++++++++++++++++-----
 include/linux/ieee80211.h                      |    8 +++-
 include/linux/if_packet.h                      |    1 +
 include/net/sctp/command.h                     |    1 +
 include/net/sctp/structs.h                     |    2 +-
 include/trace/events/net.h                     |   12 +++--
 net/8021q/vlan_dev.c                           |    2 +-
 net/bluetooth/l2cap_core.c                     |    2 +-
 net/caif/chnl_net.c                            |    9 +---
 net/core/dev.c                                 |    7 ++-
 net/ipv4/af_inet.c                             |    3 +
 net/ipv4/ip_options.c                          |   15 ++++---
 net/mac80211/mlme.c                            |    7 +++
 net/mac80211/scan.c                            |    1 -
 net/packet/af_packet.c                         |   15 +++++-
 net/sctp/associola.c                           |   23 ++++++----
 net/sctp/sm_sideeffect.c                       |    3 +
 net/sctp/sm_statefuns.c                        |   14 +++++-
 net/wireless/nl80211.c                         |    4 +-
 net/wireless/scan.c                            |   43 +++++++++++--------
 60 files changed, 380 insertions(+), 219 deletions(-)

^ permalink raw reply	[flat|nested] 1456+ messages in thread
* [GIT] Networking
@ 2011-06-12  4:01 David Miller
  0 siblings, 0 replies; 1456+ messages in thread
From: David Miller @ 2011-06-12  4:01 UTC (permalink / raw)
  To: torvalds; +Cc: akpm, netdev, linux-kernel


1) Memory leak in ISDN hfcsusb driver, from Jesper Juhl.
2) Network device leak in netpoll setup, from Dan Carpenter
3) Fix error handling in get_net_ns_by_fd() and sanitize error
   return values of l2tp_dfs_seq_open(), from Al Viro.
4) Bridge netfilter fake rtable ops needs cow_metrics handler, otherwise
   we OOPS, from Alexander Holler.
5) Endianness fix in dl2k EEPROM code from Daniel Hellstrom.
6) Signedness fix in ip{,6}_queue from Dave Jones.
7) Mark lockdep classes in IRDA properly.
8) Prevent kernel stack data leak in af_packet, from Eric Dumazet.
9) ep93xx_eth DMA et al. fixes from Mika Westerberg.
10) Bonding screws up TX queue selection on the way down to physical
    device, save and restore it properly, from Neil HOrman.
11) Fix conntrack ct leak in l4proto->error(), from Pablo Neira Ayuso.
12) am79c961 fixes from Russell King
13) Channel switch locking fixes in ilwagn from Stanislaw Gruszka.
14) IPSEC replay handling has off-by-one error, from Steffen Klassert.
15) gianfar filter table needs to be per-device, from Wu Jiajun-B06378.
16) Turn off ath5k fast channel switching by default, causes problems
    for some people.  From Nick Kossifidis.
17) CPU offlining can stall packet processing, fix from Heiko Carstens.

Please pull, thanks a lot!

The following changes since commit b99ca60c83a631adaba9c2fff8f2dd14d3517a61:

  Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6 (2011-06-11 19:56:25 -0700)

are available in the git repository at:

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

Al Viro (2):
      get_net_ns_by_fd() oopses if proc_ns_fget() returns an error
      fix return values of l2tp_dfs_seq_open()

Alexander Holler (1):
      bridge: provide a cow_metrics method for fake_ops

Anirban Chakraborty (1):
      qlcnic: Fix bug in FW queue dump

Dan Carpenter (1):
      netpoll: call dev_put() on error in netpoll_setup()

Daniel Drake (1):
      libertas_sdio: handle spurious interrupts

Daniel Hellstrom (1):
      dl2k: EEPROM CRC calculation wrong endianess on bigendian machine

Dave Jones (1):
      netfilter: use unsigned variables for packet lengths in ip[6]_queue.

David S. Miller (4):
      Merge branch 'pablo/nf-2.6-updates' of git://1984.lsi.us.es/net-2.6
      Merge branch 'for-davem' of git://git.kernel.org/.../linville/wireless-2.6
      net: Rework netdev_drivername() to avoid warning.
      irda: iriap: Use seperate lockdep class for irias_objects->hb_spinlock

Eric Dumazet (3):
      netfilter: add more values to enum ip_conntrack_info
      af_packet: prevent information leak
      net: pmtu_expires fixes

Grant Likely (1):
      net: fix smc91x.c device tree support

H Hartley Sweeten (1):
      ep93xx_eth: Update MAINTAINERS

Heiko Carstens (1):
      net: cpu offline cause napi stall

Jesper Juhl (1):
      ISDN, hfcsusb: Don't leak in hfcsusb_ph_info()

Jiri Pirko (1):
      vlan: Fix the ingress VLAN_FLAG_REORDER_HDR check

Johannes Berg (1):
      mac80211: fix IBSS teardown race

John W. Linville (4):
      Merge branch 'master' of git://git.kernel.org/.../linville/wireless-2.6 into for-davem
      Revert "mac80211: Skip tailroom reservation for full HW-crypto devices"
      Revert "mac80211: stop queues before rate control updation"
      Merge branch 'master' of git://git.kernel.org/.../linville/wireless-2.6 into for-davem

Jozsef Kadlecsik (2):
      netfilter: ipset: Fix return code for destroy when sets are in use
      netfilter: ipset: Use the stored first cidr value instead of '1'

Julian Anastasov (2):
      ipvs: restore support for iptables SNAT
      netfilter: nf_nat: fix crash in nf_nat_csum

Luciano Coelho (1):
      nl80211: fix overflow in ssid_len

Marcus Meissner (1):
      net/ipv6: check for mistakenly passed in non-AF_INET6 sockaddrs

Mika Westerberg (5):
      ep93xx: set DMA masks for the ep93xx_eth
      net: ep93xx_eth: pass struct device to DMA API functions
      net: ep93xx_eth: allocate buffers using kmalloc()
      net: ep93xx_eth: drop GFP_DMA from call to dma_alloc_coherent()
      net: ep93xx_eth: fix DMA API violations

Mike McCormack (2):
      rtlwifi: Fix logic in rx_interrupt
      rtlwifi: Avoid modifying skbs that are resubmitted

Neil Horman (1):
      bonding: reset queue mapping prior to transmission to physical device (v5)

Nick Kossifidis (1):
      ath5k: Disable fast channel switching by default

Pablo Neira Ayuso (1):
      netfilter: nf_conntrack: fix ct refcount leak in l4proto->error()

Rafał Miłecki (1):
      ssb: fix PCI(e) driver regression causing oops on PCI cards

Russell King - ARM Linux (3):
      NET: am79c961: ensure asm() statements are marked volatile
      NET: am79c961: ensure multicast filter is correctly set at open
      NET: am79c961: fix assembler warnings

Stanislaw Gruszka (5):
      iwlagn: fix channel switch locking
      iwlagn: use cts-to-self protection on 5000 adapters series
      rt2x00: fix rmmod crash
      iwl4965: set tx power after rxon_assoc
      iwlegacy: fix channel switch locking

Steffen Klassert (2):
      xfrm: Fix off by one in the replay advance functions
      ipv4: Fix packet size calculation for raw IPsec packets in __ip_append_data

Sucheta Chakraborty (1):
      qlcnic: Avoid double free of skb in tx path

Thadeu Lima de Souza Cascardo (1):
      mac80211: call dev_alloc_name before copying name to sdata

WANG Cong (1):
      netpoll: prevent netpoll setup on slave devices

Wey-Yi Guy (1):
      iwlagn: send tx power command if defer cause by RXON not match

Williams, Mitch A (1):
      igb: fix i350 SR-IOV failture

Wu Jiajun-B06378 (1):
      gianfar:localized filer table

Yegor Yefremov (1):
      ethtool.h: fix typos

 MAINTAINERS                                    |    2 +-
 arch/arm/mach-ep93xx/core.c                    |    6 +-
 drivers/isdn/hardware/mISDN/hfcsusb.c          |    1 +
 drivers/net/arm/am79c961a.c                    |  126 ++++++++++++------------
 drivers/net/arm/ep93xx_eth.c                   |   82 ++++++++--------
 drivers/net/bonding/bond_main.c                |   11 ++
 drivers/net/dl2k.c                             |    2 +-
 drivers/net/gianfar.c                          |   29 +++---
 drivers/net/gianfar.h                          |    8 +-
 drivers/net/gianfar_ethtool.c                  |   64 ++++++------
 drivers/net/igb/igb_main.c                     |    3 +
 drivers/net/qlcnic/qlcnic_hw.c                 |    1 +
 drivers/net/qlcnic/qlcnic_main.c               |    1 +
 drivers/net/smc91x.c                           |    6 +-
 drivers/net/wireless/ath/ath5k/base.c          |   11 ++-
 drivers/net/wireless/ath/ath5k/reset.c         |    5 +-
 drivers/net/wireless/iwlegacy/iwl-4965.c       |   12 +--
 drivers/net/wireless/iwlegacy/iwl-core.c       |   30 +++---
 drivers/net/wireless/iwlegacy/iwl-core.h       |    2 +-
 drivers/net/wireless/iwlegacy/iwl-dev.h        |   13 +---
 drivers/net/wireless/iwlegacy/iwl4965-base.c   |   20 ++--
 drivers/net/wireless/iwlwifi/iwl-2000.c        |   74 --------------
 drivers/net/wireless/iwlwifi/iwl-5000.c        |    3 -
 drivers/net/wireless/iwlwifi/iwl-6000.c        |    2 -
 drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c    |   12 +--
 drivers/net/wireless/iwlwifi/iwl-agn-rxon.c    |   19 +++-
 drivers/net/wireless/iwlwifi/iwl-agn.c         |   19 ++--
 drivers/net/wireless/iwlwifi/iwl-core.c        |    6 +-
 drivers/net/wireless/iwlwifi/iwl-core.h        |    1 +
 drivers/net/wireless/iwlwifi/iwl-dev.h         |   13 +---
 drivers/net/wireless/iwlwifi/iwl-rx.c          |   24 +++---
 drivers/net/wireless/libertas/if_sdio.c        |   21 +++-
 drivers/net/wireless/rt2x00/rt2x00config.c     |    3 +-
 drivers/net/wireless/rt2x00/rt2x00dev.c        |    4 +
 drivers/net/wireless/rtlwifi/pci.c             |   30 +++---
 drivers/ssb/driver_pcicore.c                   |   10 +-
 include/linux/ethtool.h                        |    6 +-
 include/linux/if_packet.h                      |    2 +
 include/linux/if_vlan.h                        |   25 ++++-
 include/linux/netdevice.h                      |    2 +-
 include/linux/netfilter/nf_conntrack_common.h  |    3 +
 include/linux/skbuff.h                         |    5 +
 net/8021q/vlan_core.c                          |   60 ++++++-----
 net/bridge/br_netfilter.c                      |    6 +
 net/core/dev.c                                 |   23 ++---
 net/core/net_namespace.c                       |   16 ++--
 net/core/netpoll.c                             |    7 ++
 net/ipv4/ip_output.c                           |    6 +-
 net/ipv4/netfilter/ip_queue.c                  |    3 +-
 net/ipv4/netfilter/ipt_CLUSTERIP.c             |    6 +-
 net/ipv4/netfilter/ipt_MASQUERADE.c            |    2 +-
 net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c |    2 +-
 net/ipv4/netfilter/nf_conntrack_proto_icmp.c   |    2 +-
 net/ipv4/netfilter/nf_nat_core.c               |    2 +-
 net/ipv4/netfilter/nf_nat_helper.c             |    2 +-
 net/ipv4/netfilter/nf_nat_rule.c               |    2 +-
 net/ipv4/netfilter/nf_nat_standalone.c         |    4 +-
 net/ipv4/route.c                               |   78 ++++++++-------
 net/ipv6/af_inet6.c                            |    4 +
 net/ipv6/netfilter/ip6_queue.c                 |    3 +-
 net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c |    2 +-
 net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c |    2 +-
 net/irda/iriap.c                               |    5 +
 net/l2tp/l2tp_debugfs.c                        |    2 +-
 net/mac80211/ibss.c                            |    6 +-
 net/mac80211/ieee80211_i.h                     |    3 -
 net/mac80211/iface.c                           |    4 +
 net/mac80211/key.c                             |   21 +----
 net/mac80211/mlme.c                            |    6 -
 net/mac80211/tx.c                              |    7 +-
 net/netfilter/ipset/ip_set_core.c              |    2 +-
 net/netfilter/ipset/ip_set_hash_ipportnet.c    |   10 +-
 net/netfilter/ipset/ip_set_hash_net.c          |    8 +-
 net/netfilter/ipset/ip_set_hash_netport.c      |    6 +-
 net/netfilter/ipvs/ip_vs_core.c                |   16 ++--
 net/netfilter/nf_conntrack_core.c              |    7 +-
 net/netfilter/nf_conntrack_ftp.c               |    2 +-
 net/netfilter/nf_conntrack_h323_main.c         |   10 +-
 net/netfilter/nf_conntrack_irc.c               |    3 +-
 net/netfilter/nf_conntrack_pptp.c              |    3 +-
 net/netfilter/nf_conntrack_sane.c              |    2 +-
 net/netfilter/nf_conntrack_sip.c               |    2 +-
 net/netfilter/xt_socket.c                      |    4 +-
 net/packet/af_packet.c                         |    2 +
 net/sched/sch_generic.c                        |    3 +-
 net/wireless/nl80211.c                         |    9 +-
 net/xfrm/xfrm_replay.c                         |    4 +-
 87 files changed, 553 insertions(+), 545 deletions(-)

^ permalink raw reply	[flat|nested] 1456+ messages in thread
* [GIT] Networking
@ 2011-06-20 21:20 David Miller
  0 siblings, 0 replies; 1456+ messages in thread
From: David Miller @ 2011-06-20 21:20 UTC (permalink / raw)
  To: torvalds; +Cc: akpm, netdev, linux-kernel


1) IPVS namespace exit causes crash in conntrack, fix from
   Hans Schillstrom.

2) ieee802154_nl_fill_phy() memory leak fix from Jesper Juhl.

3) Fix IRQ autoprobing regression in 3c503 driver, from
   Ondrej Zary.

4) Fix oops in mwifiex driver when probing setting using
   ethtool, from Yogesh Ashok Powar.

5) Netfilter NAT code adjusts sequence numbers one too many times
   over loopback, fix from Julian Anastasov.

6) Bridge multicast code sets ->mrouters_only on wrong SKB, fix
   from Fernando Luis Vazquez Cao.

7) Rik van Riel reports a regression of using netpoll over bridge
   slave devices.  What's happening now is that once we have a device
   become a slave, we cannot allow it to have netpoll run over it.

   The situations that care about this (virtualization) should run
   the netconsole instance over the bridge device, but that only
   works if all slave devices support polling.  The exception
   that makes this difficult is the TUN driver.

   Fortunately, adding netpoll support to TUN is entirely trivial
   because all of it's receive events are synchronously triggered.

   Fix from Neil Horman, tested by Rik van Riel.

8) VLAN code invokes OPS without checking if the underlying device
   supports the offload feature, fix from Antoine Reversat.

9) Memory leak fix in bfin_mac driver, from Sonic Zhang.

10) RFS steering doesn't happen on the first pack of a passive TCP
    flow due to a missing sock_rps_record_flow() call in both ipv4
    and ipv6.  Fix from Eric Dumazet.

11) Module ref leak fixes in farsync and gigaset drivers, from
    Pavel Shved.

12) inet_diag byte code audit code is buggy and can cause loops as
    well as unaligned accesses.  Fix from Eric Dumazet.

13) Fix regression in multicast route lookups cause by the conversion
    to return error pointers, from Eric Dumazet.

Please pull, thanks a lot!

The following changes since commit ef46222e7b56e728e423527d430cb2013c595491:

  Merge branch 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen (2011-06-20 09:01:33 -0700)

are available in the git repository at:

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

Antoine Reversat (1):
      vlan: don't call ndo_vlan_rx_register on hardware that doesn't have vlan support

Changli Gao (1):
      ppp: use PPP_TRANS instead of the magic number 0x20

Clive Stubbings (1):
      fs_enet: fix freescale FCC ethernet dp buffer alignment

David Miller (1):
      Bluetooth: Do not ignore errors returned from strict_strtol()

David S. Miller (2):
      Merge branch 'master' of git://git.kernel.org/.../kaber/nf-2.6
      Merge branch 'davem.r8169' of git://git.kernel.org/.../romieu/netdev-2.6

Eric Dumazet (6):
      net: rfs: enable RFS before first data packet is received
      inet_diag: fix inet_diag_bc_audit()
      ipv4: fix multicast losses
      hp100: fix an skb->len race
      sgi-xp: fix a use after free
      netxen: fix race in skb->len access

Fernando Luis Vázquez Cao (2):
      IGMP snooping: set mrouters_only flag for IPv4 traffic properly
      IGMP snooping: set mrouters_only flag for IPv6 traffic properly

Filip Palian (1):
      Bluetooth: l2cap and rfcomm: fix 1 byte infoleak to userspace.

Francois Romieu (1):
      r8169: fix static initializers.

Geert Uytterhoeven (1):
      net/hplance: hplance_init() should be __devinit

Hans Schillstrom (1):
      IPVS netns exit causes crash in conntrack

Jesper Juhl (2):
      ieee802154: Don't leak memory in ieee802154_nl_fill_phy
      ipv4, ping: Remove duplicate icmp.h include

Joe Perches (1):
      MAINTAINERS: Update EBTABLES mailing list

John W. Linville (2):
      Merge branch 'master' of master.kernel.org:/.../padovan/bluetooth-2.6
      Merge branch 'master' of git://git.kernel.org/.../linville/wireless-2.6 into for-davem

Julian Anastasov (1):
      netfilter: nf_nat: avoid double seq_adjust for loopback

Luiz Augusto von Dentz (1):
      Bluetooth: fix shutdown on SCO sockets

Marius B. Kotsbak (1):
      net/usb: Add Samsung Kalmia driver for Samsung GT-B3730

Neil Horman (1):
      tun: teach the tun/tap driver to support netpoll

Nicolas Cavallari (1):
      netfilter: fix looped (broad|multi)cast's MAC handling

Nishant Sarmukadam (1):
      mwl8k: Tell firmware to generate CCMP header

Ondrej Zary (1):
      3c503: fix broken IRQ autoprobing

Patrick McHardy (3):
      Merge branch 'master' of git://git.kernel.org/.../horms/ipvs-2.6
      netfilter: ipt_ecn: fix protocol check in ecn_mt_check()
      netfilter: ipt_ecn: fix inversion for IP header ECN match

Pavel Shved (2):
      farsync: add module_put to error path in fst_open()
      gigaset: call module_put before restart of if_open()

Ralf Baechle (1):
      phylib: Allow BCM63XX PHY to be selected only on BCM63XX.

Richard Cochran (3):
      dp83640: fix phy status frame event parsing
      dp83640: drop PHY status frames in the driver.
      pxa168_eth: fix race in transmit path.

Sebastian Andrzej Siewior (1):
      netfilter: ip_tables: fix compile with debug

Sonic Zhang (1):
      netdev: bfin_mac: fix memory leak when freeing dma descriptors

Ville Tervo (1):
      Bluetooth: Do not send SET_EVENT_MASK for 1.1 and earlier devices

WANG Cong (1):
      netpoll: copy dev name of slaves to struct netpoll

Yogesh Ashok Powar (1):
      mwifiex: Fixing NULL pointer dereference

sjur.brandeland@stericsson.com (1):
      caif: Bugfix - XOFF removed channel from caif-mux

 MAINTAINERS                                    |    3 +-
 drivers/bluetooth/btmrvl_debugfs.c             |   12 +
 drivers/isdn/gigaset/interface.c               |    4 +-
 drivers/misc/sgi-xp/xpnet.c                    |    6 +-
 drivers/net/3c503.c                            |    3 +-
 drivers/net/bfin_mac.c                         |   20 +-
 drivers/net/bonding/bond_main.c                |    1 +
 drivers/net/fs_enet/mac-fcc.c                  |    2 +-
 drivers/net/hp100.c                            |    4 +-
 drivers/net/hplance.c                          |    2 +-
 drivers/net/netxen/netxen_nic_main.c           |    4 +-
 drivers/net/phy/Kconfig                        |    1 +
 drivers/net/phy/dp83640.c                      |   24 +-
 drivers/net/ppp_async.c                        |    4 +-
 drivers/net/pxa168_eth.c                       |    2 +-
 drivers/net/r8169.c                            |   10 +-
 drivers/net/tun.c                              |   24 ++-
 drivers/net/usb/Kconfig                        |   10 +
 drivers/net/usb/Makefile                       |    1 +
 drivers/net/usb/kalmia.c                       |  384 ++++++++++++++++++++++++
 drivers/net/wan/farsync.c                      |    4 +-
 drivers/net/wireless/mwifiex/cfg80211.c        |    2 +
 drivers/net/wireless/mwl8k.c                   |    4 +-
 include/net/netfilter/nf_conntrack.h           |    6 +
 net/8021q/vlan.c                               |    2 +-
 net/bluetooth/hci_event.c                      |   18 +-
 net/bluetooth/l2cap_sock.c                     |    1 +
 net/bluetooth/rfcomm/sock.c                    |    1 +
 net/bluetooth/sco.c                            |   13 +-
 net/bridge/br_device.c                         |    1 +
 net/bridge/br_multicast.c                      |    4 +-
 net/caif/cfmuxl.c                              |    2 +-
 net/ieee802154/nl-phy.c                        |    3 +-
 net/ipv4/af_inet.c                             |    1 +
 net/ipv4/inet_diag.c                           |   14 +-
 net/ipv4/netfilter/ip_queue.c                  |    3 +-
 net/ipv4/netfilter/ip_tables.c                 |    2 +-
 net/ipv4/netfilter/ipt_ecn.c                   |    7 +-
 net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c |    4 +-
 net/ipv4/ping.c                                |    1 -
 net/ipv4/route.c                               |    4 +-
 net/ipv4/tcp_ipv4.c                            |    1 +
 net/ipv6/netfilter/ip6_queue.c                 |    3 +-
 net/ipv6/tcp_ipv6.c                            |    1 +
 net/netfilter/ipvs/ip_vs_conn.c                |   10 +-
 net/netfilter/ipvs/ip_vs_core.c                |    1 +
 net/netfilter/nfnetlink_log.c                  |    3 +-
 net/netfilter/nfnetlink_queue.c                |    3 +-
 48 files changed, 563 insertions(+), 77 deletions(-)
 create mode 100644 drivers/net/usb/kalmia.c

^ permalink raw reply	[flat|nested] 1456+ messages in thread
* [GIT] Networking
@ 2011-06-30  9:40 David Miller
  0 siblings, 0 replies; 1456+ messages in thread
From: David Miller @ 2011-06-30  9:40 UTC (permalink / raw)
  To: torvalds; +Cc: akpm, netdev, linux-kernel


1) Bridge flooding fix from Herbert Xu.

2) ip_rt_bug can trigger in certain TPROXY situations, fix
   from Julian Anastasov.

3) Fix bluetooth L2CAP security check, from Luiz Augusto von Dentz.

4) zlib inflate buffer alloc can result in order-4 allocation, use
   vmalloc instead.

5) ipv6 UDP checks wrong variable for non-blocking condition, fix
   from Xufeng Zhang.

6) If UDP recvmsg ends up retrying, we need to clear the MSG_TRUNC
   flag as the next packet we're going to try might fit.  Fix
   from Xufeng Zhang.

7) Fix OOPS in rionet_remove, from Yinglin Luan.

8) Packet length calculation fixes in the ipv4 output path from
   Steffen Klassert.

9) Fix Kconfig deps for netconsole, from Randy Dunlap.

10) CAN Kconfig files were using "default Y" instead of "default y",
    fix from marc Kleine-Budde.

Please pull, thanks a lot!

The following changes since commit ca56a95eedcc95f8fea7b49c87565cd961d74fe2:

  Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 (2011-06-29 18:18:48 -0700)

are available in the git repository at:

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

Dan Carpenter (1):
      net/usb/kalmia: signedness bug in kalmia_bind()

Dave Jones (1):
      usbnet: Remove over-broad module alias from zaurus.

David S. Miller (2):
      Merge branch 'davem.r8169' of git://git.kernel.org/.../romieu/netdev-2.6
      net+crypto: Use vmalloc for zlib inflate buffers.

Francois Romieu (1):
      r8169: fix wrong register use.

Herbert Xu (1):
      bridge: Only flood unregistered groups to routers

Ilia Kolomisnky (1):
      Bluetooth: Fix L2CAP connection establishment

Johan Hedberg (1):
      Bluetooth: Fix accepting connect requests for defer_setup

John (Jay) Hernandez (1):
      cxgb3: skb_record_rx_queue now records the queue index relative to the net_device.

John W. Linville (2):
      Merge branch 'master' of master.kernel.org:/.../padovan/bluetooth-2.6
      Merge branch 'master' of git://git.kernel.org/.../linville/wireless-2.6 into for-davem

Julian Anastasov (1):
      netfilter: Fix ip_route_me_harder triggering ip_rt_bug

Larry Finger (2):
      rtlwifi: rtl8192se: Handle duplicate PCI ID 0x10ec:0x8192 conflict with r8192e_pci
      rtl8192cu: Fix missing firmware load

Luiz Augusto von Dentz (1):
      Bluetooth: Fix L2CAP security check

Marc Kleine-Budde (1):
      net/can: activate bit-timing calculation and netlink based drivers by default

Marius B. Kotsbak (1):
      net/usb: kalmia: Various fixes for better support of non-x86 architectures.

Mike Frysinger (2):
      MAINTAINERS: mark socketcan-core lists as subscribers-only
      MAINTAINERS: drop Michael from bfin_mac driver

Randy Dunlap (1):
      netconsole: fix build when CONFIG_NETCONSOLE_DYNAMIC is turned on

Ron Mercer (1):
      qlge: Add maintainer.

Steffen Klassert (2):
      ipv4: Fix packet size calculation in __ip_append_data
      ipv4: Fix IPsec slowpath fragmentation problem

Sven Eckelmann (1):
      MAINTAINERS: Remove Sven Eckelmann from BATMAN ADVANCED

Xufeng Zhang (2):
      ipv6/udp: Use the correct variable to determine non-blocking condition
      udp/recvmsg: Clear MSG_TRUNC flag when starting over for a new packet

Yinglin Luan (1):
      rionet: fix NULL pointer dereference in rionet_remove

 MAINTAINERS                                 |    7 +--
 crypto/deflate.c                            |    7 +--
 crypto/zlib.c                               |    7 +--
 drivers/net/Kconfig                         |    3 +-
 drivers/net/bnx2x/bnx2x_main.c              |    6 +-
 drivers/net/can/Kconfig                     |    4 +-
 drivers/net/cxgb3/sge.c                     |    4 +-
 drivers/net/ppp_deflate.c                   |    5 +-
 drivers/net/r8169.c                         |    2 +-
 drivers/net/rionet.c                        |   28 +++++++------
 drivers/net/usb/kalmia.c                    |   42 +++++++++++--------
 drivers/net/usb/zaurus.c                    |   10 ----
 drivers/net/wireless/rtlwifi/pci.c          |   13 +++++-
 drivers/net/wireless/rtlwifi/rtl8192cu/sw.c |   20 +++++++++
 net/bluetooth/hci_conn.c                    |    6 +-
 net/bluetooth/l2cap_core.c                  |   21 +++++++---
 net/bridge/br_multicast.c                   |    5 ++-
 net/ipv4/ip_output.c                        |   17 +++----
 net/ipv4/netfilter.c                        |   60 ++++++++++-----------------
 net/ipv4/netfilter/ipt_REJECT.c             |   14 ++----
 net/ipv4/udp.c                              |    3 +
 net/ipv6/udp.c                              |    5 ++-
 22 files changed, 155 insertions(+), 134 deletions(-)

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


1) iwl_tx_queue_reset() doesn't clear out the right number of slots,
   fix from Emmanuel Grumbach.

2) DMA buffer leak in iwlagn, fix from Johannes Berg.

3) iwlwifi command buffers need to be DMA mapped as "bidirectional" as
   the chip can write back to them sometimes, fix from Johannes Berg.

4) Fix OOPS in mac80211 on MIC failure, from Arik Nemtsov.

5) Fix lost power up during resume in ath9k, from Rajkumar Manoharan.

6) Memory leak in ath5k, fix from Bob Copeland.

7) 6pack/mkiss need to use BH locking, fix from Arnd Bergmann.

8) Get rid of artificial ipv6 routing table size limits, this is
   hitting real people now.

9) Don't send ICMP errors on local socket created MTU events.  Fix
   from Steffen Klassert.

10) Fix mailbox execution crash in qlge, from Jitendra Kalsaria.

11) Fix mixup between "spin_lock_irqsave()" flags and flags
    passed to request_irq in bna driver, fix from Shyam Iyer.

12) vlan_features not set properly in 8139too, from Shan Wei.

13) Fix DMA unmap length in natsemi, from FUJITA Tomonori.

14) Use more POSIX'ly correct when wrong address family is used
    during ipv4 bind().  From Marcus Meissner.

15) Fix MAC address setting in greth driver, from Kristoffer Glembo.

16) Regression fix, have to always flood broadcasts on bridge.  Fix
    from Herbert Xu.

17) Global memory limits of TCP/UDP/SCTP are miscalculated when lots
    of hugepages are reserved.  Fix from Eric Dumazet.

18) SCTP_SENDER_DRY_EVENT are not always sent when they should be, fix
    from Wei Yongjun.

Please pull, thanks a lot!

The following changes since commit 4dd1b49c6d215dc41ce50c80b4868388b93f31a3:

  Merge branch 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6 (2011-07-06 18:36:53 -0700)

are available in the git repository at:

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

Arik Nemtsov (1):
      mac80211: fix rx->key NULL dereference during mic failure

Arnd Bergmann (1):
      6pack,mkiss: fix lock inconsistency

David S. Miller (3):
      Merge branch 'for-davem' of git://git.kernel.org/.../linville/wireless-2.6
      ipv6: Don't change dst->flags using assignments.
      ipv6: Don't put artificial limit on routing table size.

Emmanuel Grumbach (1):
      iwlagn: Fix a bug introduced by the HUGE command removal

Eric Dumazet (1):
      net: refine {udp|tcp|sctp}_mem limits

Eugene A. Shatokhin (1):
      ath5k: fix memory leak when fewer than N_PD_CURVES are in use

Evgeni Golov (1):
      iwlagn: fix *_UCODE_API_MAX output in the firmware field

FUJITA Tomonori (1):
      natsemi: silence dma-debug warnings

Herbert Xu (1):
      bridge: Always flood broadcast packets

Jitendra Kalsaria (3):
      qlge:Fix crash caused by mailbox execution on wedged chip.
      qlge: Fix printk priority so chip fatal errors are always reported.
      qlge:Version change to v1.00.00.29

Johannes Berg (3):
      iwlagn: fix change_interface for P2P types
      iwlagn: fix cmd queue unmap
      iwlagn: map command buffers BIDI

John W. Linville (3):
      Merge branch 'wireless-2.6' of git://git.kernel.org/.../iwlwifi/iwlwifi-2.6
      iwlagn: use PCI_DMA_* for pci_* operations
      Merge branch 'master' of git://git.kernel.org/.../linville/wireless-2.6 into for-davem

Kristoffer Glembo (1):
      greth: greth_set_mac_add would corrupt the MAC address.

Marcus Meissner (1):
      net: bind() fix error return on wrong address family

Rajkumar Manoharan (1):
      ath9k: Fix suspend/resume when no interface is UP

Shan Wei (2):
      net: 8139too: Initial necessary vlan_features to support vlan
      net: vlan: enable soft features regardless of underlying device

Shreyas Bhatewara (2):
      vmxnet3: fix starving rx ring whenoc_skb kb fails
      vmxnet3: round down # of queues to power of two

Shyam Iyer (1):
      Fix call trace when interrupts are disabled while sleeping function kzalloc is called

Steffen Klassert (3):
      xfrm: Remove family arg from xfrm_bundle_ok
      ipv4: Don't use ufo handling on later transformed packets
      xfrm4: Don't call icmp_send on local error

Wei Yongjun (1):
      sctp: fix missing send up SCTP_SENDER_DRY_EVENT when subscribe it

Yoshihiro Shimoda (2):
      net: sh_eth: fix cannot work half-duplex mode
      net: sh_eth: fix the parameter for the ETHER of SH7757

 drivers/net/8139too.c                   |    1 +
 drivers/net/bna/bnad.c                  |    7 +-
 drivers/net/greth.c                     |    7 +-
 drivers/net/hamradio/6pack.c            |    4 +-
 drivers/net/hamradio/mkiss.c            |    4 +-
 drivers/net/natsemi.c                   |    3 +-
 drivers/net/qlge/qlge.h                 |    3 +-
 drivers/net/qlge/qlge_main.c            |   42 ++++++----
 drivers/net/sh_eth.c                    |    6 +-
 drivers/net/vmxnet3/vmxnet3_drv.c       |  138 ++++++++++++++++++++++---------
 drivers/net/vmxnet3/vmxnet3_int.h       |    5 +-
 drivers/net/wireless/ath/ath5k/eeprom.c |    8 +-
 drivers/net/wireless/ath/ath9k/pci.c    |    6 ++
 drivers/net/wireless/iwlwifi/iwl-1000.c |    5 +-
 drivers/net/wireless/iwlwifi/iwl-2000.c |    7 +-
 drivers/net/wireless/iwlwifi/iwl-5000.c |    5 +-
 drivers/net/wireless/iwlwifi/iwl-6000.c |    9 +-
 drivers/net/wireless/iwlwifi/iwl-core.c |    3 +-
 drivers/net/wireless/iwlwifi/iwl-tx.c   |   25 ++----
 include/net/cfg80211.h                  |    2 +-
 include/net/dst.h                       |    1 +
 net/8021q/vlan_dev.c                    |    5 +
 net/bridge/br_device.c                  |    4 +-
 net/bridge/br_input.c                   |    6 +-
 net/core/dst.c                          |    6 +-
 net/ipv4/af_inet.c                      |    4 +-
 net/ipv4/ip_output.c                    |    2 +-
 net/ipv4/tcp.c                          |   10 +--
 net/ipv4/udp.c                          |   10 +--
 net/ipv4/xfrm4_output.c                 |    7 ++-
 net/ipv6/af_inet6.c                     |    2 +-
 net/ipv6/route.c                        |   25 ++----
 net/mac80211/wpa.c                      |    8 ++-
 net/sctp/protocol.c                     |   11 +--
 net/sctp/socket.c                       |   23 +++++
 net/wireless/nl80211.c                  |    3 +-
 net/xfrm/xfrm_policy.c                  |    6 +-
 37 files changed, 257 insertions(+), 166 deletions(-)

^ permalink raw reply	[flat|nested] 1456+ messages in thread
* [GIT] Networking
@ 2011-07-13 19:31 David Miller
  0 siblings, 0 replies; 1456+ messages in thread
From: David Miller @ 2011-07-13 19:31 UTC (permalink / raw)
  To: torvalds; +Cc: akpm, netdev, linux-kernel


1) SLIP config ifdefs surround wrong bits of code, fix from
   Matvejchikov Ilya.

2) Natsemi does DMA unmaps using wrong length, fix from Jim Cromie.

3) Two SCTP fixes from Thomas Graf.  Do not deadlock on graceful
   shutdown when data chunks exist in the retransmit queue.  Also,
   if behave like TCP if receiver closes with data still queued up
   on receive by emitting an ABORT.

4) Fix use after free in HSO driver, from Octavian Purdila.

5) Natsemi module parms permissions are busted, from Jean Delvare.

6) Fix memory leak in XFRM state code, from Tushar Gohad.

7) Fix vulnerability in mac80211 TKIP replay handling, from Johannes
   Berg.

8) Several bluetooth fixes:
	Buffer overflow in l2cap from Dan Rosenberg
	HIDP disconnect deadlocks from Peter Hurley
	Incoming L2CAP regression fix from Gustavo F. Padovan
	Memory leak in hci_conn from Tomas Targownik

9) ath5k driver stores "ieee80211_hw" pointer in drvdata but then
   tries to use it as a "ath5k_softc" pointer, fix from Pavel roskin.

10) Fix deadlock in rfkill/sched_scan code of cfg80211 by using a new
    mutex, fix from Luciano Coelho.

Please pull, thanks a lot!

The following changes since commit 8d86e5f91440aa56a5df516bf58fe3883552ad56:

  Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc (2011-07-12 14:21:19 -0700)

are available in the git repository at:

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

Christian Lamparter (1):
      carl9170: add NEC WL300NU-AG usbid

Dan Rosenberg (1):
      Bluetooth: Prevent buffer overflow in l2cap config request

David S. Miller (2):
      net: Fix default in docs for tcp_orphan_retries.
      Merge branch 'for-davem' of git://git.kernel.org/.../linville/wireless-2.6

Greg Kroah-Hartman (1):
      hso: fix a use after free condition

Gustavo F. Padovan (1):
      Bluetooth: Fix regression with incoming L2CAP connections

Jean Delvare (1):
      net/natsemi: Fix module parameter permissions

Jim Cromie (1):
      natsemi: fix another dma-debug report

Johannes Berg (1):
      mac80211: fix TKIP replay vulnerability

John W. Linville (2):
      Merge branch 'master' of master.kernel.org:/.../padovan/bluetooth-2.6
      Merge branch 'master' of git://git.kernel.org/.../linville/wireless-2.6 into for-davem

Luciano Coelho (2):
      cfg80211: fix deadlock with rfkill/sched_scan by adding new mutex
      mac80211: fix ie memory allocation for scheduled scans

Matvejchikov Ilya (1):
      slip: fix wrong SLIP6 ifdef-endif placing

Pavel Roskin (2):
      ath5k: fix incorrect use of drvdata in sysfs code
      ath5k: fix incorrect use of drvdata in PCI suspend/resume code

Peter Hurley (1):
      Bluetooth: Fix hidp disconnect deadlocks and lost wakeup

Rafał Miłecki (1):
      ssb: fix init regression of hostmode PCI core

Rajkumar Manoharan (1):
      ath9k: Fix tx throughput drops for AR9003 chips with AES encryption

Thomas Graf (2):
      sctp: Enforce retransmission limit during shutdown
      sctp: ABORT if receive, reassmbly, or reodering queue is not empty while closing socket

Tomas Targownik (1):
      Bluetooth: Fix memory leak under page timeouts

Tushar Gohad (1):
      XFRM: Fix memory leak in xfrm_state_update

Yoann DI-RUZZA (1):
      rtlwifi: rtl8192cu: Add new USB ID for Netgear WNA1000M

 Documentation/networking/ip-sysctl.txt      |    2 +-
 drivers/net/natsemi.c                       |    6 ++--
 drivers/net/slip.c                          |    2 +-
 drivers/net/usb/hso.c                       |    7 +++--
 drivers/net/wireless/ath/ath5k/pci.c        |    7 ++++-
 drivers/net/wireless/ath/ath5k/sysfs.c      |    9 +++++--
 drivers/net/wireless/ath/ath9k/xmit.c       |    3 +-
 drivers/net/wireless/ath/carl9170/usb.c     |    2 +
 drivers/net/wireless/rtlwifi/rtl8192cu/sw.c |    1 +
 drivers/ssb/driver_pcicore.c                |   18 +++++++-------
 include/net/sctp/command.h                  |    1 +
 include/net/sctp/ulpevent.h                 |    2 +-
 net/bluetooth/hci_conn.c                    |    3 ++
 net/bluetooth/hidp/core.c                   |   18 +++++++++------
 net/bluetooth/hidp/hidp.h                   |    1 +
 net/bluetooth/l2cap_core.c                  |    5 ++-
 net/mac80211/scan.c                         |    3 +-
 net/mac80211/wpa.c                          |   16 +++++++++++--
 net/sctp/outqueue.c                         |   20 ++++++++++++++++-
 net/sctp/sm_sideeffect.c                    |   20 +++++++++++++++-
 net/sctp/sm_statefuns.c                     |   32 +++++++++++++++++++-------
 net/sctp/sm_statetable.c                    |    2 +-
 net/sctp/socket.c                           |   13 ++++++----
 net/sctp/ulpevent.c                         |   16 +++++++++++--
 net/wireless/core.c                         |   12 +++++++--
 net/wireless/core.h                         |    2 +
 net/wireless/nl80211.c                      |   24 +++++++++++++++-----
 net/wireless/scan.c                         |   10 ++++----
 net/xfrm/xfrm_state.c                       |    2 +
 29 files changed, 187 insertions(+), 72 deletions(-)



^ permalink raw reply	[flat|nested] 1456+ messages in thread
* [GIT] Networking
@ 2011-07-16 17:43 David Miller
  2011-07-17 14:36 ` Ed Tomlinson
  0 siblings, 1 reply; 1456+ messages in thread
From: David Miller @ 2011-07-16 17:43 UTC (permalink / raw)
  To: torvalds; +Cc: akpm, netdev, linux-kernel


A small batch of fixes:

1) Fix two regressions in checksum offload handling.
   a) Do not set SCTP packets to CHECKSUM_UNNECESSARY, we don't
      have software fallbacks in the TX path for SCTP checksumming
      and therefore won't be able to handle a divert of a packet
      from a device that can do SCTP checksums to one that cannot.
   b) We propagate certain hardware offloads transparently through
      "software" devices (like vlan and bonding) but we cannot do
      that when we lack software fallbacks in the TX path and this
      is relevant for SCTP and FCoE checksumming.  Get rid of the
      NETIF_F_ALL_TX_OFFLOADS macro since it's misuse is what
      introduced this regression.

2) L2CAP bluetooth connection procedure regression fix from
   Gustavo F. Padovan.

3) L2CAP incomming connections can crash with defer_setup enabled
   because ->parent isn't setup yet, handle that properly.  Also
   from Gustavo.

4) gianfar driver need to be more selective of when the RX parser
   of the chip is enabled, from Sebastian Poehn.

5) r6040 NAPI logic has a bug that can disabled interrupts forever,
   fix from Michael Thalmeier.

Please pull, thanks a lot!

The following changes since commit 1765a367a3b5d5e9692949b0c5ec933eff2c0701:

  Merge branch 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6 (2011-07-15 18:03:30 -0700)

are available in the git repository at:

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

Gustavo F. Padovan (1):
      Bluetooth: Fix regression in L2CAP connection procedure

Ilia Kolomisnky (1):
      Bluetooth: Fix crash with incoming L2CAP connections

Michael Thalmeier (1):
      r6040: only disable RX interrupt if napi_schedule_prep is successful

Michał Mirosław (2):
      net: sctp: fix checksum marking for outgoing packets
      net: remove NETIF_F_ALL_TX_OFFLOADS

Sebastian Pöhn (1):
      gianfar: rx parser

 drivers/net/bonding/bond_main.c |    6 +++---
 drivers/net/gianfar.c           |   24 +++++++++++++++++++-----
 drivers/net/gianfar.h           |    3 ++-
 drivers/net/r6040.c             |    8 +++++---
 include/linux/netdevice.h       |    6 ------
 net/8021q/vlan_dev.c            |    6 +++++-
 net/bluetooth/l2cap_core.c      |    9 +++++----
 net/sctp/output.c               |   19 ++++++++-----------
 8 files changed, 47 insertions(+), 34 deletions(-)

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


A few last-minute stragglers.  The Tulip debug message thing, in
particular, is a really annoying regression for people who have
that hardware.

1) pr_*() conversion of tulip driver turned some commented out messages
   into pr_debug() which spams the log, just kill them off.  From Joe
   Perches.

2) PPPOE connections are keyed on MAC address, so we have to flush all
   connections on a device when the MAC address changes since until we
   renegotiate with the new MAC address the remote end won't see any
   of our packets.

3) linux/sdla.h has a kernel function declaration in the userspace
   visible area.  In fact this function hasn't been in the kernel for
   years so just remove it outright.  From WANG Cong.

Please pull, thanks a lot.

The following changes since commit dc6b845044ccb7e9e6f3b7e71bd179b3cf0223b6:

  si4713-i2c: avoid potential buffer overflow on si4713 (2011-07-18 09:12:21 -0700)

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

David S. Miller (1):
      pppoe: Must flush connections when MAC address changes too.

Joe Perches (1):
      tulip: dmfe: Remove old log spamming pr_debugs

WANG Cong (1):
      include/linux/sdla.h: remove the prototype of sdla()

 drivers/net/pppoe.c      |    3 ++-
 drivers/net/tulip/dmfe.c |    4 ----
 include/linux/sdla.h     |    6 +-----
 3 files changed, 3 insertions(+), 10 deletions(-)

^ permalink raw reply	[flat|nested] 1456+ messages in thread
* [GIT] Networking
@ 2011-07-22 14:33 David Miller
  2011-08-01 15:13 ` Ingo Molnar
  0 siblings, 1 reply; 1456+ messages in thread
From: David Miller @ 2011-07-22 14:33 UTC (permalink / raw)
  To: torvalds; +Cc: akpm, netdev, linux-kernel


A bit less going on than in the past few releases, most notable this
time is:

1) There are currently 3 or 4 ways to add VLAN support for a driver,
   which is just crazy.  Jiri Pirko is trying to consolidate things so
   we have less of a mess here.

2) The Neighbour layer has been simplifier and sped up.  It had complexity
   purely for the sake of allowing situations that simply never happen.
   This removed some indirect calls in the fast path.

   It even had a method pointer that everyone assigned to the same global
   routine. :-)

   There will be more activity in this area in the future.

3) New driver for rtl8192de wireless chipset.

4) PowerPC 64-bit now has a BPF JIT too.

5) Get more drivers supporting 64-bit device stats, thanks to Stephen
   Hemminger.

6) Sometimes a config change can happen mid-dump in netlink, we can now
   detect this situation using sequence numbers and decide to rescan
   if we want to.

7) SKB zero-copy buffer support for virtualization from Shirley Ma.

8) Improve scalability of inetpeer table by removing the explicit
   unused list and killing off some false sharing.  From Eric Dumazet.

9) AF_PACKET sockets now support a "fanout" facility, whereby you can
   distribute packet capture amongst a group of sockets.  This will be
   used by userland traffic analysis tools such as suricata.

Please pull, thanks a lot!

The following changes since commit 02f8c6aee8df3cdc935e9bdd4f2d020306035dbe:

  Linux 3.0 (2011-07-21 19:17:23 -0700)

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

Ajit Khaparde (1):
      be2net: move to new vlan model

Alexander Duyck (19):
      v2 ethtool: remove support for ETHTOOL_GRXNTUPLE
      ixgbe: remove ntuple filtering
      ixgbe: fix flags relating to perfect filters to support coexistence
      ixgbe: update perfect filter framework to support retaining filters
      ixgbe: add basic support for setting and getting nfc controls
      ixgbe: add support for displaying ntuple filters via the nfc interface
      ixgbe: add support for nfc addition and removal of filters
      ixgbe: fix ring assignment issues for SR-IOV and drop cases
      ixgbe: pass adapter struct instead of netdev for interrupt data
      ixgbe: Convert IXGBE_DESC_UNUSED from macro to static inline function
      ixgbe: Move all values that deal with count, next_to_use, next_to_clean to u16
      ixgbe: Add one function that handles most of context descriptor setup
      ixgbe: Update method used for determining descriptor count for an skb
      ixgbe: Make certain to initialize the fdir_perfect_lock in all cases
      ixgbe: Update ATR to use recorded TX queues instead of CPU for routing
      ixgbe: inline the ixgbe_maybe_stop_tx function
      ixgbe: add structure for containing RX/TX rings to q_vector
      ixgbe: Move interrupt related values out of ring and into q_vector
      ixgbe: Pass staterr instead of re-reading status and error bits from descriptor

Alexander Smirnov (2):
      ieee802154: free skb buffer if dev isn't running
      Exclude duplicated checking for iface-up. This flags is checked in 'is_skb_forwardable' function, which is subroutine of 'dev_forward_skb'.

Alexey Dobriyan (3):
      net: remove interrupt.h inclusion from netdevice.h
      net: fix MIPS fallout from "net: remove interrupt.h inclusion from netdevice.h"
      net: remove mm.h inclusion from netdevice.h

Allan Stephens (20):
      tipc: Convert fatal broadcast sanity check to non-fatal check
      tipc: Remove unused sanity test macro
      tipc: Standardize exit logic for message rejection handling
      tipc: Add sanity check to detect rejection of non-payload messages
      tipc: Optimize routing of returned payload messages
      tipc: Optimizations & corrections to message rejection
      tipc: Eliminate message header routines for caching destination node
      tipc: Eliminate redundant masking in message header routines
      tipc: Partition name table instance array info into two parts
      tipc: Convert name table publication lists to standard kernel lists
      tipc: Eliminate checks for empty zone list during name translation
      tipc: Correct typo in link statistics output
      tipc: Eliminate unused field in bearer structure
      tipc: Remove unnecessary includes in socket code
      tipc: Eliminate useless check when creating internal message
      tipc: Cleanup of message header size terminology
      tipc: Optimize creation of FIN messages
      tipc: Reject connection protocol message sent to unconnected port
      tipc: Don't create payload message using connection protocol routine
      tipc: Optimize creation of connection protocol messages

Aloisio Almeida Jr (3):
      NFC: add NFC socket family
      NFC: pn533: add NXP pn533 nfc device driver
      NFC: add Documentation/networking/nfc.txt

Amit Kumar Salecha (5):
      qlcnic: fix default operating state of interface
      net: add external loopback test in ethtool self test
      qlcnic: add external loopback support
      qlcnic: define error code for loopback test
      netxen: add fw version compatibility check

Amitkumar Karwar (7):
      mwifiex: remove support for old chipsets W0/W1
      mwifiex: get rid of global adapter pointer
      mwifiex: remove casts of void pointers
      mwifiex: modify SDIO aggregation Tx/Rx buffer size
      mwifiex: fix regression in WEP security mode
      mwifiex: fix minor issue in debugfs command 'info'
      mwifiex: 11n specific configuration for transmit

Amos Kong (1):
      tun: do not put self in waitq if doing a nonblock read

Anderson Briglia (7):
      Bluetooth: Add advertising report meta event structs
      Bluetooth: Implement the first SMP commands
      Bluetooth: Start SMP procedure
      Bluetooth: Add simple SMP pairing negotiation
      Bluetooth: Add LE SMP Cryptoolbox functions
      Bluetooth: Add SMP confirmation structs
      Bluetooth: Add SMP confirmation checks methods

Anderson Lizardo (1):
      Bluetooth: fix missing parameter for HCI_OP_DISCONNECT

Andre Guedes (15):
      Bluetooth: LE advertising cache
      Bluetooth: Add Advertising Report Meta Event handler
      Bluetooth: Clear advertising cache before scanning
      Bluetooth: Advertising entries lifetime
      Bluetooth: Add 'dst_type' field to struct hci_conn
      Bluetooth: Remove useless check in hci_connect()
      Bluetooth: Check advertising cache in hci_connect()
      Bluetooth: Set 'peer_addr_type' in hci_le_connect()
      Bluetooth: Add extfeatures to struct hci_dev
      Bluetooth: Write LE Host Supported command
      Bluetooth: Add enable_le module parameter
      Bluetooth: Add lmp_host_le_capable() macro
      Bluetooth: Remove enable_smp parameter
      Bluetooth: Fix potential deadlock in hci_core
      Bluetooth: Fix potential deadlock in mgmt

Andre Heider (3):
      ps3_gelic: Fix typos
      ps3_gelic: Fix start_xmit kick error path
      ps3_gelic: Don't kill the device on DMA failure

Andrew Morton (1):
      drivers/net/wireless/rtlwifi/rtl8192de/phy.c: fix udelay() usage

Andy Gospodarek (1):
      ixgbe: only enable WoL for magic packet by default

Andy Shevchenko (1):
      net: can: remove custom hex_to_bin()

Anirban Chakraborty (4):
      qlcnic: Remove holding api lock while taking the dump
      qlcnic: Add code to tune FW dump
      qlcnic: Add support to enable/disable FW dump capability
      qlcnic: change capture mask for FW dump

Antonio Quartulli (19):
      batman-adv: move neigh_node->if_incoming->if_status check in find_router()
      batman-adv: move smallest_signed_int(), seq_before() and seq_after() into main.h
      batman-adv: use is_broadcast_ether_addr() instead of compare_eth(.., brd_addr)
      batman-adv: a multiline comment should precede the variable it is describing
      batman-adv: Unify the first 3 bytes in each packet
      batman-adv: improved client announcement mechanism
      batman-adv: improved roaming mechanism
      batman-adv: protect the local and the global trans-tables with rcu
      batman-adv: add wrapper function to throw uevent in userspace
      batman-adv: gateway election code refactoring
      batman-adv: throw uevent in userspace on gateway add/change/del event
      batman-adv: improved gateway tq-based selection
      batman-adv: unify flags for tt_change/tt_local_entry/tt_global_entry
      batman-adv: add_bcast_packet_to_list() takes the sending delay as parameter
      batman-adv: pass a unique flag arg instead of a sequence of bool ones
      batman-adv: initialise last_ttvn and tt_crc for the orig_node structure
      batman-adv: keep local table consistency for further TT_RESPONSE
      batman-adv: keep global table consistency in case of roaming
      batman-adv: request the full table if tt_crc doesn't match

Antti Julku (2):
      Bluetooth: Move blacklisting functions to hci_core
      Bluetooth: Add blacklisting support for mgmt interface

Arend van Spriel (3):
      lib: crc8: add new library module providing crc8 algorithm
      lib: cordic: add library module providing cordic angle calculation
      drivers: bcma: export bcma_core_disable() function

Ariel Elior (2):
      bnx2x: Renaming the "reset_task" to "sp_rtnl_task"
      bnx2x: Multiple concurrent l2 traffic classes

Arik Nemtsov (11):
      mac80211: reestablish mis-configured existing Rx BA sessions
      mac80211: dynamic PS - don't enter PS when TX frames are pending
      mac80211: propagate information about STA WME support down
      wl12xx: AP-mode - use mac80211 indication about STA WME support
      wl12xx: AP mode - support FW TX inactivity triggers
      wl12xx: use 802.11 header location after relocation to frame start
      wl12xx: schedule TX packets according to FW occupancy
      wl12xx: implement Tx watermarks per AC
      wl12xx: initialize max_power levels for 11a channels
      wl12xx: always initialize AP-mode max power level
      wl12xx: start/stop queues according to global per-AC counters

Barry Grussling (1):
      DSA: Enable cascading in multi-chip 6131 configuration

Bastian Blank (1):
      xen/netback: Add module alias for autoloading

Ben Dooks (1):
      net: DM9000: Add support for byte EEPROM access

Ben Greear (2):
      af-packet: Hold reference to bound network devices.
      af-packet: Use existing netdev reference for bound sockets.

Ben Hutchings (7):
      sfc: Fix loop condition for efx_filter_search() when !for_insert
      sfc: Allow resets to be upgraded; use atomic ops for safety
      sfc: Fix mapping of reset reasons and flags to methods
      sfc: Fix assertions in efx_filter_rfs()
      sfc: Remove 'Solarstorm' from Kconfig descriptions
      sfc: Remove 'Communications' after 'Solarflare' in references to hardware
      ethtool: Allow zero-length register dumps again

Benjamin Herrenschmidt (1):
      sungem: Spring cleaning and GRO support

Bill Sommerfeld (1):
      ipv4: Constrain UFO fragment sizes to multiples of 8 bytes

Bjørn Mork (1):
      Disable router anycast address for /127 prefixes

Bruce Allan (8):
      e1000e: disable far-end loopback mode on ESB2
      e1000e: 82579 intermittently disabled during S0->Sx
      e1000e: log when swflag is cleared unexpectedly on ICH/PCH devices
      e1000e: do not schedule the Tx queue until ready
      e1000e: access multiple PHY registers on same page at the same time
      e1000e: Clear host wakeup bit on 82577/8 without touching PHY page 800
      e1000e: remove redundant reverse dependency on CRC32
      e1000e: update driver version

Carolyn Wyborny (5):
      igb: Change version to remove number after -k in kernel versions.
      igb: Fix lack of flush after register write and before delay
      igb: Update copyright on all igb driver files.
      igb: Add support of SerDes Forced mode for certain hardware
      e1000e: Add Jumbo Frame support to 82583 devices

Chaoming Li (12):
      rtlwifi: rtl8192de: Merge def.h
      rtlwifi: rtl8192de: Merge dynamic management routines
      rtlwifi: rtl8192de: Merge firmware routines
      rtlwifi: rtl8192de: Merge hardware routines
      rtlwifi: rtl8192de: Merge led routines
      rtlwifi: rtl8192de: Merge phy routines
      rtlwifi: rtl8192de: Merge register definitions
      rtlwifi: rtl8192de: Merge rf routines
      rtlwifi: rtl8192de: Merge main (sw) routines
      rtlwifi: rtl8192de: Merge table routines
      rtlwifi: rtl8192de: Merge TX and RX routines
      rtlwifi: rtl8192de: Modify Kconfig and Makefile routines for new driver

Chetan Loke (1):
      af-packet: fix - avoid reading stale data

Choi, Jong-Hwan (1):
      net: Kobj and queues_kset should be used when CONFIG_XPS is enabled

Chris Friesen (1):
      netfilter: ipset: fix compiler warnings "'hash_ip4_data_next' declared inline after being called"

Christian Lamparter (6):
      carl9170: import 1.9.4 firmware headers
      carl9170: enable IEEE80211_HW_NEED_DTIM_PERIOD
      carl9170: allow PSM if the 5 GHz band is selected
      mac80211: fix smatch complains
      carl9170: use carl9170 queue enums
      carl9170: Implement tx_frames_pending mac80211 callback function

Connor Hansen (1):
      drivers/ssb/driver_chipcommon_pmu.c: uninitilized warning

Dan Carpenter (9):
      b43: check for allocation failures
      rtnetlink: unlock on error path in netlink_dump()
      iwlegacy: fix up brokenness caused by cleanup
      dcb: use nlmsg_free() instead of kfree()
      mwifiex: restore handling of NULL parameters
      rtlwifi: potential forever loop in rtl92de_hw_init()
      wanxl: remove a stray irq enable
      dcbnl: unlock on an error path in dcbnl_cee_fill()
      skbuff: fix error handling in pskb_copy()

Daniel Baluta (1):
      skbuff: update struct sk_buff members comments

Daniel Drake (2):
      libertas: add sd8686 reset_card support
      libertas: fix handling of command timeout, completion and interruption

Daniel Halperin (1):
      iwlwifi: disambiguate invalid DMA index warnings

Daniele Furlan (1):
      batman-adv: accept delayed rebroadcasts to avoid bogus routing under heavy load

David Howells (1):
      batman-adv: count_real_packets() in batman-adv assumes char is signed

David Lamparter (2):
      net: add 802.1ad / 802.1ah / QinQ ethertypes
      net: vlan, qlcnic: make vlan_find_dev private

David Miller (4):
      Bluetooth: Kill set but not used variable 'l2cap_sk' in rfcomm_sock_getsockopt_old()
      Bluetooth: Do not ignore errors returned from strict_strtol()
      Bluetooth: Kill set but unused variable 'cmd' in cmtp_recv_capimsg()
      ipv4: Inline neigh binding.

David S. Miller (59):
      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
      Merge branch 'master' of master.kernel.org:/.../davem/net-2.6
      sctp: Guard IPV6 specific code properly.
      Merge branch 'can/at91-sam9x5' of git://git.pengutronix.de/git/mkl/linux-2.6
      Merge branch 'batman-adv/next' of git://git.open-mesh.org/ecsv/linux-merge
      Merge branch 'batman-adv/next' of git://git.open-mesh.org/ecsv/linux-merge
      Merge branch 'master' of master.kernel.org:/.../davem/net-2.6
      net: Fix build failures due to ip_is_fragment()
      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
      Merge branch 'tipc-Jun24-2011' of git://git.kernel.org/.../paulg/net-next-2.6
      Merge branch 'master' of master.kernel.org:/.../jkirsher/net-next-2.6
      Merge branch 'for-next' of git://git2.kernel.org/.../lowpan/lowpan
      Merge branch 'for-davem' of git://git.kernel.org/.../linville/wireless-next-2.6
      Merge branch 'batman-adv/next' of git://git.open-mesh.org/linux-merge
      packet: Add helpers to register/unregister ->prot_hook
      packet: Add fanout support.
      ipv4: Add ip_defrag() agent IP_DEFRAG_AF_PACKET.
      packet: Add pre-defragmentation support for ipv4 fanouts.
      Merge branch 'master' of master.kernel.org:/.../davem/net-2.6
      veth: Kill unused code label and code block.
      packet: Add 'cpu' fanout policy.
      packet: Fix leak in pre-defrag support.
      rose: Delete commented out references to ancient firewalling code.
      packet: Fix build with INET disabled.
      Merge branch 'batman-adv/next' of git://git.open-mesh.org/linux-merge
      Merge branch 'for-davem' of git://git.kernel.org/.../linville/wireless-next-2.6
      neigh: Store hash shift instead of mask.
      ipv4: Use universal hash for ARP.
      Merge branch 'master' of master.kernel.org:/.../jkirsher/net-next-2.6
      netdevice: Kill 'feature' test macros.
      net: Push protocol type directly down to header_ops->cache()
      net: Kill support for multiple hh_cache entries per neighbour
      net: Embed hh_cache inside of struct neighbour.
      Merge branch 'master' of master.kernel.org:/.../davem/net-2.6
      Merge branch 'master' of git://git.kernel.org/.../bwh/sfc-next
      Merge branch 'davem-next.r8169' of git://git.kernel.org/.../romieu/netdev-2.6
      Merge branch 'for-davem' of git://git.kernel.org/.../linville/wireless-next-2.6
      ipv4: Use calculated 'neigh' instead of re-evaluating dst->neighbour
      ipv6: Use calculated 'neigh' instead of re-evaluating dst->neighbour
      net: Create and use new helper, neigh_output().
      neigh: Simply destroy handling wrt. hh_cache.
      neigh: Kill neigh_ops->hh_output
      neigh: Kill hh_cache->hh_output
      neigh: Kill ndisc_ops->queue_xmit
      neigh: Pass neighbour entry to output ops.
      ipv6: Get rid of rt6i_nexthop macro.
      net: Abstract dst->neighbour accesses behind helpers.
      net: Add ->neigh_lookup() operation to dst_ops
      Merge branch 'davem-next.r8169' of git://git.kernel.org/.../romieu/netdev-2.6
      Merge branch 'vhost-net-next' 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
      Merge branch 'master' of master.kernel.org:/.../davem/net-2.6
      Merge branch 'master' of master.kernel.org:/.../jkirsher/net-next-2.6
      net: Fix ppc64 BPF JIT dependencies.
      Merge branch 'vhost-net-next' of git://git.kernel.org/.../mst/vhost
      icmp: Fix regression in nexthop resolution during replies.

Dmitry Eremin-Solenikov (3):
      fakehard: stop setting platform_data as it's unused anymore
      ieee802154: support specifying hw address for created devices
      ieee802154: it's IEEE 802.15.4, not ZigBee

Dmitry Kravkov (16):
      bnx2x: do not allocate FCoE ring if disabled
      bnx2x: remove references to intr_sem
      bnx2x: put start bd csum in separate function
      bnx2x: avoid release of unrequested irqs
      bnx2x: disable fairness if ETS is enabled
      bnx2x: dump FW memory when appropriate msglvl is raised
      bnx2x: use bnx2x_reload_if_running
      bnx2x: removed unused variables
      bnx2x: update DCB data during PMF migration
      bnx2x: Cosmetic changes.
      bnx2x: PFC support for 578xx
      bnx2x: Fix compilation when CNIC is not selected in config
      bnx2x: add missing command in error handling flow
      bnx2x: DCB rework
      bnx2x: fix MB index for 4-port devices
      bnx2x: disable FCoE for 578xx devices since not yet supported

Dmitry.Tarnyagin (1):
      caif: Add CAIF HSI Link layer driver

Don Fry (1):
      iwlagn: remove iwlagn_hcmd_utils structure and call directly

Don Skidmore (2):
      ixgbe: update driver version string
      ixgbe: convert to ndo_fix_features

Eddie Wai (1):
      cnic: Randomize initial TCP port for iSCSI connections

Eduardo Bacchi Kienetz (1):
      rt2800usb: Add new device ID for Belkin

Eliad Peller (18):
      mac80211: add ieee80211_get_operstate() function
      mac80211: add cancel_hw_scan() callback
      mac80211: quiesce vif before suspending
      wl12xx: add support for rx streaming
      wl12xx: add automatic rx streaming triggers
      wl12xx: add rx_streaming debugfs entry
      wl12xx: remove unused crc7 references
      wl12xx: fix erroneous commit (cb5ae0)
      wl12xx: don't check wow param on suspend/resume
      wl12xx: clear wl->wow_enabled on resume
      wl12xx: enable/disable beacon filtering on ap suspend/resume
      wl12xx_sdio: enable wowlan only if enable_irq_wake() succeeded
      wl12xx: check the vif's operstate after join
      wl12xx: use _ni version of ieee80211_tx_status
      wl12xx: use freezable workqueue for netstack_work
      wl12xx: configure suspend/resume only if associated/started
      wl12xx: add stop_scan command
      wl12xx: implement cancel_hw_scan() callback

Emil Tantilov (5):
      ixgbe: add support for Dell CEM
      ixgbe: move setting RSC into a separate function
      ixgbe: move reset code into a separate function
      ixgbe: disable RSC when Rx checksum is off
      ixgbe: remove ifdef check for non-existent define

Emmanuel Grumbach (28):
      iwlagn: solve sparse warning
      iwlagn: free the ICT ISR when the request_irq failed
      iwlagn: don't disable interrupts after the NIC has been reset
      iwlagn: add a iwl_pci.[ch] files that will contain all PCI specific code
      iwlagn: remove uneeded include to pci.h and dma_mapping.h from a few files
      iwlagn: introduce iwl_bus and iwl_bus_ops
      iwlagn: add get_dev to iwl_bus_ops
      iwlagn: move PCI related operations from probe and remove to PCI layer
      iwlagn: don't use the PCI wrappers for DMA operation
      iwlagn: add a method to get the HW ID description as a string to iwl_bus_ops
      iwlagn: don't read the PCI_REVISION_ID from iwl-agn.c
      iwlagn: add a get_irq method to iwl_bus_ops and use it
      iwlagn: finally kill the pointer to pci_dev from iwl-dev.h
      iwlagn: waterfall the bus level if prepare card failed
      iwlagn: fix misplaced bracket
      iwlagn: warn about nested SYNC commands
      iwlagn: store the irq number to iwl_bus just like dev
      iwlagn: introduce transport layer and implement rx_init
      iwlagn: add rx_free to transport layer
      iwlagn: move the tx allocation funcs to the transport layer
      iwlagn: remove the indirection for the rx write pointer
      iwlagn: remove the CMD_MAPPED flag
      iwlagn: add an API to free the TX context
      iwlagn: add an API for RX stop
      iwlagn: add an API for TX stop
      iwlagn: remove code duplication
      iwlagn: consolidate the API that sends host commands and move to transport
      iwlagn: provide heplers to access the transport ops

Eric Dumazet (23):
      inetpeer: remove unused list
      inetpeer: lower false sharing effect
      snmp: reduce percpu needs by 50%
      l2tp: fix l2tp_ip_sendmsg() route handling
      veth: fix 64bit stats on 32bit arches
      myricom: remove stats_lock
      b44: use dev_kfree_skb() in b44_tx()
      veth: Kill unused tx_dropped
      net: sched: constify tcf_proto and tc_action
      sky2: use GFP_KERNEL allocations at device setup
      af_packet: lock imbalance
      bna: use netdev_alloc_skb_ip_align()
      net: introduce __netdev_alloc_skb_ip_align
      e1000e: remove e1000_queue_stats
      inetpeer: kill inet_putpeer race
      be2net: account for skb allocation failures
      netfilter: nfnetlink: add RCU in nfnetlink_rcv_msg()
      netfilter: nfnetlink_queue: provide rcu enabled callbacks
      ipv4: save cpu cycles from check_leaf()
      netfilter: nfnetlink_queue: assert monotonic packet ids
      ipv6: unshare inetpeers
      ipv6: make fragment identifications less predictable
      acenic: include NET_SKB_PAD headroom to incoming skbs

Fabrice Deyber (1):
      ath9k: Further fix for mesh beaconing

Felipe Balbi (5):
      net: wl12xx: sdio: id_tables should be __devinitconst
      net: wl12xx: remove some unnecessary prints
      net: wl12xx: care for optional operations
      net: wl12xx: remove the nops
      net: wl12xx: remove unnecessary prints

Felix Fietkau (20):
      ath9k: unify edma and non-edma tx code, improve tx fifo handling
      ath9k_hw: remove ath9k_hw_get_desc_link
      ath9k: show excessive-retry MPDUs in debugfs
      ath9k_hw: remove hardcoded PLL overrides for AR9280
      ath9k_hw: always enable 5 GHz fast clock for AR9280
      ath9k_hw: fix MAC clock for half/quarter rate
      ath9k_hw: fix MAC clock rate for AR9287 v1.3+
      ath9k_hw: initialize more timing related registers for half/quarter channels
      ath9k_hw: remove ar9287 v1.3+ specific hardcoded register hacks
      ath9k_hw: set 5 GHz half/quarter channels on AR9002 using fractional mode
      ath9k_hw: fix synth delay for half/quarter channels
      ath9k_hw: add a missing delay for an analog register
      ath5k: add missing checks for rfgain probe
      ath5k: apply the synth voltage tweak only on AR5112 rev 2
      ath5k: fix reference clock frequency for spur mitigation on AR2413
      ath5k: initialize common->clockrate
      ath5k: delay full calibration after reset
      ath5k: fix reference clock usec duration setting restore
      ath5k: disable 32KHz sleep clock operation by default
      ath5k: do not call ieee80211_stop_queue for queues not managed by mac80211

Florian Westphal (1):
      netfilter: nfnetlink_queue: batch verdict support

Francois Romieu (4):
      r8169: move the firmware down into the device private data.
      r8169: explicit firmware format check.
      r8169: check firmware content sooner.
      r8169: fix sticky accepts packet bits in RxConfig.

Fry, Donald H (3):
      iwlagn: remove the indirection for update_chain_flags
      iwlagn: remove the indirection for iwl_apm_init
      iwlagn: remove indirection for eeprom_query_addr

Gabor Juhos (32):
      ath9k: define mac version for AR9330
      ath9k: define device id for AR9330
      ath9k: add MAC revision detection for AR9330
      ath9k: add platform device id for AR9330
      ath9k: add AR9330 initvals
      ath9k: initialize mode registers for AR9330
      ath9k: initialize tx gain table for AR9330
      ath9k: initialize rx gain table for AR9330
      ath9k: add AR9330 specific PLL initialization
      ath9k: use different BB watchdog timeout value for AR9330
      ath9k: don't enable LDPC for AR9330
      ath9k: read spur frequency information from eeprom for AR9330
      ath9k: fix channel frequency calculation for AR9340
      ath9k: configure RF channel frequency for AR9330
      ath9k: enable TX/RX data byte swap for AR9330
      ath9k: skip internal regulator configuration for AR9330
      ath9k: enable tuning capacitance configuration for AR9330
      ath9k: use correct EEPROM base for AR9330
      ath9k: configure xpa bias level for AR9330
      ath9k: set NF limits for AR9330
      ath9k: enable antenna diversity for AR9330
      ath9k: use correct max_streams for AR9330
      ath9k: add a missing case statement to ath_ant_div_comb_alt_check
      ath9k: fix antenna diversity configuration for non AR9485 chips
      ath9k: remove superfluous parentheses
      ath9k: add fast_div_bias configuration for diversity group 1
      ath9k: set diversity group for AR9330
      ath9k: fix few register offsets for AR9330
      ath9k: configure diversity based on eeprom contents for AR9330
      ath9k: configure internal regulator for AR9330
      ath9k: add external_reset callback to ath9k_platfom_data for AR9330
      ath9k: enable support for AR9330

Geert Uytterhoeven (2):
      net/m68k: Include <linux/interrupt.h> where needed
      bcma: main.c needs to include <linux/slab.h>

Geoff Levand (1):
      net/ps3: Fix gelic RX DMA restart

Gerrit Renker (6):
      dccp: Clean up slow-path input processing
      dccp: combine the functionality of enqeueing and cloning
      dccp: cosmetics of info message
      dccp ccid-2: move rfc 3390 function into header file
      dccp ccid-2: Use existing function to test for data packets
      dccp ccid-2: Perform congestion-window validation

Gertjan van Wingerde (12):
      rt2x00: Enable PA_PE bits in TX_PIN_CFG according to active band.
      rt2x00: Don't disable G0 PA_PE bit in case of BT coexistence.
      rt2x00: Add support for RT3572/RT3592/RT3592+Bluetooth combo card
      rt2x00: Interface sequence lock doesn't have to disable interrupts.
      rt2x00: Move rt2800_txdone and rt2800_txdone_entry_check to rt2800usb.
      rt2x00: Enabled rt35xx device support by default.
      rt2x00: Serialize TX operations on a queue.
      rt2x00: Don't use queue entry as parameter when creating TX descriptor.
      rt2x00: Reduce window of a queue's tx lock.
      rt2x00: Add device ID for RT539F device.
      rt2x00: Properly identify rt2800usb devices.
      rt2x00: Implement tx_frames_pending mac80211 callback function.

Giuseppe CAVALLARO (4):
      stmmac: update the version (V2)
      stmmac: remove warning when compile as built-in (V2)
      stmmac: unify MAC and PHY configuration parameters (V2)
      stmmac: improve and up-to-date the documentation

Greg Dietsche (10):
      iwlegacy: remove unreachable code
      iwlegacy: remove unecessary if statement
      iwlegacy: return -EINVAL instead of -1
      iwlegacy: propagate error return value
      iwlegacy: add missing null check
      qlge: remove unecessary if statement
      iwlwifi: remove unecessary if statement
      net: icplus: remove unnecessary code
      e1000: remove unnecessary code
      net: rds: fix const array syntax

Greg Rose (3):
      rtnetlink: Compute and store minimum ifinfo dump size
      ixgbevf: Update the driver string
      ixgbevf: Fix bungled declaration of ixgbevf_mbx_ops

Guo-Fu Tseng (3):
      jme: Fix compile warning introduced by new pm macro
      jme: Cleanup PM operations after using new PM API
      jme: Fix unmap error (Causing system freeze)

Gustavo F. Padovan (23):
      Bluetooth: fix set but not used warning
      Bluetooth: Create __l2cap_chan_close()
      Bluetooth: Create l2cap_chan_send()
      Bluetooth: Add chan->chan_type struct member
      Bluetooth: create channel timer to replace sk_timer
      Bluetooth: Remove export of l2cap_chan_clear_timer()
      Bluetooth: Rename __l2cap_chan_close() to l2cap_chan_close()
      Merge master.kernel.org:/.../padovan/bluetooth-2.6
      Bluetooth: Merge l2cap_chan_create() in the l2cap_sock_alloc()
      Bluetooth: Add l2cap_chan_ops abstraction
      Bluetooth: add recv() callback to l2cap_chan_ops
      Bluetooth: add close() callback to l2cap_chan_ops
      Bluetooth: Add state tracking to struct l2cap_chan
      Bluetooth: Add refcnt to struct l2cap_chan
      Bluetooth: Make timer functions generic
      Bluetooth: keep reference if any ERTM timer is enabled
      Bluetooth: Don't forget to check for LE_LINK
      Bluetooth: use bit operation on conf_state
      Bluetooth: Use bit operations on conn_state
      Bluetooth: Fix locking in blacklist code
      Merge master.kernel.org:/.../padovan/bluetooth-2.6
      Bluetooth: Fix bad locking balance
      Bluetooth: Clean up unused struct hci_conn items

Hans Schillstrom (4):
      IPVS remove unused var from migration to netns
      IPVS: rename of netns init and cleanup functions.
      IPVS: labels at pos 0
      IPVS: remove unused init and cleanup functions.

Hauke Mehrtens (3):
      ssb: add __devinit to some functions
      ssb: fix ssb clock rate according to broadcom source
      bcma: add check if sprom is available before accessing it.

Hayes Wang (8):
      r8169: support new firmware format.
      r8169: adjust some registers.
      r8169: modify the flow of the hw reset.
      r8169: add ERI functions.
      r8169: support RTL8111E-VL.
      r8169: fix wake on lan setting for non-8111E.
      r8169: don't enable rx when shutdown.
      r8169: adjust the RxConfig settings.

Ian Abbott (1):
      lib/checksum.c: optimize do_csum a bit

Ido Yariv (4):
      wl12xx: Check for FW quirks as soon as the FW boots
      wl12xx: Avoid recovery while one is already in progress
      wl12xx: Support routing FW logs to the host
      wl12xx: Increase low & high TX watermarks

Ilia Kolomisnky (1):
      Bluetooth: Fixes l2cap "command reject" reply according to spec

Jaikumar Ganesh (1):
      Bluetooth: Add BT_POWER L2CAP socket option.

Jan Engelhardt (1):
      netfilter: xt_CT: provide info on why a rule was rejected

Jason Wang (3):
      virtio_net: introduce VIRTIO_NET_HDR_F_DATA_VALID
      vhost: init used ring after backend was set
      vhost: set log when updating used flags or avail event

Javier Lopez (1):
      mac80211_hwsim driver support userspace frame tx/rx

Jean Delvare (1):
      ipw2100: Fix command list for debugging

Jeff Kirsher (2):
      e1000e: use GFP_KERNEL allocations at init time
      68360enet: Remove Kconfig/Makefile references

Jeffrey Huang (1):
      bnx2: Add MCP dump

Jerry Chu (1):
      tcp: RFC2988bis + taking RTT sample from 3WHS for the passive open side

Jesper Juhl (4):
      Remove redundant linux/version.h includes from net/
      net: Remove unneeded version.h includes from drivers/net/
      net, wireless: Don't return uninitialized in __cfg80211_stop_sched_scan()
      drivers/net: static should be at beginning of declaration

Jesse Gross (2):
      vmxnet3: Convert to new vlan model.
      vmxnet3: Enable GRO support.

Jiri Bohac (1):
      bonding: clean up bond_del_vlan()

Jiri Pirko (47):
      bonding: allow all slave speeds
      vlan: finish removing vlan_find_dev from public header
      vlan: introduce __vlan_find_dev_deep()
      nes: do vlan cleanup
      ehea: do vlan cleanup
      lro: kill lro_vlan_hwaccel_receive_skb
      lro: kill lro_vlan_hwaccel_receive_frags
      lro: do vlan cleanup
      amd8111e: do vlan cleanup
      atl1c: do vlan cleanup
      atl1e: do vlan cleanup
      bnad: do vlan cleanup
      chelsio: do vlan cleanup
      cxgb4vf: do vlan cleanup
      cxgb4: remove forgotten unused vlan_group
      enic: do vlan cleanup
      gianfar: do vlan cleanup
      igbvf: do vlan cleanup
      jme: do vlan cleanup
      mlx4: do vlan cleanup
      qlge: do vlan cleanup
      s2io: do vlan cleanup
      spider_net: do not mention dying vlan_hwaccel_receive_skb
      tehuti: do vlan cleanup
      vlan: kill vlan_hwaccel_receive_skb
      ixgbevf: do vlan cleanup
      acenic: do vlan cleanup
      via-velocity: do vlan cleanup
      starfire: do vlan cleanup
      ns83820: do vlan cleanup
      atl1: do vlan cleanup
      atl2: do vlan cleanup
      cxgb3: do vlan cleanup
      vlan: kill __vlan_hwaccel_rx and vlan_hwaccel_rx
      e1000: do vlan cleanup
      forcedeth: do vlan cleanup
      igb: do vlan cleanup
      vxge: do vlan cleanup
      qeth: do vlan cleanup
      vlan: kill vlan_gro_frags and vlan_gro_receive
      stmmac: do vlan cleanup
      qlcnic: remove usage of vlan_group_get_device
      staging: et131x: remove unused prototype et131x_vlan_rx_register
      bonding: do vlan cleanup
      macvlan: do vlan cleanup
      vlan: kill ndo_vlan_rx_register
      vlan: move vlan_group_[gs]et_device to public header

Joe Perches (47):
      net: 8021q: Add pr_fmt
      net: Remove unnecessary semicolons
      drivers/net: Remove unnecessary semicolons
      include/net: Remove unnecessary semicolons
      net: Remove casts of void *
      gianfar: Use pr_<level>, netdev_<level> and netif_<level>
      drivers/net: Remove casts of void *
      ariadne: Update style, neaten, restructure to eliminate prototypes
      a2065: Use pr_fmt, pr_<level> and netdev_<level>
      lib8390: Use pr_<level> and netdev_<level>
      lib8390: Indent braces appropriately
      lib8390: Normalize source code spacing
      lib8390: Convert include <asm to include <linux
      lib8390: Remove unnecessary extern
      zorro8390: Update style, neaten, restructure to eliminate prototypes
      generic_hdlc: Update to current logging forms
      cosa: Update to current logging forms
      cyclom: Update to current logging forms
      frame relay dlci/frad: Update to current logging forms
      dscc4: Update to current logging forms
      farsync: Update to current logging forms
      ixp4xx_hss: Update to current logging forms
      wan: Update to current logging forms
      rt2x00: Fix unspeficied typo
      caif: Fix recieve/receive typo
      Bluetooth: Rename function bt_err to bt_to_errno
      Bluetooth: Add bt_printk
      appletalk: Reduce switch/case indent
      decnet: Reduce switch/case indent
      econet: Reduce switch/case indent
      ipconfig: Reduce switch/case indent
      netfilter: Reduce switch/case indent
      ipv4: Reduce switch/case indent
      ipv6: Reduce switch/case indent
      lapb: Reduce switch/case indent
      netrom: Reduce switch/case indent
      sctp: Reduce switch/case indent
      sunrpc: Reduce switch/case indent
      x25: Reduce switch/case indent
      netpoll: Remove unused EXPORT_SYMBOLs of netpoll_poll and netpoll_poll_dev
      netpoll: Remove wrapper function netpoll_poll
      af_econet: Use current logging styles and neatening
      b44: Use pr_<level>_once and DRV_DESCRIPTION
      benet: Add missing comma between constant string array
      ath5k: Add missing breaks in switch/case
      iwlegacy: Add missing comma between constant string array
      iwlagn: Add missing comma between constant string array

Johan Hedberg (1):
      Bluetooth: Remove unnecessary use of hci_dev_list_lock

Johannes Berg (30):
      iwlagn: fix dual-mode RXON
      iwlagn: advertise interface combinations
      iwlagn: fix interface combinations
      Bluetooth: fix sparse & gcc warnings
      iwlagn: don't check ucode subtype
      netlink: advertise incomplete dumps
      nl80211: use netlink consistent dump feature for BSS dumps
      iwlagn: use PM ops macro
      iwlagn: fix cmd queue unmap
      iwlagn: extend host command timeout
      iwlagn: fill beacon TX rate properly
      iwlagn: don't use CCK rates for P2P interfaces
      wireless: unify QoS control field definitions
      mac80211: restrict advertised HW scan rates
      iwlagn: verify mutex held for sync commands
      mac80211: allow driver to impose WoWLAN restrictions
      mac80211: allow driver to iterate keys
      cfg80211/nl80211: support GTK rekey offload
      mac80211: support GTK rekey offload
      mac80211: fix TKIP races, make API easier to use
      mac80211: fix CCMP races
      mac80211: fix CMAC races
      mac80211: use AES_BLOCK_SIZE
      mac80211: simplify RX PN/IV handling
      mac80211: allow drivers to access key sequence counter
      mac80211: allow driver to generate P1K for IV32
      cfg80211: fix docbook
      mac80211: fix docbook
      mac80211: allocate only one RX queue
      mac80211: allow driver to disconnect after resume

John Fastabend (21):
      macvlan: add VLAN filters to lowerdev
      ixgbe: dcbnl reduce duplicated code and indentation
      ixgbe: consolidate packet buffer allocation
      ixgbe: consolidate MRQC and MTQC handling
      ixgbe: configure minimal packet buffers to support TC
      ixgbe: DCB use existing TX and RX queues
      ixgbe: DCB 82598 devices, tx_idx and rx_idx swapped
      ixgbe: setup redirection table for multiple packet buffers
      ixgbe: fix bit mask for DCB version
      ixgbe: DCB and perfect filters can coexist
      ixgbe: DCB, remove unneeded ixgbe_dcb_txq_to_tc() routine
      dcb: Add DCBX capabilities bitmask to the get_ieee response
      net: dcbnl, add multicast group for DCB
      dcb: Add ieee_dcb_setapp() to be used for IEEE 802.1Qaz APP data
      dcb: Add ieee_dcb_delapp() and dcb op to delete app entry
      dcb: Add dcb_ieee_getapp_mask() for drivers to query APP settings
      dcb: fix return type on dcb_setapp()
      dcb: Add missing error check in dcb_ieee_set()
      ixgbe: com