There are a small number of minor conflicts to resolve in this pull:
1) An earlier point of Eric Biederman's userns tree was pulled into
net-next to decrease the amount of conflict resolution we have
to do now and it mostly worked out.
There are some small, minor, merge hassles still to address though.
For all of them you should basically take the hunk in your tree
rather than the hunk in net-next.
2) The ath9k driver has a merge conflict with ASPM PCI changes.
Retain the part from your tree the uses the new pci_*() interface
instead of poking around directly in PCI space.
Take the if() conditional from the net-next side, since that
adds a chipset variant to the test.
3) feature-removal-schedule.txt removed from your tree, edited
in net-next, retain the removal.
Notable changes this time around:
1) GRE now works over ipv6, from Dmitry Kozlov.
2) Make SCTP more network namespace aware, from Eric Biederman.
3) TEAM driver now works with non-ethernet devices, from Jiri Pirko.
4) Make openvswitch network namespace aware, from Pravin B. Shelar.
5) IPV6 NAT implementation, from Patrick McHardy.
6) Server side support for TCP Fast Open, from Jerry Chu and others.
7) Packet BPF filter supports MOD and XOR, from Eric Dumazet and
Daniel Borkmann.
8) Increate the loopback default MTU to 64K, from Eric Dumazet.
9) Use a per-task rather than per-socket page fragment allocator
for outgoing networking traffic. This benefits processes that
have very many mostly idle sockets, which is quite common.
From Eric Dumazet.
10) Use up to 32K for page fragment allocations, with fallbacks
to smaller sizes when higher order page allocations fail.
Benefits are a) less segments for driver to process b)
less calls to page allocator c) less waste of space.
From Eric Dumazet.
11) Allow GRO to be used on GRE tunnels, from Eric Dumazet.
12) VXLAN device driver, one way to handle VLAN issues such as
the limitation of 4096 VLAN IDs yet still have some level
of isolation. From Stephen Hemminger.
As usual there is a large boatload of driver changes, with the scale
perhaps tilted towards the wireless side this time around.
Please pull, thanks a lot!
The following changes since commit 6672d90fe779dc0dfffe027c3ede12609df091c2:
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (2012-09-28 10:09:33 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git master
for you to fetch changes up to a3a6cab5ea10cca64d036851fe0d932448f2fe4f:
hyperv: Add buffer for extended info after the RNDIS response message. (2012-10-02 14:39:31 -0400)
----------------------------------------------------------------
AceLan Kao (1):
Revert "rfkill: remove dead code"
Akeem G. Abodunrin (2):
igb: Supported and Advertised Pause Frame
igb: Support to enable EEE on all eee_supported devices
Alan Cox (3):
af_unix: old_cred is surplus
wireless: remove unreachable code
tcp: Document use of undefined variable.
Alan Ott (3):
6lowpan: Make a copy of skb's delivered to 6lowpan
6lowpan: handle NETDEV_UNREGISTER event
ieee802154: MRF24J40 driver
Alex Bergmann (1):
tcp: Increase timeout for SYN segments
Alexander Duyck (24):
ixgbe: Remove code that was initializing Rx page offset
ixgbe: combine ixgbe_add_rx_frag and ixgbe_can_reuse_page
ixgbe: Only use double buffering if page size is less than 8K
ixgbe: Have the CPU take ownership of the buffers sooner
ixgbe: Make pull tail function separate from rest of cleanup_headers
ixgbe: Copybreak sooner to avoid get_page/put_page and offset change overhead
ixgbe: Make allocating skb and placing data in it a separate function
ixgbe: Roll RSC code into non-EOP code
ixgbe: Rewrite code related to configuring IFCS bit in Tx descriptor
ixgbevf: Add suspend and resume support to the VF
ixgbevf: Cleanup handling of configuration for jumbo frames
ipv4: Minor logic clean-up in ipv4_mtu
ixgbe: Fix ordering of things so that PF correctly configures its VLANs
ixgbe: Fix VF rate limiting to correctly account for more queues per VF
igb: Remove artificial restriction on RQDPC stat reading
ixgbevf: Add support for VF API negotiation
igb: Remove logic that was doing NUMA pseudo-aware allocations
igb: Change Tx cleanup loop to do/while instead of for
igb: Change how we populate the RSS indirection table
igb: Simplify how we populate the RSS key
igb: Use dma_unmap_addr and dma_unmap_len defines
ixgbevf: Fix code for handling timeout
ixgbevf: Add fix to VF to handle multi-descriptor buffers
ixgbevf: Return error on failure to enable VLAN
Allan, Bruce W (1):
mdio: translation of MMD EEE registers to/from ethtool settings
Amerigo Wang (9):
net: move and rename netif_notify_peers()
net: remove netdev_bonding_change()
ipv6: remove some useless RCU read lock
netpoll: call ->ndo_select_queue() in tx path
ipv6: add a new namespace for nf_conntrack_reasm
ipv6: unify conntrack reassembly expire code with standard one
ipv6: make ip6_frag_nqueues() and ip6_frag_mem() static inline
ipv6: unify fragment thresh handling code
l2tp: fix compile error when CONFIG_IPV6=m and CONFIG_L2TP=y
Amit Beka (1):
iwlwifi: fix FW restart on init FW
Amitkumar Karwar (16):
mwifiex: do le_to_cpu conversion for Rx packet header elements
mwifiex: update max_chan_per_scan correctly for SSID scan
mwifiex: improve scan delay logic during Tx traffic
mwifiex: notify cfg80211 about MIC failures
mwifiex: release semaphore acquired for internal scan operation
mwifiex: don't disable wait_q_enabled flag
mwifiex: remove get operation code for SUBSCRIBE EVENT command
mwifiex: remove 11N_CFG command response handler
mwifiex: remove AMSDU_AGGR_CTRL command response handler
mwifiex: have same priority for AP and station traffic
mwifiex: update adapter->bss_prio_tbl[j].bss_prio_cur correctly
mwifiex: use country ie of requested AP while associating
mwifiex: support custom world regulatory domain
mwifiex: fix issue in resumed scan operation
mwifiex: disconnect the device before entering suspend state
mwifiex: block scan request during heavy Tx traffic
Andi Kleen (1):
brcm80211: Remove bogus memcpy in ai_detach
Andre Guedes (17):
Bluetooth: Remove missing code
Bluetooth: Use lmp_bredr_capable where applicable
Bluetooth: Use lmp_le_capable where applicable
Bluetooth: Use lmp_ssp_capable where applicable
Bluetooth: Use lmp_esco_capable where applicable
Bluetooth: Use lmp_rswitch_capable where applicable
Bluetooth: Use lmp_sniff_capable where applicable
Bluetooth: Use lmp_sniffsubr_capable where applicable
Bluetooth: Use lmp_no_flush_capable where applicable
Bluetooth: Remove locking in hci_user_passkey_request_evt
Bluetooth: Trivial refactoring
Bluetooth: Fix hci_le_conn_complete_evt
Bluetooth: Remove unneeded code
Bluetooth: Refactor hci_cs_le_create_conn
Bluetooth: Find hci_conn by BT_CONNECT state
Bluetooth: Lookup hci_conn in hci_le_conn_complete_evt
Bluetooth: Refactor in hci_le_conn_complete_evt
Andreas Larsson (1):
can: sja1000: Add support for listen-only mode and one-shot mode
Andrei Emeltchenko (15):
Bluetooth: mgmt: Managing only BR/EDR HCI controllers
Bluetooth: debug: Fix printing A2MP cmd code format
Bluetooth: debug: Fix printing refcnt for hci_conn
Bluetooth: trivial: Fix mixing spaces and tabs in smp
Bluetooth: Define AMP controller statuses
Bluetooth: Do not shadow hdr variable
Bluetooth: Fix processing A2MP chan in security_cfm
Bluetooth: Make connect / disconnect cfm functions return void
Bluetooth: trivial: Shorten variable scope
Bluetooth: trivial: Use preferred method for NULL check
Bluetooth: Remove unneeded zero init
Bluetooth: trivial: Make hci_chan_del return void
Bluetooth: trivial: Remove empty line
Bluetooth: debug: Print refcnt for hci_dev
Bluetooth: AMP: Add Read Data Block Size to amp_init
Andy Shevchenko (2):
wireless: at76c50x: eliminate hex2str()
ipconfig: fix trivial build error
AnilKumar Ch (6):
can: c_can: Modify c_can device names
can: c_can: Add device tree support to Bosch C_CAN/D_CAN controller
can: c_can: Add runtime PM support to Bosch C_CAN/D_CAN controller
can: c_can: Add d_can suspend resume support
can: c_can: Adopt pinctrl support
can: c_can: fix segfault during rmmod
Antonio Quartulli (9):
mac80211: add supported rates change notification in IBSS
ath9k_htc: implement sta_rc_update() mac80211 callback
batman-adv: move function arguments on one line
batman-adv: add reference counting for type batadv_tt_orig_list_entry
batman-adv: fix typos in comments
batman-adv: detect not yet announced clients
batman-adv: change interface_rx to get orig node
mac80211: move ieee80211_send_deauth_disassoc outside mlme code
mac80211: reply to AUTH with DEAUTH if sta allocation fails in IBSS
Arend van Spriel (16):
wext: include wireless event id when it has a size problem
brcmfmac: add callback for nl80211 testmode command
cfg80211: remove obsolete comment for .sched_scan_stop() callback
brcmfmac: add parameter check in brcmf_c_mkiovar()
brcmfmac: simplify handling e-scan result firmware event
brcmfmac: fix sparse warnings in e-scan related code
brcmfmac: extend brcmf_term_iscan() to abort e-scan
brcmfmac: introduce scheduled scan support
brcmfmac: change struct brcmf_cfg80211_priv comments to kernel-doc
brcmfmac: get rid of void pointer in struct brcmf_cfg80211_priv
brcmfmac: get rid of extern keyword in wl_cfg80211.h
brcmfmac: use brcmf_cfg80211_priv to interface with wl_cfg80211 code
brcmfmac: remove two obsolete structure definitions
brcmfmac: rename structure brcmf_cfg80211_priv
brcmfmac: remove brcmf_read_prof() function
brcmfmac: remove brcmf_update_prof() function
Arik Nemtsov (11):
wlcore: don't get the hlid from a queued skb
wlcore: op_tx: pass sta explicitly when inferring frame hlid
wlcore: AP mode - send non-data packets with basic rates
wlcore: allow only the lowest OFDM rate for p2p setup frames
wlcore: make Tx flush timings more verbose
wlcore: tx_flush - optimize flow and force Tx during the flush
wlcore/wl18xx/wl12xx: allow up to 3 mac addresses
wlcore: make debug prints work without dynamic debug
wlcore: allow up to 3 running STA interfaces in combinations
wlcore: spi: use private max-buf-size limit
wl18xx: default to siso40 in 2.4ghz with a single antenna
Avinash Patil (10):
mwifiex: update 11n status as per start_ap IE
mwifiex: separate file for handling AP events
mwifiex: create list for associated stations in AP mode
mwifiex: improve uAP RX handling
mwifiex: support RX AMSDU aggregation for uAP
mwifiex: add 11n Block Ack support for uAP
mwifiex: cleanup TX/RX BA tables for uAP
mwifiex: parse rate info for AP
mwifiex: separate TxPD processing routine for AP
mwifiex: enhance RX reordering to avoid packet drop during host sleep
Bala Shanmugam (1):
ath9k: Enable MCI for AR9565
Ben Hutchings (36):
net: Set device operstate at registration time
sfc: Refactor struct efx_tx_buffer to use a flags field
sfc: Stop TX queues before they fill up
sfc: Simplify TSO header buffer allocation
sfc: Replace tso_state::full_packet_space with ip_base_len
sfc: Stash header offsets for TSO in struct tso_state
sfc: Change state names to be clearer, and comment them
sfc: Hold the RTNL lock for more of the suspend/resume cycle
sfc: Keep disabled NICs quiescent during suspend/resume
sfc: Hold RTNL lock (only) when calling efx_stop_interrupts()
sfc: Never try to stop and start a NIC that is disabled
sfc: Improve log messages in case we abort probe due to a pending reset
sfc: Fix reset vs probe/remove/PM races involving efx_nic::state
sfc: Remove overly paranoid locking assertions from netdev operations
sfc: Remove bogus comment about MTU change and RX buffer overrun
sfc: Assign efx and efx->type as early as possible in efx_pci_probe()
sfc: Fix the initial device operstate
pps/ptp: Allow PHC devices to adjust PPS events for known delay
llc2: Remove pointless indirection through llc_stat_state_trans_end
llc2: Remove dead code for state machine
llc2: Collapse the station event receive path
llc2: Remove the station send queue
llc2: Remove explicit indexing of state action arrays
llc2: Collapse remainder of state machine into simple if-else if-statement
sfc: Fix maximum array sizes for various MCDI commands
sfc: Convert firmware subtypes to native byte order in efx_mcdi_get_board_cfg()
sfc: Support variable-length response to MCDI GET_BOARD_CFG
sfc: Expose FPGA bitfile partition through MTD
sfc: Bump version to 3.2
sfc: Avoid generating over-length MC_CMD_FLUSH_RX_QUEUES request
sfc: Fix null function pointer in efx_sriov_channel_type
sfc: Add parentheses around use of bitfield macro arguments
sfc: Fix MCDI structure field lookup
sfc: Fix loopback self-test with separate_tx_channels=1
sfc: Remove EFX_FILTER_FLAG_RX_OVERRIDE_IP
sfc: Fix the reported priorities of different filter types
Bing Zhao (5):
mwifiex: fix powerpc64-linux- compilation warnings
mwifiex: fix 'smatch' warning in preparing key_material cmd
mwifiex: make use of is_zero_ether_addr()
mwifiex: do not hint regulatory domain with f/w country code
mwifiex: disable WOW by default
Bjørn Mork (6):
net: cx82310_eth: use common match macro
net: sierra_net: make private symbols static
net: sierra_net: rx_urb_size is constant
net: qmi_wwan: increase max QMI message size to 4096
net: qmi_wwan: use a single bind function for all device types
net: qmi_wwan: adding Huawei E367, ZTE MF683 and Pantech P4200
Bruce Allan (6):
e1000e: use correct type for read of 32-bit register
e1000e: cleanup strict checkpatch MEMORY_BARRIER checks
e1000e: cleanup strict checkpatch check
e1000e: cleanup - remove inapplicable comment
e1000e: cleanup - remove unnecessary variable
e1000e: update driver version number
Bruce W Allan (1):
e1000e: implement 82577/579 MDI setting support
Carolyn Wyborny (2):
igb: Add loopback test support for i210
igb: Fix stats output on i210/i211 parts.
Catherine Sullivan (3):
ixgbe: add debugfs support
ixgbe: added netdev_ops file to debugfs
ixgbe: added reg_ops file to debugfs
Christian Lamparter (6):
p54: parse output power table
p54: fix powerpc gcc warnings
carl9170: report A-MPDU status
p54: fix off-by-one null pointer bug in p54_tx_80211
p54: connect to 11w protected networks
carl9170: connect to 11w protected networks
Christoph Fritz (1):
ipconfig: add nameserver IPs to kernel-parameter ip=
Christoph Paasch (2):
ipv4: Don't add TCP-code in inet_sock_destruct
tcp: Remove unused parameter from tcp_v4_save_options
Chun-Yeow Yeoh (3):
mac80211: don't re-init rate control when receiving mesh beacon
mac80211: allow re-open the blocked peer link in mesh
ath5k: disable HW crypto in management frame
Claudiu Ghioc (1):
ipvs: fixed sparse warning
Claudiu Manoil (1):
gianfar: Change default HW Tx queue scheduling mode
Cong Wang (3):
sctp: fix a compile error in sctp.h
netfilter: remove xt_NOTRACK
NFC: Remove the pn544 raw driver
Dan Carpenter (7):
mwifiex: use GFP_ATOMIC under spin lock
sctp: fix bogus if statement in sctp_auth_recv_cid()
ipv6: move dereference after check in fl_free()
gre: information leak in ip6_tnl_ioctl()
mwifiex: potential corruption in mwifiex_update_uap_custom_ie()
brcmfmac: use kcalloc() to prevent integer overflow
net/key/af_key.c: add range checks on ->sadb_x_policy_len
Daniel Borkmann (3):
filter: add XOR instruction for use with X/K
x86: bpf_jit_comp: add XOR instruction for BPF JIT
sparc: bpf_jit_comp: add XOR instruction for BPF JIT JIT
Daniel Drake (1):
libertas: set mac control synchronously during init
Daniel Golle (1):
rt2x00: add MediaTek/RaLink Rt3352 WiSoC
Daniel Mack (2):
net: ti cpsw ethernet: set IFCTL_A bit in MACCONTROL
net: ti cpsw ethernet: allow reading phy interface mode from DT
David S. Miller (38):
Merge branch 'master' of git://kernel.ubuntu.com/rtg/net-next
Merge branch 'for-davem' of git://git.kernel.org/.../linville/wireless-next
Merge branch 'master' of git://git.kernel.org/.../ppwaskie/net-next
Merge git://git.kernel.org/.../davem/net
Merge branch 'master' of git://git.kernel.org/.../jkirsher/net-next
Merge git://1984.lsi.us.es/nf-next
Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
Merge branch 'for-davem' of git://git.kernel.org/.../linville/wireless-next
Merge branch 'for-davem' of git://git.kernel.org/.../bwh/sfc-next
Merge branch 'for-next' of git://git.kernel.org/.../ebiederm/user-namespace
Merge git://git.kernel.org/.../davem/net
Merge branch 'master' of git://git.kernel.org/.../jkirsher/net-next
Merge branch 'tcp_fastopen_server'
Merge branch 'master' of git://1984.lsi.us.es/nf-next
net: Add INET dependency on aes crypto for the sake of TCP fastopen.
Merge branch 'master' of git://git.kernel.org/.../jesse/openvswitch
Merge branch 'master' of git://1984.lsi.us.es/nf-next
Merge git://git.kernel.org/.../davem/net
Merge branch 'master' of git://git.kernel.org/.../jkirsher/net-next
Merge branch 'for-davem' of git://git.kernel.org/.../linville/wireless-next
llc: Remove stray reference to sysctl_llc_station_ack_timeout.
Merge branch 'for-davem' of git://git.kernel.org/.../bwh/sfc-next
Merge branch 'master' of git://git.kernel.org/.../jkirsher/net-next
sunbmac: Remove unused local variable.
Merge branch 'master' of git://git.kernel.org/.../jkirsher/net-next
net: Make ZNET driver config depend on X86.
netlink: Rearrange netlink_kernel_cfg to save space on 64-bit.
Merge branch 'master' of git://1984.lsi.us.es/nf-next
net: Remove unnecessary NULL check in scm_destroy().
bna: Fix warning false positive.
pkt_sched: Fix warning false positives.
Revert "be2net: fix vfs enumeration"
Merge git://git.kernel.org/.../davem/net
Merge branch 'for-davem' of git://gitorious.org/linux-can/linux-can-next
Merge branch 'for-davem' of git://git.kernel.org/.../linville/wireless-next
Revert "net: ti cpsw ethernet: allow reading phy interface mode from DT"
Merge branch 'for-davem' of git://git.kernel.org/.../bwh/sfc-next
vxlan: Depend on CONFIG_INET
David Spinadel (3):
iwlwifi: remove radio_config from eeprom_data
iwlwifi: don't reset interupts after disabling
iwlwifi: stop interrupts before stopping device
Devendra Naga (1):
wl18xx: use module_platform_driver
Duan Jiong (1):
etherdevice: introduce help function eth_zero_addr()
Eliad Peller (12):
mac80211: add PS flag to bss_conf
mac80211: use synchronize_net() on key destroying
mac80211: use call_rcu() on sta deletion
wlcore: consider single fw case
wlcore: cancel recovery_work on stop() instead of remove_interface()
wlcore: resume() only if sta is associated
wlcore: always use wlvif->role_id for scans
wlcore: lazy-enable device roles
wlcore: invalidate keep-alive template on disconnection
wlcore: use dynamic keep-alive template ids
wlcore: decrease elp timeout
wlcore: protect wlcore_op_set_key with mutex
Eliezer Tamir (1):
ixgbe: remove old init remnant
Emil Tantilov (1):
ixgbe: fix reporting of spoofed packets
Emmanuel Grumbach (6):
iwlwifi: s/iwl_ucode_callback/iwl_req_fw_callback
iwlwifi: get the correct HCMD in the response handler
mac80211: don't call mgd_prepare_tx when associated
iwlwifi: fix the preparation of the card
iwlwifi: some clean up in transport layer
iwlwifi: don't access the HW when it is not available
Eric Dumazet (37):
net: skb_share_check() should use consume_skb()
ipv4: change inet_addr_hash()
ipv4: Introduce IN_DEV_NET_ROUTE_LOCALNET
net: avoid reloads in SNMP_UPD_PO_STATS
net: reorganize IP MIB values
net: tcp: GRO should be ECN friendly
tcp: ecn: dont delay ACKS after CE
net: output path optimizations
fib: use __fls() on non null argument
time: jiffies_delta_to_clock_t() helper to the rescue
net: remove delay at device dismantle
xfrm: fix RCU bugs
ipv6: gre: fix ip6gre_err()
net: reinstate rtnl in call_netdevice_notifiers()
netpoll: provide an IP ident in UDP frames
igb: reduce Rx header size
net: qdisc busylock needs lockdep annotations
tcp: fix TFO regression
igmp: avoid drop_monitor false positives
net: rt_cache_flush() cleanup
filter: add MOD operation
x86 bpf_jit: support MOD operation
ipv6: route templates can be const
net: more accurate network taps in transmit path
net: provide a default dev->ethtool_ops
gre: add GSO support
net: loopback: set default mtu to 64K
net: use a per task frag allocator
net: raw: revert unrelated change
net: remove sk_init() helper
ipv6: gre: remove ip6gre_header_parse()
net: use bigger pages in __netdev_alloc_frag
net: struct napi_struct fields reordering
tcp: gro: add checksuming helpers
net: add gro_cells infrastructure
ipv4: gre: add GRO capability
mlx4: dont orphan skbs in mlx4_en_xmit()
Eric Lapuyade (9):
NFC: Changed the HCI cmd execution callback prototype
NFC: Add a public nfc_hci_send_cmd_async method
NFC: Modified hci_transceive to become an asynchronous operation
NFC: Add an LLC Core layer to HCI
NFC: Add a nop (passthrough) llc module to llc core
NFC: Add an shdlc llc module to llc core
NFC: Changed HCI and PN544 HCI driver to use the new HCI LLC Core
NFC: Fix LLC registration definitions for ANSI compliance
NFC: Add HCI module description
Eric W. Biederman (43):
userns: Allow the usernamespace support to build after the removal of usbfs
userns: Fix link restrictions to use uid_eq
userns: Convert net/core/scm.c to use kuids and kgids
userns: Convert __dev_set_promiscuity to use kuids in audit logs
userns: Convert sock_i_uid to return a kuid_t
userns: Allow USER_NS and NET simultaneously in Kconfig
userns: Make seq_file's user namespace accessible
userns: Print out socket uids in a user namespace aware fashion.
userns: Use kgids for sysctl_ping_group_range
net ip6 flowlabel: Make owner a union of struct pid * and kuid_t
pidns: Export free_pid_ns
userns: Convert net/ax25 to use kuid_t where appropriate
netlink: Make the sending netlink socket availabe in NETLINK_CB
userns: Implement sk_user_ns
userns: Teach inet_diag to work with user namespaces
userns: nfnetlink_log: Report socket uids in the log sockets user namespace
net sched: Pass the skb into change so it can access NETLINK_CB
userns: Convert cls_flow to work with user namespaces enabled
userns: Convert xt_LOG to print socket kuids and kgids as uids and gids
userns xt_recent: Specify the owner/group of ip_list_perms in the initial user namespace
userns: xt_owner: Add basic user namespace support.
userns: Make the airo wireless driver use kuids for proc uids and gids
userns: Convert tun/tap to use kuid and kgid where appropriate
sctp: Make the port hash table use struct net in it's key.
sctp: Make the endpoint hashtable handle multiple network namespaces
sctp: Make the association hashtable handle multiple network namespaces
sctp: Make the address lists per network namespace
sctp: Make the ctl_sock per network namespace
sctp: Move the percpu sockets counter out of sctp_proc_init
sctp: Make the proc files per network namespace.
sctp: Enable sctp in all network namespaces
sctp: Make the mib per network namespace
sctp: Add infrastructure for per net sysctls
sctp: Push struct net down to sctp_chunk_event_lookup
sctp: Push struct net down into sctp_transport_init
sctp: Push struct net down into sctp_in_scope
sctp: Push struct net down into all of the state machine functions
sctp: Push struct net down into sctp_verify_ext_param
sctp: Make sysctl tunables per net
scm: Don't use struct ucred in NETLINK_CB and struct scm_cookie.
netlink: Rename pid to portid to avoid confusion
xfrm: Report user triggered expirations against the users socket
scsi_netlink: Remove dead and buggy code
Eyal Shapira (2):
mac80211: avoid using synchronize_rcu in ieee80211_set_probe_resp
wlcore: configure wowlan regardless of wakeup conditions
Fan Du (2):
xfrm: remove redundant parameter "int dir" in struct xfrm_mgr.acquire
xfrm: Use rcu_dereference_bh to deference pointer protected by rcu_read_lock_bh
Felix Fietkau (1):
mac80211: validate skb->dev in the tx status path
Fengguang Wu (1):
mwifiex: fix code mis-alignment after the if statement
Florian Westphal (2):
netfilter: nf_nat: fix out-of-bounds access in address selection
netfilter: xt_time: add support to ignore day transition
Francois Romieu (1):
r8169: add D-Link DGE-560T identifiers.
Franky Lin (9):
brcmfmac: add BCM43241 sdio interface driver support
brcmfmac: absorb brcmf_sendpkt into brcmf_netdev_start_xmit
brcmfmac: remove obsolete sdio bus sleep mechanism
brcmfmac: use atomic variable for interrupt pending flag
brcmfmac: convert SDIO dpc implementation to workqueue
brcmfmac: streamline SDIO dpc
brcmfmac: raise SDIO host lock to higher level
brcmfmac: clear status for in-band interrupt in brcmf_sdbrcm_isr
brcmfmac: streamline SDIO read frame routine
Gabor Juhos (2):
ath9k: optimize power level initialization for CTL_[25]GHT20
ath9k: fix indentation in ar9003_hw_set_power_per_rate_table
Gao feng (2):
net: dev: fix the incorrect hold of net namespace's lo device
net: dev: fix incorrect getting net device's name
Gertjan van Wingerde (10):
rt2x00: Align GPIO register definitions with the datasheets.
rt2x00: Unify GPIO register field namings
rt2x00: rt2800 - Make probe_hw function common between PCI and USB.
rt2x00: Code clean up in rt2800lib.
rt2x00: rt2800 - Fix default vgc values for RT3572
rt2x00: rt2800lib - code cleanup.
rt2x00: Code style cleanup in rt2800lib.c
rt2x00: Clean up RFCSR1 programming in rt2800_config_channel_rf3xxx.
rt2x00: Deprecate max_sta_intf field of struct rt2x00_ops.
rt2x00: Replace open coded interface checking with interface combinations.
Greg Kroah-Hartman (1):
USB: remove dbg() usage in USB networking drivers
Greg Rose (2):
ixgbe: Do not read the spoofed packets counter when not in IOV mode
ixgbevf: Fix AIM (Adaptive Interrupt Moderation)
Gustavo Padovan (1):
Bluetooth: Add USB_VENDOR_AND_INTERFACE_INFO() for Broadcom/Foxconn
Haiyang Zhang (7):
hyperv: Add comments for the extended buffer after RNDIS message
hyperv: Fix the max_xfer_size in RNDIS initialization
hyperv: Fix the missing return value in rndis_filter_set_packet_filter()
hyperv: Fix page buffer handling in rndis_filter_send_request()
hyperv: Remove extra allocated space for recv_pkt_list elements
hyperv: Report actual status in receive completion packet
hyperv: Add buffer for extended info after the RNDIS response message.
Hante Meuleman (22):
brcmfmac: prevent possible race condition on usb rx control.
brcmfmac: Add 43242 USB support.
brcmfmac: Add 43143 USB support.
brcmfmac: Stop all net if queues on tx flow halt.
brcmfmac: Add extra data support to firmware event queueing.
brcmfmac: Add tx flow control on net if queue for USB.
brcmfmac: Clean up scan related code.
brcmfmac: refill buffers on rx protocol error.
brcmfmac: avoid using local usb data.
brcmfmac: add e-scan support.
brcmfmac: fix bug causing errorneous free on exception.
brcmfmac: fix debug printout of event data.
brcmfmac: store usb fw images in local linked list.
brcmfmac: remove unused function.
brcmfmac: fix bug in determining phy bands.
brcmfmac: remove unused usb bmac model code.
brcmfmac: clear control lock on usb error.
brcmfmac: use wait_event_timeout for fw control packets over usb.
brcmfmac: use different fw api for encryption,auth. config
brcmfmac: use define instead of hardcoded values.
brcmfmac: notify common driver about usb tx completion.
brcmfmac: add hostap supoort.
Hauke Mehrtens (1):
bcma: make some functions static
Hila Gonen (1):
cfg80211: fix indentation
Ido Reis (2):
wl18xx: update default phy configuration for pg2
wl18xx: increase rx_ba_win_size to 32
Ido Yariv (6):
wlcore: Prevent interaction with HW after recovery is queued
wlcore: Don't recover during boot
wlcore: Fix unbalanced interrupts enablement
wlcore: Allow memory access when the FW crashes
wlcore: Refactor probe
wlcore: Load the NVS file asynchronously
Igal Chernobelsky (2):
wl18xx/wl12xx: defines for Tx/Rx descriptors num
wlcore/wl18xx/wl12xx: aggregation buffer size set
Igor Maravic (1):
net: ipv4: fib_trie: Don't unnecessarily search for already found fib leaf
Ilan Elias (3):
NFC: Set local general bytes in nci_start_poll
NFC: Parse NCI NFC-DEP activation params
NFC: Implement NCI dep_link_up and dep_link_down
Ilan Peer (1):
mac80211: Do not check for valid hw_queues for P2P_DEVICE
Ivan Vecera (2):
be2net: fix vfs enumeration
be2net: fix vfs enumeration
Jaganath Kanakkassery (2):
Bluetooth: Move l2cap_chan_hold/put to l2cap_core.c
Bluetooth: Free the l2cap channel list only when refcount is zero
Jan Beulich (1):
netfilter: properly annotate ipv4_netfilter_{init,fini}()
Jan Engelhardt (2):
netfilter: combine ipt_NETMAP and ip6t_NETMAP
netfilter: combine ipt_REDIRECT and ip6t_REDIRECT
Jaroslav Resler (1):
Bluetooth: Add support for BCM20702A0 [04ca, 2003]
Javier Lopez (1):
carl9170: Add support for NL80211_IFTYPE_MESH_POINT interfaces
Jean Sacren (1):
netfilter: remove unnecessary goto statement for error recovery
Jeff Disher (1):
mwifiex: store mwifiex_ds_misc_subsc_evt in mwifiex_private
Jeff Mahoney (1):
brcmsmac: document firmware dependencies
Jerry Chu (3):
tcp: TCP Fast Open Server - header & support functions
tcp: TCP Fast Open Server - support TFO listeners
tcp: TCP Fast Open Server - main code path
Jesper Dangaard Brouer (1):
ipvs: IPv6 MTU checking cleanup and bugfix
Jesse Brandeburg (5):
ethtool.h: MDI setting support
igb: implement 580 MDI setting support
e1000: configure and read MDI settings
e1000e: implement MDI/MDI-X control
igb: update to allow reading/setting MDI state
Jiri Bohac (1):
bonding: add some slack to arp monitoring time limits
Jiri Pirko (9):
netlink: add signed types
team: add signed 32-bit team option type
team: add per port priority option
team: add support for queue override by setting queue_id for port
team: add support for non-ethernet devices
team: don't print warn message on -ESRCH during event send
vlan: add helper which can be called to see if device is used by vlan
team: do not allow to add VLAN challenged port when vlan is used
team: send port changed when added
Joe Perches (1):
net1080: Neaten netdev_dbg use
Johan Hedberg (2):
Bluetooth: mgmt: Implement support for passkey notification
Bluetooth: Update management interface revision
Johannes Berg (67):
iwlwifi: fix aggregation check indentation
iwlwifi: reduce max remain-on-channel duration
mac80211: don't react to beacon loss if HW monitoring
mac80211: supress HT/VHT disable if not supported
mac80211: rename sta to new_sta
mac80211: set channel only once during auth/assoc
mac80211: use oper_channel in mesh
mac80211: use oper_channel in ibss
mac80211: use oper_channel in managed mlme
mac80211: use oper_channel in utils and config
mac80211: fix current vs. operating channel in preq/beacon
mac80211: use correct channel in TX
mac80211: manage carrier state in mesh
mac80211: enable WDS carrier only after adding station
mac80211: use eth_broadcast_addr
mac80211: reset station MLME flags upon new association
brcmsmac: use ieee80211_channel_to_frequency
iwlegacy: clean up suspend/resume
wireless: add radiotap A-MPDU status field
mac80211: support A-MPDU status reporting
mac80211: remove unneeded 'bssid' variable
mac80211: clean up CSA handling code
mac80211: fix CSA handling timer
mac80211: check size of channel switch IE when parsing
mac80211: make ieee80211_beacon_connection_loss_work static
cfg80211: add P2P Device abstraction
mac80211: support P2P Device abstraction
mac80211: add IEEE80211_HW_P2P_DEV_ADDR_FOR_INTF
mac80211_hwsim: add support for P2P Device
mac80211: simplify buffers in aes_128_cmac_vector
mac80211: mesh: don't use global channel type
mac80211: remove almost unused local variable
mac80211: remove freq/chantype from debugfs
mac80211: use oper_channel in rate init
mac80211: don't assume channel is set in tracing
mac80211: use RX status band instead of current band
mac80211: check operating channel in scan
mac80211: convert ops checks to WARN_ON
mac80211: pass channel to ieee80211_send_probe_req
mac80211: clean up ieee80211_subif_start_xmit
iwlwifi: fix antenna bitmask
mac80211: don't use kerneldoc for ieee80211_add_rx_radiotap_header
Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next
iwlwifi: report A-MPDU status
iwlwifi: reduce overhead if tracing disabled
iwlwifi: remove unused IDI code stubs
Merge remote-tracking branch 'mac80211/master' into mac80211-next
mac80211: don't hang on to sched_scan_ies
mac80211: disconnect if channel switch fails
Merge remote-tracking branch 'wireless-next/master' into mac80211-next
wireless: remove obsolete chan no/center freq conversion functions
mac80211_hwsim: move module_init/exit
mac80211: check power constraint IE size when parsing
mac80211: add key flag for management keys
iwlwifi: fix indentation in iwl_load_given_ucode
iwlwifi: load firmware in chunks
mac80211: remove unneeded CONFIG_PM ifdef
mac80211: handle power constraint/country IE better
mac80211: change locking around ieee80211_recalc_smps
mac80211: make reset debugfs depend on CONFIG_PM
cfg80211: constify name parameter to add_virtual_intf
iwlwifi: use eth_broadcast_addr
iwlwifi: fix async station command crash
mac80211: don't send delBA before disassoc
mac80211: don't send delBA when removing stations
mac80211: don't send delBA on addBA failure
iwlegacy: use eth_broadcast_addr
John Eaglesham (1):
bonding: support for IPv6 transmit hashing
John Fastabend (1):
ixgbevf: scheduling while atomic in reset hw path
John W. Linville (23):
Merge branch 'master' of git://git.kernel.org/.../bluetooth/bluetooth-next
Merge branch 'master' of git://git.kernel.org/.../linville/wireless-next into for-davem
Merge branch 'for-john' of git://git.kernel.org/.../jberg/mac80211-next
Merge branch 'for-john' of git://git.kernel.org/.../iwlwifi/iwlwifi-next
Merge branch 'for-john' of git://git.kernel.org/.../jberg/mac80211-next
Merge branch 'master' of git://git.kernel.org/.../linville/wireless-next into for-davem
Merge branch 'for-john' of git://git.kernel.org/.../jberg/mac80211-next
Merge branch 'for-john' of git://git.kernel.org/.../iwlwifi/iwlwifi-next
Merge branch 'master' of git://git.kernel.org/.../linville/wireless
Merge branch 'master' of git://git.kernel.org/.../linville/wireless-next into for-davem
Merge branch 'for-john' of git://git.kernel.org/.../jberg/mac80211-next
Merge branch 'for-john' of git://git.kernel.org/.../iwlwifi/iwlwifi-next
Merge branch 'master' of git://git.kernel.org/.../bluetooth/bluetooth-next
Merge tag 'nfc-next-3.7-1' of git://git.kernel.org/.../sameo/nfc-3.0
Merge branch 'for-john' of git://git.kernel.org/.../jberg/mac80211-next
Merge branch 'for-john' of git://git.kernel.org/.../iwlwifi/iwlwifi-next
ath5k: add missing breaks in ath5k_hw_set_spur_mitigation_filter
nfc: add dummy nfc_llc_shdlc_register definition
NFC: Add dummy nfc_llc_shdlc_register definition
Merge tag 'nfc-next-3.7-2' of git://git.kernel.org/.../sameo/nfc-3.0
Merge branch 'master' of git://git.kernel.org/.../linville/wireless-next into for-davem
Merge branch 'for-linville' of git://git.kernel.org/.../luca/wl12xx
Merge branch 'master' of git://git.kernel.org/.../linville/wireless-next into for-davem
Jonathan Corbet (1):
batman-adv: remove a misleading comment
Jozsef Kadlecsik (7):
netfilter: ipset: Fix sparse warnings "incorrect type in assignment"
netfilter: ipset: Check and reject crazy /0 input parameters
netfilter: ipset: Rewrite cidr book keeping to handle /0
netfilter: ipset: Add /0 network support to hash:net,iface type
netfilter: ipset: Include supported revisions in module description
netfilter: ipset: Coding style fixes
netfilter: ipset: Support to match elements marked with "nomatch"
Julia Lawall (1):
drivers/net/ethernet/tundra/tsi108_eth.c: delete double assignment
Julian Anastasov (6):
ipvs: ip_vs_ftp depends on nf_conntrack_ftp helper
ipvs: generalize app registration in netns
ipvs: implement passive PMTUD for IPIP packets
ipvs: add pmtu_disc option to disable IP DF for TUN packets
netlink: add minlen validation for the new signed types
tcp: add generic netlink support for tcp_metrics
Jussi Kivilinna (1):
zd1211rw: enable support for MFP
Kevin Gan (1):
mwifiex: add inactivity deauth support for ap
Kevin Groeneveld (1):
ppp: add 64 bit stats
Konstantin Khlebnikov (1):
nf_defrag_ipv6: fix oops on module unloading
LEROY Christophe (1):
lxt PHY: Support for the buggy LXT973 rev A2
Larry Finger (6):
p54pci: convert driver to use asynchronous firmware loading
rtlwifi: rtl8192c: rtl8192de: Fix typo in cursta_connectctate
rtlwifi: rtl8192c: rtl8192ce: rtl8192cu: rtl8192se: Remove sparse warnings
rtlwifi: Update header file
rtlwifi: Remove EXPERIMENTAL as pre-requisite for the drivers
b43legacy: Fix crash on unload when firmware not available
Li RongQing (2):
ipv6: replace write lock with read lock when get route info
ipv6: recursive check rt->dst.from when call rt6_check_expired
Lin Ming (1):
ipv6: return errno pointers consistently for fib6_add_1()
Luciano Coelho (1):
wl12xx: use module_platform_driver
Mahesh Palivela (1):
mac80211: VHT (11ac) association
Marco Porsch (1):
mac80211: fix unnecessary beacon update after peering status change
Marek Lindner (1):
batman-adv: convert remaining packet counters to per_cpu_ptr() infrastructure
Mark Rustad (1):
ixgbe: Improve statistics accuracy for DDP traffic
Martin Hundebøll (2):
batman-adv: Move batadv_check_unicast_packet()
batman-adv: Drop tt queries with foreign dest
Masatake YAMATO (9):
Bluetooth: /proc/net/ entries for bluetooth protocols
Bluetooth: Added /proc/net/bnep via bt_procfs_init()
Bluetooth: Added /proc/net/cmtp via bt_procfs_init()
Bluetooth: Added /proc/net/hci via bt_procfs_init()
Bluetooth: Added /proc/net/hidp via bt_procfs_init()
Bluetooth: Added /proc/net/l2cap via bt_procfs_init()
Bluetooth: Added /proc/net/rfcomm via bt_procfs_init()
Bluetooth: Added /proc/net/sco via bt_procfs_init()
net: Providing protocol type via system.sockprotoname xattr of /proc/PID/fd entries
Matthew Vick (6):
igb: Tidy up wrapping for CONFIG_IGB_PTP.
igb: Update PTP function names/variables and locations.
igb: Correct PTP support query from ethtool.
igb: Store the MAC address in the name in the PTP struct.
igb: Prevent dropped Tx timestamps via work items and interrupts.
igb: Add 1588 support to I210/I211.
Meenakshi Venkataraman (2):
iwlwifi: clean up properly when registration with mac80211 fails
iwlwifi: rework the iwlwifi debugfs structure
Merav Sicron (1):
bnx2x: Improve code around bnx2x_tests_str_arr
Michael Chan (12):
cnic: Add functions to allocate and free UIO rings
cnic: Free UIO rings when the device is closed.
cnic: Add function pointers to arm IRQ for different devices.
cnic: Allocate kcq resource only on devices that support FCoE.
cnic: Allocate UIO resources only on devices that support iSCSI.
tg3: Introduce separate functions to allocate/free RX/TX rings.
tg3: Allow number of rx and tx rings to be set independently.
tg3: Separate coalescing setup for rx and tx
tg3: Refactor tg3_open()
tg3: Refactor tg3_close()
tg3: Add support for ethtool -L|-l to get/set the number of rings.
tg3: Disable multiple TX rings by default due to hardware flaw
Michael Wang (3):
netfilter: replace list_for_each_continue_rcu with new interface
netfilter: pass 'nf_hook_ops' instead of 'list_head' to nf_iterate()
netfilter: pass 'nf_hook_ops' instead of 'list_head' to nf_queue()
Michal Kazior (1):
mac80211: refactor set_channel_type
Michal Schmidt (1):
r8169: use unlimited DMA burst for TX
Mika Westerberg (1):
i825xx: znet: fix compiler warnings when building a 64-bit kernel
Mikel Astiz (3):
Bluetooth: Add more HCI error codes
Bluetooth: Fix minor coding style in hci_event.c
Bluetooth: mgmt: Add device disconnect reason
Ming Lei (2):
wireless: ath9k-htc: only load firmware in need
wireless: ath9k-htc: fix possible use after free
Mohammed Shafi Shajakhan (11):
ath9k_hw: small optimization
ath9k_hw: Fix invalid MCI GPM index access/caching
ath9k: Fix BTCOEX timer triggering comparision
ath9k: Make use of ath_stop_ani wrapper
ath9k: Remove an obselete function declaration
ath9k: Cleanup add/change_interface callbacks
ath9k_htc: minor cleanup in ath9k_htc_add_station
ath9k_htc: Add a modparam to enable BTCOEX rather than default
ath9k_htc: Cancel BTCOEX related work before disabling BTCOEX
ath9k: Add Generic hardware timer interrupt in debugfs
ath9k: update hw_timer_enabled to false when we stop generic timers
Mugunthan V N (4):
drivers: net: ethernet: cpsw: Add SOC dependency support for cpsw dependent modules
drivers: net: ethernet: cpsw: Add device tree support to CPSW
drivers: net: ethernet: davince_mdio: device tree implementation
documentation: dt: bindings: cpsw: fixing the examples for directly using it in dts file
Narendra K (1):
ixgbevf - Remove unused parameter in ixgbevf_receive_skb
Neal Cardwell (5):
tcp: extract code to compute SYNACK RTT
tcp: TCP Fast Open Server - take SYNACK RTT after completing 3WHS
tcp: TCP Fast Open Server - note timestamps and retransmits for SYNACK RTT
tcp: TCP Fast Open Server - call tcp_validate_incoming() for all packets
tcp: TCP Fast Open Server - record retransmits after 3WHS
Neil Horman (1):
cls_cgroup: Allow classifier cgroups to have their classid reset to 0
Nick Kossifidis (4):
ath5k: Use correct value for min_pwr and cur_pwr
ath5k: Fix range scaling when setting rate power table
ath5k: Preserve tx power level requested from above on phy_init
ath5k: Put power_level where it belongs and rename it
Nicolas Dichtel (4):
ipv6: fix handling of blackhole and prohibit routes
ipv6: fix handling of throw routes
ipv4/route: arg delay is useless in rt_cache_flush()
ipv6: del unreachable route when an addr is deleted on lo
Nikolay Aleksandrov (1):
net: add unknown state to sysfs NIC duplex export
Oliver Neukum (2):
usbnet: drop unneeded check for NULL
Revert "usbnet: drop unneeded check for NULL"
Or Gerlitz (2):
IB/ipoib: Add rtnl_link_ops support
IB/ipoib: Add more rtnl_link_ops callbacks
Otto Estuardo Solares Cabrera (1):
e1000: add byte queue limits
Pablo Neira Ayuso (15):
netfilter: nf_nat: support IPv6 in IRC NAT helper
netfilter: nf_nat: support IPv6 in TFTP NAT helper
netfilter: xt_socket: fix compilation warnings with gcc 4.7
netfilter: xt_CT: refactorize xt_ct_tg_check
netfilter: nf_conntrack: add nf_ct_timeout_lookup
Merge git://git.kernel.org/.../davem/net-next
netfilter: fix crash during boot if NAT has been compiled built-in
netlink: kill netlink_set_nonroot
netlink: hide struct module parameter in netlink_kernel_create
netfilter: ctnetlink: fix module auto-load in ctnetlink_parse_nat
netfilter: fix IPv6 NAT dependencies in Kconfig
netlink: use
instead of
netfilter: nf_ct_ftp: add sequence tracking pickup facility for injected entries
netfilter: nfnetlink_queue: fix maximum packet length to userspace
netfilter: nfnetlink_queue: add NFQA_CAP_LEN attribute
Pandiyarajan Pitchaimuthu (1):
cfg80211/nl80211: Notify connection request failure in AP mode
Patrick McHardy (19):
netfilter: sparse endian fixes
netfilter: nf_conntrack: remove unnecessary RTNL locking
ipv4: fix path MTU discovery with connection tracking
netfilter: nf_conntrack_ipv6: improve fragmentation handling
netfilter: nf_conntrack_ipv6: fix tracking of ICMPv6 error messages containing fragments
netfilter: nf_conntrack: restrict NAT helper invocation to IPv4
netfilter: nf_nat: add protoff argument to packet mangling functions
netfilter: add protocol independent NAT core
netfilter: ipv6: expand skb head in ip6_route_me_harder after oif change
net: core: add function for incremental IPv6 pseudo header checksum updates
netfilter: ipv6: add IPv6 NAT support
netfilter: ip6tables: add MASQUERADE target
netfilter: ip6tables: add REDIRECT target
netfilter: ip6tables: add NETMAP target
netfilter: nf_nat: support IPv6 in FTP NAT helper
netfilter: nf_nat: support IPv6 in amanda NAT helper
netfilter: nf_nat: support IPv6 in SIP NAT helper
netfilter: ip6tables: add stateless IPv6-to-IPv6 Network Prefix Translation target
netfilter: nf_nat: fix oops when unloading protocol modules
Paul Bolle (1):
ipw2x00: silence GCC warning for unused variable 'dev'
Paul Gortmaker (1):
tg3: unconditionally select HWMON support when tg3 is enabled.
Pavel Emelyanov (12):
net: Dont use ifindices in hash fns
net: Allow to create links with given ifindex
veth: Allow to create peer link with given ifindex
net: Make ifindex generation per-net namespace
net: Loopback ifindex is constant now
packet: Introduce net/packet/internal.h header
packet: Diag core and basic socket info dumping
packet: Report more packet sk info via diag module
packet: Report socket mclist info via diag module
packet: Report rings cfg via diag engine
packet: Report fanout status via diag engine
packet: Protect packet sk list with mutex (v2)
Peter Senna Tschudin (15):
net/mac80211/scan.c: removes unnecessary semicolon
drivers/net/usb/sierra_net.c: removes unnecessary semicolon
drivers/net/wireless/rtlwifi/rtl8192de/phy.c: removes unnecessary semicolon
drivers/net/wireless/ath/ath9k/ar9003_mac.c: removes unnecessary semicolon
drivers/isdn/gigaset/common.c: Remove useless kfree
net/ieee802154/6lowpan.c: Remove unecessary semicolon
net/openvswitch/vport.c: Remove unecessary semicolon
net/tipc/name_table.c: Remove unecessary semicolon
Bluetooth: bluecard_cs.c: removes unnecessary semicolon
Bluetooth: hci_ldisc.c: removes unnecessary semicolon
Bluetooth: hci_ll.c: removes unnecessary semicolon
Bluetooth: hci_vhci.c: removes unnecessary semicolon
Bluetooth: btuart_cs.c: removes unnecessary semicolon
drivers/s390/net: removes unnecessary semicolon
ctcm: fix error return code
Piotr Haber (1):
brcmsmac: don't start device when RfKill is engaged
Pravin B Shelar (2):
openvswitch: Add support for network namespaces.
openvswitch: Increase maximum number of datapath ports.
Priyanka Jain (1):
Replace rwlock on xfrm_policy_afinfo with rcu
Quinlan Pfiffer (1):
asix: Adds support for Lenovo 10/100 USB dongle.
Rafał Miłecki (16):
b43: N-PHY: update workarounds
b43: N-PHY: add PHY rev7+ workarounds
b43: rename host flags defines
b43: add helper waiting for given value in radio reg
b43: N-PHY: finish 0x2056 radio setup
b43: N-PHY: init 0x2057 radio
b43: be more user friendly with PHY info
b43: N-PHY: add overriding RF control for rev7+
bcma: add (mostly) NAND defines
b43: N-PHY: fix 0x2057 radio calib copy/paste mistake
b43legacy: fix logic in GPIO init
ssb: check for flash presentence
bcma: detect and register serial flash device
bcma: detect and register NAND flash device
bcma: handle BCM43227
bcma: change delays to follow timers-howto guide
Rajkumar Manoharan (13):
ath9k: tune rc_stats to display only valid rates
ath9k_hw: Read and apply thermometer settings from EEPROM
ath9k_hw: Read and configure thermocal for AR9462
ath9k_hw: Wait BT calibration to complete
ath9k_hw: use peak detection for 5GHz
ath9k_hw: add 8 points for 5G temp slop
ath9k_hw: move 2g5g switch before nfcal start
ath9k_hw: fix ar9462 selfgen chainmask
ath9k: flush bt profile whenever it is requested
ath9k: move coex param updation within mci work
ath9k: fill led_pin before drv_start
ath9k: fix queuing MCI work twice
ath9k_hw: fix BT sleep state on chip wakeup
Rami Rosen (2):
packet: fix broken build.
net: fix documentation of skb_needs_linearize().
Randy Dunlap (1):
can: usb: peak: rename peak_usb dump_mem function
Razvan Ghitulete (1):
net: remove wrong initialization for snd_wl1
Richard Cochran (4):
ptp: remember the adjusted frequency
ptp: provide the clock's adjusted frequency
ptp: link the phc device to its parent device
ptp: clarify the clock_name sysfs attribute
Robert P. J. Day (1):
cfg80211: add kerneldoc entry for "vht_cap"
Sachin Kamat (12):
Bluetooth: Use devm_kzalloc in bcm203x.c file.
Bluetooth: Use devm_kzalloc in bfusb.c file
Bluetooth: Use devm_kzalloc in bluecard_cs.c file
Bluetooth: Use devm_kzalloc in bpa10x.c file
Bluetooth: Use devm_kzalloc in bt3c_cs.c file
Bluetooth: Use devm_kzalloc in btmrvl_sdio.c file
Bluetooth: Use devm_kzalloc in btsdio.c file
Bluetooth: Use devm_kzalloc in btuart_cs.c file
Bluetooth: Use devm_kzalloc in btusb.c file
Bluetooth: Use devm_kzalloc in btwilink.c file
Bluetooth: Use devm_kzalloc in dtl1_cs.c file
Bluetooth: Use module_platform_driver() in btwilink.c file
Samuel Ortiz (4):
NFC: Queue pn533 commands
NFC: Set the IRQF_ONESHOT flag from the pn544_hci IRQ handler request
NFC: Remove unneeded LLC symbols export
MAINTAINERS: Add NFC specific mailing list
Sathya Perla (7):
be2net: create RSS rings even in multi-channel configs
be2net: fixup malloc/free of adapter->pmac_id
be2net: use PCIe AER capability
be2net: remove type argument of be_cmd_mac_addr_query()
be2net: fix wrong handling of be_setup() failure in be_probe()
be2net: cleanup code related to be_link_status_query()
be2net: fixup log messages
Saul St. John (1):
bcma: don't leak memory for PCIE, MIPS, GBIT cores
Sebastian Ott (2):
qeth: cleanup channel path descriptor function
lcs: ensure proper ccw setup
Simon Wunderlich (4):
batman-adv: Add the backbone gateway list to debugfs
batman-adv: correct comments in bridge loop avoidance
batman-adv: rename bridge loop avoidance claim types
batman-adv: check batadv_orig_hash_add_if() return code
Sorin Dumitru (1):
ipv6: remove some deadcode
Srinivas Kandagatla (6):
of/mdio: Add dummy functions in of_mdio.h.
of/mdio-gpio: Simplify the way device tree support is implemented.
net:stmmac: Add check if mdiobus is registered in stmmac_mdio_unregister
net:stmmac: fix broken stmmac_pltfr_remove.
net:stmmac: Remove bus_id from mdio platform data.
net:stmmac: convert driver to use devm_request_and_ioremap.
Srivatsa S. Bhat (2):
netprio_cgroup: Remove update_netdev_tables() since it is unnecessary
netprio_cgroup: Use memcpy instead of the for-loop to copy priomap
Stefan Assmann (1):
igb: Change how we check for pre-existing and assigned VFs
Stephen Rothwell (1):
netfilter: ipv6: using csum_ipv6_magic requires net/ip6_checksum.h
Steve Glendinning (9):
smsc95xx: sleep before read for lengthy operations
smsc95xx: remove unnecessary variables
smsc95xx: check return code from control messages
smsc95xx: fix resume when usb device is reset
smsc95xx: enable power saving mode during system suspend
smsc95xx: add wol magic packet support
smsc75xx: add explicit test that device is READY
smsc75xx: enable power saving mode during system suspend
smsc75xx: add wol magic packet support
Steven J. Hill (1):
net: mipsnet: Remove the MIPSsim Ethernet driver.
Stone Piao (14):
mwifiex: fix coding style issue
mwifiex: implement cfg80211 mgmt_tx handler
mwifiex: advertise mgmt_stype to cfg80211
mwifiex: implement cfg80211 mgmt_frame_register handler
mwifiex: report received management frames to cfg80211
mwifiex: implement remain_on_channel and cancel_remain_on_channel
mwifiex: process remain on channel expired event
mwifiex: append each IE into a seperate IE buffer
mwifiex: send firmware initialization commands synchronously
mwifiex: add P2P interface
mwifiex: add support for P2P client in interface type change
mwifiex: add support for P2P GO in interface type change
mwifiex: parse P2P IEs from beacon_data
mwifiex: set txpd when send a mgmt frame for AP and GO mode
Stuart Hodgson (4):
sfc: Add explicit RX queue flag to channel
sfc: Add channel specific receive_skb handler and post_remove callback
sfc: Allow efx_mcdi_rpc to be called in two parts
sfc: Add support for IEEE-1588 PTP
Sujith Manoharan (40):
ath9k: Simplify rate table initialization
ath9k: Cleanup RC init API
ath9k: Cleanup ath_rc_setvalid_rates
ath9k: Cleanup ath_rc_setvalid_htrates
ath9k: Cleanup index retrieval routines
ath9k: Change rateset calculation
ath9k: Remove ath_rc_set_valid_rate_idx
ath9k: Unify valid rate calculation routines
ath9k: Do not set IEEE80211_TX_RC_USE_SHORT_PREAMBLE
ath9k: Fix RTS/CTS rate selection
ath9k: Bail out properly before calculating rate index
ath9k: Cleanup TX status API
ath9k: Remove MIMO-PS specific code
ath9k: Trim rate table
mac80211: Fix AP mode regression
ath9k: Fix TX filter usage
ath9k_hw: Add version/revision macros for AR9565
ath9k_hw: Add AR9565 initvals
ath9k_hw: Add AR9565 HW support
ath9k: Set correct max streams for AR9565
ath9k_hw: Fix spur mitigation for AR9565
ath9k_hw: Program correct PLL value for AR9565
ath9k: Add PCI ID for AR9565
ath9k_hw: Handle gentimer termination properly
ath9k_hw: Rename antenna diversity macros
ath9k: Choose correct LED pin for AR9565
ath9k: Enable SGI correctly
ath9k_hw: Use HW cap ATH9K_HW_CAP_ANT_DIV_COMB
ath9k: Remove redundant variable assignment
ath9k: Remove a couple of unused variables
ath9k_hw: Add antenna diversity group for AR9565
ath9k_hw: Update AR9565 initvals
ath9k_hw: Add a HW callback to set diversity
ath9k: Add a module parameter to enable diversity
ath9k_hw: Enable WLAN RX diversity for AR9565
ath9k: Disable ASPM only for AR9285
ath9k: Handle errors properly in MCI initialization
ath9k: Add a debugfs file to adjust antenna diversity
ath9k: Fix chainmask selection for AR9462
ath9k: Fix BTCOEX weight initialization
Sven Eckelmann (6):
batman-adv: Split batadv_priv in sub-structures for features
batman-adv: Use BIT(x) macro to calculate bit positions
batman-adv: Don't break statements after assignment operator
batman-adv: Reduce accumulated length of simple statements
batman-adv: Start new development cycle
ath9k_hw: Handle AR_INTR_SYNC_HOST1_(FATAL|PERR) on AR9003
Syam Sidhardhan (4):
Bluetooth: debug: Correct the PSM printing
Bluetooth: Use kref for l2cap channel reference counting
NFC: Use module_platform_driver macro for nfcwilink.c
NFC: