There is a minor conflict in include/linux/netdevice.h when you pull this in, it's conflicting with Joe Perches's "extern" removal from function prototypes in header files. Simply keep the hunk in the conflict from your local side, and remove "extern" from the two non-inline functions within that hunk. Easy enough. 1) The addition of nftables. No longer will we need protocol aware firewall filtering modules, it can all live in userspace. At the core of nftables is a, for lack of a better term, virtual machine that executes byte codes to inspect packet or metadata (arriving interface index, etc.) and make verdict decisions. Besides support for loading packet contents and comparing them, the interpreter supports lookups in various datastructures as fundamental operations. For example sets are supports, and therefore one could create a set of whitelist IP address entries which have ACCEPT verdicts attached to them, and use the appropriate byte codes to do such lookups. Since the interpreted code is composed in userspace, userspace can do things like optimize things before giving it to the kernel. Another major improvement is the capability of atomically updating portions of the ruleset. In the existing netfilter implementation, one has to update the entire rule set in order to make a change and this is very expensive. Userspace tools exist to create nftables rules using existing netfilter rule sets, but both kernel implementations will need to co-exist for quite some time as we transition from the old to the new stuff. Kudos to Patrick McHardy, Pablo Neira Ayuso, and others who have worked so hard on this. 2) Daniel Borkmann and Hannes Frederic Sowa made several improvements to our pseudo-random number generator, mostly used for things like UDP port randomization and netfitler, amongst other things. In particular the taus88 generater is updated to taus113, and test cases are added. There will be a conflict with the random tree, Hannes gives the following merge resolution suggestion: on merge with the random tree I would suggest to resolve the conflict in drivers/char/random.c like this: if (r->entropy_total > 128) { r->initialized = 1; r->entropy_total = 0; if (r == &nonblocking_pool) { prandom_reseed_late(); pr_notice("random: %s pool is initialized\n", r->name); } } So it won't generate a warning if DEBUG_RANDOM_BOOT gets activated. Let me know if there are any problems with this. 3) Support 64-bit rates in HTB and TBF schedulers, from Eric Dumazet and Yang Yingliang. 4) Add support for new 577xx tigon3 chips to tg3 driver, from Nithin Sujir. 5) Fix two fatal flaws in TCP dynamic right sizing, from Eric Dumazet, Neal Cardwell, and Yuchung Cheng. 6) Allow IP_TOS and IP_TTL to be specified in sendmsg() ancillary control message data, much like other socket option attributes. From Francesco Fusco. 7) Allow applications to specify a cap on the rate computed automatically by the kernel for pacing flows, via a new SO_MAX_PACING_RATE socket option. From Eric Dumazet. 8) Make the initial autotuned send buffer sizing in TCP more closely reflect actual needs, from Eric Dumazet. 9) Currently early socket demux only happens for TCP sockets, but we can do it for connected UDP sockets too. Implementation from Shawn Bohrer. 10) Refactor inet socket demux with the goal of improving hash demux performance for listening sockets. With the main goals being able to use RCU lookups on even request sockets, and eliminating the listening lock contention. From Eric Dumazet. 11) The bonding layer has many demuxes in it's fast path, and an RCU conversion was started back in 3.11, several changes here extend the RCU usage to even more locations. From Ding Tianhong and Wang Yufen, based upon suggestions by Nikolay Aleksandrov and Veaceslav Falico. 12) Allow stackability of segmentation offloads to, in particular, allow segmentation offloading over tunnels. From Eric Dumazet. 13) Significantly improve the handling of secret keys we input into the various hash functions in the inet hashtables, TCP fast open, as well as syncookies. From Hannes Frederic Sowa. The key fundamental operation is "net_get_random_once()" which uses static keys. Hannes even extended this to ipv4/ipv6 fragmentation handling and our generic flow dissector. 14) The generic driver layer takes care now to set the driver data to NULL on device removal, so it's no longer necessary for drivers to explicitly set it to NULL any more. Many drivers have been cleaned up in this way, from Jingoo Han. 15) Add a BPF based packet scheduler classifier, from Daniel Borkmann. 16) Improve CRC32 interfaces and generic SKB checksum iterators so that SCTP's checksumming can more cleanly be handled. Also from Daniel Borkmann. 17) Add a new PMTU discovery mode, IP_PMTUDISC_INTERFACE, which forces using the interface MTU value. This helps avoid PMTU attacks, particularly on DNS servers. From Hannes Frederic Sowa. 18 Use generic XPS for transmit queue steering rather than internal (re-)implementation in virtio-net. From Jason Wang. Please pull, thanks a lot! The following changes since commit be408cd3e1fef73e9408b196a79b9934697fe3b1: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (2013-11-04 06:40:55 -0800) 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 75ecab1df14d90e86cebef9ec5c76befde46e65f: Merge branch 'prandom' (2013-11-11 14:33:06 -0500) ---------------------------------------------------------------- Ajit Khaparde (4): be2net: Call version 2 of GET_STATS ioctl for Skyhawk-R be2net: Display RoCE specific counters in ethtool -S be2net: change the driver version number to 4.9.224.0 be2net: Rework PCIe error report log messaging Albert Pool (1): ar5523: Add USB ID of D-Link WUA-2340 rev A1 Alexander Aring (9): 6lowpan: remove unnecessary ret variable 6lowpan: remove unnecessary check on err >= 0 6lowpan: use netdev_alloc_skb instead dev_alloc_skb 6lowpan: remove skb->dev assignment 6lowpan: remove unnecessary break 6lowpan: remove unnecessary set of headers 6lowpan: set and use mac_len for mac header length 6lowpan: set 6lowpan network and transport header 6lowpan: cleanup skb copy data Alexander Bondar (4): iwlwifi: mvm: Adjust some power management constants iwlwifi: mvm: Add device wide power command iwlwifi: mvm: fix scan request's suspend time parameter iwlwifi: mvm: update UAPSD support TLV bits Alexander Duyck (11): i40e: Drop unused completed stat i40e: Cleanup Tx buffer info layout i40e: Do not directly increment Tx next_to_use i40e: clean up Tx fast path i40e: Drop dead code and flags from Tx hotpath i40e: Add support for Tx byte queue limits i40e: Split bytes and packets from Rx/Tx stats i40e: Move q_vectors from pointer to array to array of pointers i40e: Replace ring container array with linked list i40e: Move rings from pointer to array to array of pointers i40e: Add support for 64 bit netstats Alexander Frolkin (1): ipvs: improved SH fallback strategy Alexandre Rames (1): sfc: Fix DMA unmapping issue with firmware assisted TSO Alexei Starovoitov (1): net: fix rtnl notification in atomic context Amir Vadai (2): net/mlx4: Unused local variable in mlx4_opreq_action net/mlx4_en: Fixed crash when port type is changed Amitkumar Karwar (5): Bluetooth: btmrvl: add btmrvl_send_sync_cmd() function Bluetooth: btmrvl: get rid of struct btmrvl_cmd Bluetooth: btmrvl: add setup handler Bluetooth: btmrvl: add calibration data download support mwifiex: use alloc_workqueue() function Anders K. Pedersen (1): netfilter: ipset: Support package fragments for IPv4 protos without ports Andre Guedes (4): Bluetooth: Rename hci_conn variable in hci_connect_le() Bluetooth: Initialize hci_conn fields in hci_connect_le Bluetooth: Use HCI request for LE connection Bluetooth: Refactor hci_connect_le Andrea Merello (1): atl1e: enable support for NETIF_F_RXALL and NETIF_F_RXCRC features Andreas Henriksson (1): net: Fix "ip rule delete table 256" Andreas Herrmann (1): net: calxedaxgmac: Fix panic caused by MTU change of active interface Andrei Otcheretianski (4): iwlwifi: mvm: Implement BT coex notifications mac80211: fix honouring rate flags in low-rate transmit mac80211: respect rate mask in TX nl80211: fix channel switch parsing Andrey Vagin (1): net: x86: bpf: don't forget to free sk_filter (v2) Andy Zhou (1): openvswitch: collect mega flow mask stats Anjali Singhai (1): i40e: Link code updates Anton Blanchard (1): ixgbe: Reduce memory consumption with larger page sizes Antonio Quartulli (41): MAINTAINERS: batman-adv - update emails batman-adv: switch to a new packet compatibility version batman-adv: use CRC32C instead of CRC16 in TT code batman-adv: move BATADV_TT_CLIENT_TEMP to higher bit batman-adv: make tt_global_add static and return bool batman-adv: remove batadv_tt_global_add_orig declaration batman-adv: don't use call_rcu if not needed batman-adv: h_vlan_encapsulated_proto access refactoring batman-adv: use VLAN_ETH_HLEN instead of sizeof(struct vlan_eth_hdr) batman-adv: use htons when possible batman-adv: create common header for ICMP packets batman-adv: implement batadv_tt_entries batman-adv: make batadv_tt_save_orig_buffer() generic batman-adv: check skb preparation return value batman-adv: update email address for Antonio Quartulli batman-adv: add the VLAN ID attribute to the TT entry batman-adv: use vid when computing local and global TT CRC batman-adv: print the VID together with the TT entries batman-adv: make the GW module correctly talk to the new VLAN-TT batman-adv: make the Distributed ARP Table vlan aware batman-adv: add per VLAN interface attribute framework batman-adv: add sysfs framework for VLAN batman-adv: make the AP isolation attribute VLAN specific batman-adv: remove bogus comment batman-adv: lock around TT operations to avoid sending inconsistent data batman-adv: make the TT CRC logic VLAN specific batman-adv: make the TT global purge routine VLAN specific batman-adv: make the backbone gw check VLAN specific batman-adv: make struct batadv_neigh_node algorithm agnostic batman-adv: make struct batadv_orig_node algorithm agnostic batman-adv: add bat_orig_print API function batman-adv: add bat_neigh_cmp API function batman-adv: add bat_neigh_is_equiv_or_better API function batman-adv: adapt bonding to use the new API functions batman-adv: adapt the neighbor purging routine to use the new API functions batman-adv: provide orig_node routing API batman-adv: adapt the TT component to use the new API functions batman-adv: send GW_DEL event in case of soft-iface destruction batman-adv: invoke dev_get_by_index() outside of is_wifi_iface() batman-adv: improve the TT component to support runtime flag changes batman-adv: include the sync-flags when compute the global/local table CRC Ard Biesheuvel (1): mac80211: port CCMP to cryptoapi's CCM driver Arend van Spriel (14): brcmfmac: fix sparse error 'bad constant expression' brcmfmac: rework rx path bus interface brcmfmac: store address in trace_brcmf_hexdump() brcmfmac: add tracepoint for capturing the SDPCM header brcmfmac: rename variable max_seg_sz to max_seg_cnt for clarity brcmfmac: determine host controller related variables during probe brcmfmac: rework scatter-gather code in brcmf_sdio_buffrw() brcmfmac: rename brcmf_sdio_buffrw() brcmfmac: rework single packet transfers brcmfmac: verify result of brcmf_sdio_addrprep() calls brcmfmac: remove stale code from brcmf_sdcard_recv_chain() brcmfmac: fix brcmf_sdcard_send_pkt() for host without sg support brcmfmac: fix brcmf_sdio_txpkt_prep() for host without sg support brcmfmac: fix brcmf_sdcard_recv_chain() for host without sg support Ariel Elior (1): bnx2x: Don't disable/enable SR-IOV when loading Arik Nemtsov (4): wlcore: ROC on AP channel before auth reply wlcore: re-enable idle handling wlcore: always register dummy hardirq mac80211: implement STA CSA for drivers using channel contexts Arron Wang (3): NFC: pn544: Add SE discover operation NFC: Export nfc_find_se() NFC: pn544: Add SE enable/disable operation Arvid Brodin (1): net/hsr: Add support for the High-availability Seamless Redundancy protocol (HSRv0) Avinash Kumar (2): net: ethernet: eth.c: removed checkpatch warnings and errors drivers: net: phy: marvell.c: removed checkpatch.pl warnings Barak Bercovitz (3): wlcore: read fw panic log only in host mode wlcore: Allow stopping fw log in recovery wlcore: wakeup from ELP before starting recovery Bartosz Markowski (23): ath10k: Remove qca98xx hw1.0 support ath10k: update supported FW build version ath10k: set the UART baud rate to 19200 ath10k: remove obsolete INIT STATUS definitions ath10k: define ath10k_debug_start/_stop as static inline ath10k: introduce dynamic WMI structures ath10k: add wmi_10x_<cmd/event> definitions ath10k: warn if give WMI command is not supported ath10k: implement WMI events handling frame for both firmwares ath10k: split ath10k_wmi_service_ready_event_rx ath10k: drop the fw versioning sanity check ath10k: implement host memory chunks ath10k: bring back the WMI path for mgmt frames ath10k: split wmi_cmd_init path ath10k: add TARGET values for 10.x firmware ath10k: introduce dynamic vdev parameters ath10k: introduce dynamic pdev parameters ath10k: handle FW API differences for scan structures ath10k: enable 10.x firmware branch support ath10k: extend the max_scan time ath10k: do not warn about unsupported vdev param ath10k: rename WMI_CMD_UNDEFINED ath10k: return better errno for unsupported pdev params Baruch Siach (1): netdev: smc91x: enable for xtensa Ben Boeckel (7): epic100: replace printk with netdev_ calls smc91x: replace printk with netdev_ calls smc911x: replace printk with netdev_ calls smsc911x: replace printk with netdev_ calls smc9194: replace printk with netdev_ calls smc91c92_cs: replace printk with netdev_ calls smsc9420: replace printk with netdev_ calls Ben Hutchings (8): sfc: Add EF10 registers to register dump sfc: Fold tso_get_head_fragment() into tso_start() sfc: Implement firmware-assisted TSO for EF10 sfc: Allocate and link PIO buffers; map them with write-combining sfc: Separate out queue-empty check from efx_nic_may_push_tx_desc() sfc: Introduce inline functions to simplify TX insertion sfc: Support ARFS for IPv6 flows net: Delete trailing semi-colon from definition of netdev_WARN() Bjørn Mork (31): net: cdc_mbim: handle IPv6 Neigbor Solicitations net: cdc_mbim: change the default to send ZLPs net: cdc_ncm: simplify and optimize frame padding net: cdc_ncm: add include protection to cdc_ncm.h net: cdc_ncm: remove redundant "intf" field net: cdc_ncm: remove redundant endpoint pointers net: cdc_ncm: remove redundant netdev field net: cdc_ncm: remove unused udev field net: cdc_ncm: remove tx_speed and rx_speed fields net: cdc_ncm: remove ncm_parm field net: cdc_ncm: fix SET_MAX_DATAGRAM_SIZE net: cdc_ncm: remove descriptor pointers net: cdc_ncm: only the control intf can be probed net: cdc_ncm: no point in filling up the NTBs if we send ZLPs net: cdc_ncm: remove probe and disconnect wrappers net: cdc_ncm: remove ethtool ops net: cdc_ncm: set correct dev->hard_mtu net: cdc_ncm: log the length we warn about net: cdc_ncm: use netif_* and dev_* instead of pr_* net: cdc_ncm: log signatures in hex net: cdc_ncm: endian convert constants instead of variables net: cdc_ncm: drop "extern" from header declarations net: cdc_ncm: refactoring cdc_ncm_setup net: cdc_ncm: return proper error if setup fails net: cdc_ncm: improve bind error debug messages net: cdc_ncm: no not set tx_max higher than the device supports net: cdc_mbim: manage_power should always set needs_remote_wakeup net: qmi_wwan: manage_power should always set needs_remote_wakeup net: qmi_wwan: no need to check for resume if suspend exists net: cdc_mbim: no need to check for resume if suspend exists net: cdc_mbim: fixup error return value Carolyn Wyborny (2): igb: Fix master/slave mode for all m88 i354 PHY's igb: Update link modes display in ethtool Catalin Iacob (1): rtlwifi: remove duplicate declarations and macros in headers Catherine Sullivan (2): i40e: Bump version i40e: Bump version Chen Weilong (1): mac802154: Use pr_err(...) rather than printk(KERN_ERR ...) Chris Metcalf (1): ath9k: mark wmi_event_swba as __packed Christoph Paasch (1): net: Dereference pointer-value of sk_prot->memory_pressure Chun-Yeow Yeoh (5): mac80211: refactor the parsing of chan switch ie mac80211: process the CSA frame for mesh accordingly {nl,cfg,mac}80211: enable the triggering of CSA frame in mesh {nl,cfg,mac}80211: implement mesh channel switch userspace API mac80211: process mesh channel switching using beacon Claudiu Manoil (1): gianfar: Simplify MQ polling to avoid soft lockup Cong Wang (1): ipv6: do not allow ipv6 module to be removed Dan Carpenter (7): ax25: cleanup a range test igbvf: integer wrapping bug setting the mtu bonding: bond_get_size() returns wrong size netfilter: nft_compat: use _safe version of list_for_each 6lowpan: release device on error path net: make ndev->irq signed for error handling isdn: icn: NULL dereference printing error message Dan Williams (1): libertas: move firmware lifetime handling to firmware.c Daniel Borkmann (15): net: ipvs: sctp: add missing verdict assignments in sctp_conn_schedule net: sched: cls_bpf: add BPF-based classifier net: ipvs: sctp: do not recalc sctp csum when ports didn't change lib: crc32: clean up spacing in test cases lib: crc32: add functionality to combine two crc32{, c}s in GF(2) lib: crc32: add test cases for crc32{, c}_combine routines net: skb_checksum: allow custom update/combine for walking skb net: sctp: fix and consolidate SCTP checksumming code net: checksum: fix warning in skb_checksum lib: crc32: conditionally resched when running testcases lib: crc32: reduce number of cases for crc32{, c}_combine random32: fix off-by-one in seeding requirement random32: move rnd_state to linux/random.h random32: upgrade taus88 generator to taus113 from errata paper random32: add test cases for taus113 implementation Daniel Mack (3): net: ethernet: cpsw: switch to devres allocations net: phy: at803x: don't pass function pointers with & net: phy: at803x: add suspend/resume callbacks Dave Jones (1): ath10k: add missing braces to ath10k_pci_tx_pipe_cleanup David S. Miller (71): Merge branch 'for-davem' of git://git.kernel.org/.../bwh/sfc-next Merge branch 'cpsw' Merge branch '20130924_dn_externs_2' of git://repo.or.cz/linux-2.6/trivial-mods Merge branch '20130925_dn_externs_3' of git://repo.or.cz/linux-2.6/trivial-mods Merge branch 'bonding_neighbours' Merge branch 'qlge' Merge branch 'master' of git://git.kernel.org/.../klassert/ipsec-next Merge branch '20130926_include_linux_networking_externs' of git://repo.or.cz/linux-2.6/trivial-mods Merge branch 'for-davem' of git://gitorious.org/linux-can/linux-can-next Merge branch 'intel' Merge git://git.kernel.org/.../davem/net Merge branch 'bond_hash' Merge branch 'master' of git://git.kernel.org/.../pablo/nf-next Merge git://git.kernel.org/.../linville/wireless-next Revert "veth: Showing peer of veth type dev in ip link (kernel side)" Merge git://git.kernel.org/.../davem/net Merge branch 'master' of git://git.kernel.org/.../jkirsher/net-next Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge Merge branch 'mlx4' Merge branch 'net-next' of git://git.kernel.org/.../pablo/nftables Merge branch 'bonding_rcu' Merge branch 'xen_netback' Merge branch 'for-davem' of git://git.kernel.org/.../linville/wireless-next Merge branch 'pci_set_drvdata' Merge branch 'tipc' Merge branch 'qlcnic' Merge branch 'master' of git://git.kernel.org/.../klassert/ipsec-next Merge branch 'bonding' bonding: Remove __exit tag from bond_netlink_fini(). Merge branch 'ipip_gso' Merge branch 'net_get_random_once' Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge Merge branch 'pci_set_drvdata' Merge branch 'pernet_sysctls' Merge branch 'sit_tso' Merge branch 'pci_set_drvdata' Merge branch 'master' of git://git.kernel.org/.../jkirsher/net-next Merge git://git.kernel.org/.../davem/net Merge branch 'pci_set_drvdata' Merge branch 'frag_hash_secret' Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge Merge branch 'master' of git://git.kernel.org/.../jkirsher/net-next Merge branch 'bonding_monitor_locking' Revert "Merge branch 'bonding_monitor_locking'" Merge branch '6lowpan' ipv6: Remove privacy config option. Merge branch 'master' of git://git.kernel.org/.../jkirsher/net-next Merge branch '6lowpan' Merge branch 'for-davem' of git://git.kernel.org/.../bwh/sfc-next Merge branch 'master' of git://git.kernel.org/.../jkirsher/net-next Merge branch 'cdc_ncm' Merge branch 'master' of git://git.kernel.org/.../klassert/ipsec-next Merge branch 'sctp_csum' Merge git://git.kernel.org/.../davem/net Merge branch 'qlcnic' Merge branch 'usbnet' Merge branch 'mlx4' Merge branch 'master' of git://git.kernel.org/.../jesse/openvswitch Merge branch 'master' of git://git.kernel.org/.../pablo/nf-next Merge branch 'master' of git://git.kernel.org/.../pablo/nftables 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 Merge branch 'huawei_cdc_ncm' Merge branch 'tipc_fragmentation' Merge branch 'macvlan_hwaccel' Merge branch 'mlx4' Merge branch 'pskb_put' Merge branch 'for-davem' of git://git.kernel.org/.../linville/wireless-next vlan: Implement vlan_dev_get_egress_qos_mask as an inline. Merge branch 'prandom' David Spinadel (4): iwlwifi: mvm: implement NoA testing using testmode cmd iwlwifi: mvm: add no_basic_ssid option iwlwifi: mvm: support sched scan if supported by the fw iwlwifi: mvm: fix operator precedence Denis Kirjanov (1): include/linux/skbuff.h: move CONFIG_XFRM check inside the skb_sec_path() Djalal Harouni (1): iwlwifi: mvm: make debugfs write() operations write up to count bytes DoHyun Pyun (8): Bluetooth: Add the definition and structure for Set Reserved LT_ADDR Bluetooth: Add the definition and structure for Delete Reserved LT_ADDR Bluetooth: Add the definition and structure for Set CSB Data Bluetooth: Add the structure for Write Sync Train Parameters Bluetooth: Add the definition and structure for Set CSB Bluetooth: Add the definition for Start Synchronization Train Bluetooth: Add the definition and stcuture for Sync Train Complete Bluetooth: Add the definition for Slave Page Response Timeout Don Skidmore (7): ixgbevf: cleanup redundant mailbox read failure check ixgbevf: add wait for Rx queue disable ixgbevf: move API neg to reset path ixgbevf: Adds function to set PSRTYPE register ixgbevf: bump driver version ixgbevf: Add zero_base handler to network statistics ixgbe: cleanup IXGBE_DESC_UNUSED Dong Zhu (1): ptp: add the PTP_SYS_OFFSET ioctl to the testptp program Duan Jiong (6): ipv6: remove the unnecessary statement in find_match() vxlan: Use ERR_CAST inlined function instead of ERR_PTR(PTR_ERR(...)) ipv6: drop the judgement in rt6_alloc_cow() smsc: replace IS_ERR and PTR_ERR with PTR_ERR_OR_ZERO net:drivers/net: replace IS_ERR and PTR_ERR with PTR_ERR_OR_ZERO ipv6: use rt6_get_dflt_router to get default router in rt6_route_rcv Eilon Greenstein (1): MAINTAINERS: Update bnx2x maintainer Eliad Peller (7): wlcore: remove unsupported channels wlcore: clarify and fix regulatory domain bit translation mac80211: fix some snprintf misuses ieee80211: fix vht cap definitions wlcore: add ap_event_mask wlcore: fix started_vifs calculation wlcore: save last regdom configuration on stop Emil Tantilov (3): ixgbe: fix rx-usecs range checks for BQL ixgbevf: remove redundant workaround ixgbe: fix inconsistent clearing of the multicast table Emmanuel Grumbach (24): iwlwifi: mvm: use CTS to Self if firmware allows it iwlwifi: pcie: clean RFKILL interrupt in AMPG iwlwifi: mvm: don't sleep while allocating in atomic context iwlwifi: mvm: new BT Coex API iwlwifi: mvm: BT Coex - no need to send envelopes iwlwifi: mvm: BT Coex - use data from firmware iwlwifi: mvm: don't use reduced Tx power when not applicable iwlwifi: mvm: BT Coex - adapt debugfs to new API iwlwifi: mvm: BT Coex - Correctly enable and treat rssi events iwlwifi: pcie: dump_stack upon timeout of SYNC cmd iwlwifi: mvm: BT Coex - don't limit agg size in loose scheme iwlwifi: mvm: BT Coex - set the proper LUT for single ant devices iwlwifi: pcie: restart the driver when a command times out iwlwifi: mvm: BT Coex - track bandwidth changes in HT iwlwifi: mvm: BT Coex - tune SMPS parameters iwlwifi: mvm: BT Coex - start AMPDU even when BT is active iwlwifi: mvm: BT Coex - remove duplicate code in rate control iwlwifi: mvm: BT Coex - update integration with rate control iwlwifi: mvm: BT Coex - always set mandatory fields iwlwifi: mvm: BT Coex - enable Tx power based on BT status iwlwifi: dvm: don't override mac80211's queue setting mac80211: implement SMPS for AP iwlwifi: mvm: BT Coex fix NULL pointer dereference iwlwifi: mvm: BT Coex - fix copy paste issue Enrico Mioso (3): net: cdc_ncm: Export cdc_ncm_{tx, rx}_fixup functions for re-use net: huawei_cdc_ncm: Introduce the huawei_cdc_ncm driver net: cdc_ncm: remove non-standard NCM device IDs Eran Harary (2): iwlwifi: Support 7265 devices iwlwifi: support Signed firmware image and Dual CPUs Eric Dumazet (40): net_sched: add u64 rate to psched_ratecfg_precompute() net_sched: htb: support of 64bit rates tcp: fix dynamic right sizing net: introduce SO_MAX_PACING_RATE net: add missing sk_max_pacing_rate doc net: skb_is_gso_v6() requires skb_is_gso() tcp: sndbuf autotuning improvements inet: consolidate INET_TW_MATCH tcp: shrink tcp6_timewait_sock by one cache line net_sched: increment drop counters in qdisc_tree_decrease_qlen() tcp/dccp: remove twchain ipv6: make lookups simpler and faster udp: fix a typo in __udp4_lib_mcast_demux_lookup net: fix build errors if ipv6 is disabled net: gro: allow to build full sized skb inet: includes a sock_common in request_sock tcp: use ACCESS_ONCE() in tcp_update_pacing_rate() inet: rename ir_loc_port to ir_num tcp: tcp_transmit_skb() optimizations netfilter: xt_socket: use sock_gen_put() inet_diag: use sock_gen_put() ipv4: shrink rt_cache_stat net: refactor sk_page_frag_refill() tcp: rename tcp_tso_segment() ipv4: gso: send_check() & segment() cleanups ipv6: gso: remove redundant locking net: generalize skb_segment() ipv4: generalize gre_handle_offloads ipv4: gso: make inet_gso_segment() stackable ipip: add GSO/TSO support bnx2x: add TSO support for IPIP xfrm: use vmalloc_node() for percpu scratches ipv6: gso: make ipv6_gso_segment() stackable ipv6: sit: add GSO/TSO support bnx2x: add TSO support for SIT tunnels inet: restore gso for vxlan veth: extend features to support tunneling net: extend net_device allocation to vmalloc() inet: fix a UFO regression net: flow_dissector: small optimizations in IPv4 dissect Eric Lapuyade (8): NFC: NCI: Fix wrong allocation size in nci_spi_allocate_device() NFC: NCI: Rename spi ndev -> nsdev and nci_dev -> ndev for consistency NFC: Move struct nfc_phy_ops out of HCI up to nfc core level NFC: NCI: Simplify NCI SPI to become a simple framing/checking layer NFC: NCI: Store the spi device pointer from the spi instance NFC: NCI: zero struct spi_transfer variables before usage NFC: NCI: nci_spi_recv_frame() now returns (not forward) the read frame NFC: NCI: Modify NCI SPI to implement CS/INT handshake per the spec Eric Leblond (1): netfilter: nf_tables: add insert operation Eric W. Biederman (8): net ipv4: Convert ipv4.ip_local_port_range to be per netns v3 net: Separate the close_list and the unreg_list v2 tcp_memcontrol: Remove tcp_max_memory tcp_memcontrol: Remove setting cgroup settings via sysctl tcp_memcontrol: Remove the per netns control. tcp_memcontrol: Kill struct tcp_memcontrol ipv4: Use math to point per net sysctls into the appropriate struct net. ipv4: Allow unprivileged users to use per net sysctls Erik Hugne (4): tipc: simplify the link lookup routine tipc: don't reroute message fragments tipc: message reassembly using fragment chain tipc: reassembly failures should cause link reset Eugene Krasnikov (1): wcn36xx: mac80211 driver for Qualcomm WCN3660/WCN3680 hardware Eugenia Emantayev (3): net/mlx4_en: Datapath resources allocated dynamically net/mlx4_core: ICM pages are allocated on device NUMA node net/mlx4_en: Datapath structures are allocated per NUMA node Eyal Perry (4): net/mlx4_core: Load higher level modules according to ports type net/vlan: Provide read access to the vlan egress map RDMA/cma: Set IBoE SL (user-priority) by egress map when using vlans net/mlx4_en: Add RFS support in UDP Eyal Shapira (5): iwlwifi: mvm: remove rs FSM actions relevant only for 3 antennas iwlwifi: mvm: fix switch from shared antenna in case of BT load iwlwifi: mvm: update expected tpt tables for VHT iwlwifi: mvm: support VHT in rs iwlwifi: mvm: remove GF support in rs Eytan Lifshitz (3): iwlwifi: mvm: change the name of init_ucode_run flag iwlwifi: mvm: prevent the NIC to be powered at driver load time. iwlwifi: mvm: add support for NICs which have only 16 Tx queues. Fabio Porcedda (2): net: qmi_wwan: add Telit LE920 newer firmware support net: qmi_wwan: fix checkpatch warnings Fan Du (3): {ipv4,xfrm}: Introduce xfrm_tunnel_notifier for xfrm tunnel mode callback xfrm: Force SA to be lookup again if SA in acquire state xfrm: Simplify SA looking up when using wildcard source Felipe Balbi (1): net: wireless: wl1251: update firmware path Felipe Pena (2): drivers: net: wireless: b43: Fix possible NULL ptr dereference drivers: net: wireless: Fix wrong check for reassociation request retry counter Felix Fietkau (12): ath9k: use a separate data structure for rx buffers ath9k_hw: remove direct accesses to channel mode flags ath9k_hw: remove IS_CHAN_B() ath9k_hw: remove IS_CHAN_OFDM() ath9k_hw: simplify channel flags ath9k: make ath9k_cmn_update_ichannel static ath9k: move channel change code to ath_set_channel ath9k: remove sc->config.cabqReadyTime ath9k: make ath9k_uses_beacons static ath9k_hw: remove references to hw->conf ath5k: fix regression in tx status processing mac80211: add ieee80211_tx_prepare_skb() helper function Fengguang Wu (5): sfc: efx_ethtool_get_ts_info() can be static sfc: efx_ef10_filter_update_rx_scatter() can be static NFC: digital: digital_tg_send_sensf_res() can be static ath10k: remove unneded semicolon from ath10k_core_fetch_firmware_api_n() wcn36xx: fix coccinelle warnings Florent Fourcot (4): ipv6: remove old conditions on flow label sharing ipv6: enable IPV6_FLOWLABEL_MGR for getsockopt ipv6: increase maximum lifetime of flow labels ipv6: protect flow label renew against GC Florian Westphal (3): tcp: syncookies: reduce cookie lifetime to 128 seconds tcp: syncookies: reduce mss table to four values bridge: netfilter: orphan skb before invoking ip netfilter hooks Francesco Fusco (2): ipv4: IP_TOS and IP_TTL can be specified as ancillary data ipv4: processing ancillary IP_TOS or IP_TTL Franky Lin (4): brcmfmac: sync firmware event list brcmfmac: add BCM4339 SDIO interface support brcmfmac: add valid core index check in related functions brcmfmac: reserve memory for bus layer in sk_buff::cb Fred Zhou (2): mac80211: use exact-size allocation for authentication frame mac80211: improve default WMM parameter setting Fujinaka, Todd (2): igb: Add ethtool offline tests for i354 igb: Don't let ethtool try to write to iNVM in i210/i211 Gabor Juhos (39): rt2x00: rt2800lib: fix band selection and LNA PE control for RT3593 PCIe cards rt2x00: rt2800lib: remove TXMIXER_GAIN entries from the extended EEPROM map rt2x00: rt2800lib: remove TXPOWER_DELTA entry from extended EEPROM map rt2x00: rt2800lib: fix default VGC values for RT3593 rt2x00: rt2800lib: fix VGC programming for RT3572 and RT3593 rt2x00: rt2800lib: fix default VGC values for RT3572 for the 5GHz band rt2x00: use generic EWMA functions for average RSSI calculations rt2x00: rt2800lib: fix VGC adjustment for RT5592 rt2x00: rt2800lib: fix VGC adjustment for RT3572 and RT3593 rt2x00: cleanup indentation in rt2800.h rt2x00: add rt2x00_has_cap_* helpers rt2x00: rt2x00lib: use rt2x00_has_cap_* helpers rt2x00: rt2800lib: use rt2x00_has_cap_* helpers rt2x00: rt61pci: use rt2x00_has_cap_* helpers rt2x00: rt73usb: use rt2x00_has_cap_* helpers rt2x00: rt2800lib: use {tx,rx}_chain_num to avoid superfluous EEPROM access rt2x00: rt2800lib: use switch statement for RF specific setup rt2x00: rt2800lib: autodetect 5GHz band support rt2x00: create a new module for rt2800 MMIO code rt2x00: rt2800pci: use rt2800mmio prefix for TX descriptor functions rt2x00: rt2800pci: move TX descriptor functions to the rt2800mmio module rt2x00: rt2800pci: use rt2800mmio prefix for RX control handler functions rt2x00: rt2800pci: move RX control handler functions to the rt2800mmio module rt2x00: rt2800pci: use rt2800mmio prefix for interrupt functions rt2x00: rt2800pci: move interrupt functions to the rt2800mmio module rt2x00: rt2800pci: use rt2800mmio prefix for queue functions rt2x00: rt2800pci: move queue functions to the rt2800mmio module rt2x00: rt2800pci: use rt2800mmio prefix for initialization functions rt2x00: rt2800pci: move initialization functions to the rt2800mmio module rt2x00: rt2800pci: use separate ops for the SoC driver rt2x00: rt2800pci: use separate read_eeprom callback for SoC devices rt2x00: rt2800pci: use separate firmware callbacks for SoC devices rt2x00: rt2800pci: use separate set_state callback for SoC devices rt2x00: rt2800pci: rename rt2800pci_disable_radio function rt2x00: rt2800pci: split rt2800pci_enable_radio function rt2x00: rt2800pci: move rt2800mmio_enable_radio function to another module rt2x00: rt2800pci: use separate hwcrypt_disabled callback for SoC devices rt2x00: rt2800pci: move SoC specific code into a separate module rt2x00: rt2800pci: use module_pci_driver macro Gao feng (13): netfilter: xt_TCPMSS: Get mtu only if clamp-mss-to-pmtu is specified netfilter: xt_TCPMSS: lookup route from proper net namespace netfilter: nfnetlink_queue: use proper net namespace to allocate skb netfilter: nfnetlink_log: use proper net to allocate skb cgroup: netprio: remove unnecessary task_netprioidx cgroup: cls: remove unnecessary task_cls_classid veth: allow to setup multicast address for veth device netfilter: ipt_CLUSTERIP: make proc directory per net namespace netfilter: ipt_CLUSTERIP: make clusterip_list per net namespace netfilter: ipt_CLUSTERIP: make clusterip_lock per net namespace netfilter: ipt_CLUSTERIP: add parameter net in clusterip_config_find_get netfilter: ipt_CLUSTERIP: create proc entry under proper ipt_CLUSTERIP directory netfilter: ipt_CLUSTERIP: use proper net namespace to operate CLUSTERIP Gavin Shan (2): net/benet: Remove interface type net/benet: Make lancer_wait_ready() static Gustavo Padovan (15): Merge git://git.kernel.org/.../bluetooth/bluetooth Bluetooth: Extend state_change() call to report errors too Bluetooth: Add l2cap_state_change_and_error() Bluetooth: Access sk_sndtimeo indirectly in l2cap_core.c Bluetooth: Add chan->ops->set_shutdown() Bluetooth: Move l2cap_wait_ack() to l2cap_sock.c Bluetooth: use l2cap_chan_ready() instead of duplicate code Bluetooth: Remove not used struct sock Bluetooth: Do not access chan->sk directly Bluetooth: Hold socket in defer callback in L2CAP socket Bluetooth: Remove socket lock from l2cap_state_change() Bluetooth: Remove parent socket usage from l2cap_core.c Bluetooth: Add L2CAP channel to skb private data Bluetooth: Use bt_cb(skb)->chan to send raw data back Bluetooth: Remove sk member from struct l2cap_chan Hagen Paul Pfeifer (1): netem: markov loss model transition fix Hannes Frederic Sowa (25): net: neighbour: use source address of last enqueued packet for solicitation ipv6: avoid high order memory allocations for /proc/net/ipv6_route ipv6: compare sernum when walking fib for /proc/net/ipv6_route as safety net ipv4: split inet_ehashfn to hash functions per compilation unit ipv6: split inet6_ehashfn to hash functions per compilation unit static_key: WARN on usage before jump_label_init was called x86/jump_label: expect default_nop if static_key gets enabled on boot-up net: introduce new macro net_get_random_once inet: split syncookie keys for ipv4 and ipv6 and initialize with net_get_random_once inet: convert inet_ehash_secret and ipv6_hash_secret to net_get_random_once tcp: switch tcp_fastopen key generation to net_get_random_once net: switch net_secret key generation to net_get_random_once net: fix build warnings because of net_get_random_once merge net: always inline net_secret_init ipv4: initialize ip4_frags hash secret as late as possible ipv6: split inet6_hash_frag for netfilter and initialize secrets with net_get_random_once inet: remove old fragmentation hash initializing net: make net_get_random_once irq safe net: initialize hashrnd in flow_dissector with net_get_random_once ipv4: fix DO and PROBE pmtu mode regarding local fragmentation with UFO/CORK ipv4: introduce new IP_MTU_DISCOVER mode IP_PMTUDISC_INTERFACE ipv6: fix headroom calculation in udp6_ufo_fragment ipv6: protect for_each_sk_fl_rcu in mem_check with rcu_read_lock_bh random32: add periodic reseeding random32: add prandom_reseed_late() and call when nonblocking pool becomes initialized Hans de Goede (1): Bluetooth: revert: "Bluetooth: Add missing reset_resume dev_pm_ops" Hante Meuleman (1): brcmfmac: Use fw filename and nvram based of devid for sdio. Hauke Mehrtens (8): b44: add support for Byte Queue Limits bgmac: add support for Byte Queue Limits tg3: add support a phy at an address different than 01 ssb: provide phy address for Gigabit Ethernet driver tg3: use phylib when robo switch is in use bcma: reject PCI cards in bcma. bcma: add PCI id 0x4313 brcmsmac: add support for a BCM4313 with PCI id 0x4313 Heikki Krogerus (5): net: rfkill: gpio: convert to resource managed allocation net: rfkill: gpio: clean up clock handling net: rfkill: gpio: spinlock-safe GPIO access net: rfkill: gpio: prepare for DT and ACPI support net: rfkill: gpio: add ACPI support Himanshu Madhani (5): qlcnic: update version to 5.3.51 qlcnic: Enhance ethtool Statistics for Multiple Tx queue. qlcnic: refactor Tx/SDS ring calculation and validation in driver. qlcnic: Enable multiple Tx queue support for 83xx/84xx Series adapters. qlcnic: update version to 5.3.52 Holger Eitzenberger (2): netfilter: introduce nf_conn_acct structure netfilter: ctnetlink: account both directions in one step Hong Zhiguo (1): e1000: fix wrong queue idx calculation Idan Kahlon (1): iwlwifi: mvm: NVM - increase max section size Ido Reis (2): wlcore: fwlog dynamic mem_block control wl12xx/wl18xx: update default fw logger's settings Igal Chernobelsky (3): wl18xx: default config alignment with phy defaults wlcore: fix interrogate command length wlcore/wl18xx/wl12xx: FW log params per chip arch Ivan Vecera (1): tg3: avoid double-freeing of rx data memory Jack Morgenstein (10): net/mlx4_core: Fix register/unreg vlan flow net/mlx4_core: Fix reg/unreg vlan/mac to conform to the firmware spec net/mlx4_en: Use vlan id instead of vlan index for unregistration net/mlx4_core: Resource tracker for reg/unreg vlans net/mlx4_core: Don't fail reg/unreg vlan for older guests net/mlx4_core: Fix checking order in MR table init mlx4: Structures and init/teardown for VF resource quotas net/mlx4_core: Fix quota handling in the QUERY_FUNC_CAP wrapper net/mlx4_core: Implement resource quota enforcement net/mlx4_core: Initialize all mailbox buffers to zero before use Jacob Keller (13): ixgbevf: do not print registers to dmesg in ixgbevf_get_regs ixgbe: remove marketing names from busy poll code ixgbe: cleanup ixgbe_enumerate_functions ixgbevf: implement ethtool get/set coalesce net: add might_sleep() call to napi_disable ixgbe: fix qv_lock_napi call in ixgbe_napi_disable_all ixgbe: show <2% for encoding loss on PCIe Gen3 ixgbe: remove unnecessary duplication of PCIe bandwidth display ixgbevf: add ixgbevf_rx_skb ixgbevf: have clean_rx_irq return total_rx_packets cleaned ixgbevf: implement CONFIG_NET_RX_BUSY_POLL ixgbevf: add BP_EXTENDED_STATS for CONFIG_NET_RX_BUSY_POLL ixgbe: add warning when max_vfs is out of range. Janusz Dziedzic (7): ath10k: setup peer UAPSD flag correctly ath10k: check allocation errors in CE cfg80211: parse dfs region for internal regdb option ath9k: dfs kill ath9k specyfic code ath9k: dfs move ath_dfs_pool_stats ath9k: dfs use CFG80211_CERTIFICATION_ONUS flag ath9k/ath: move dfs pattern detector to ath Jarno Rajahalme (2): openvswitch: Widen TCP flags handling. openvswitch: TCP flags matching support. Jason Gunthorpe (1): net: mv643xx_eth: Add missing phy_addr_set in DT mode Jason Wang (3): net: introduce skb_coalesce_rx_frag() virtio-net: coalesce rx frags when possible during rx virtio-net: switch to use XPS to choose txq Jeff Kirsher (1): ixgbe: Cleanup the use of tabs and spaces Jesper Dangaard Brouer (1): net: codel: Avoid undefined behavior from signed overflow Jesper Juhl (1): isdn: eicon: free pointer after using it in log msg in divas_um_idi_delete_entity() Jesse Brandeburg (6): i40e: do not flush after re-enabling interrupts i40e: debugfs fixups i40e: clamp debugfs nvm read command i40e: fix use of untrusted scalar value warning i40e: fix sign extension issue i40e: refactor fdir setup function Jingoo Han (89): wireless: ath10k: remove unnecessary pci_set_drvdata() can: at91_can: use dev_get_platdata() can: bfin_can: use dev_get_platdata() can: cc770: use dev_get_platdata() can: flexcan: use dev_get_platdata() can: janz-ican3: use dev_get_platdata() can: mcp251x: use dev_get_platdata() can: sja1000: use dev_get_platdata() can: softing: use dev_get_platdata() can: ti_hecc: use dev_get_platdata() can: c_can: remove unnecessary pci_set_drvdata() can: pch_can: remove unnecessary pci_set_drvdata() can: sja1000: remove unnecessary pci_set_drvdata() mwifiex: Remove casting the return value which is a void pointer wireless: ath5k: use dev_get_platdata() wireless: ath9k: use dev_get_platdata() wireless: brcmfmac: use dev_get_platdata() wireless: cw1200: use dev_get_platdata() wireless: libertas: use dev_get_platdata() wireless: wl1251: use dev_get_platdata() wireless: wlcore: use dev_get_platdata() wireless: wl12xx: use dev_get_platdata() wireless: rtlwifi: remove unnecessary pci_set_drvdata() wireless: iwlegacy: remove unnecessary pci_set_drvdata() wireless: adm8211: remove unnecessary pci_set_drvdata() wireless: airo: remove unnecessary pci_set_drvdata() wireless: ath10k: remove unnecessary pci_set_drvdata() wireless: wil6210: remove unnecessary pci_set_drvdata() wireless: ipw2x00: remove unnecessary pci_set_drvdata() wireless: mwl8k: remove unnecessary pci_set_drvdata() wireless: orinoco: remove unnecessary pci_set_drvdata() wireless: p54pci: remove unnecessary pci_set_drvdata() wireless: rtl818x: remove unnecessary pci_set_drvdata() wireless: iwlwifi: remove unnecessary pci_set_drvdata() net: typhoon: remove unnecessary pci_set_drvdata() net: 8390: remove unnecessary pci_set_drvdata() net: starfire: remove unnecessary pci_set_drvdata() net: pcnet32: remove unnecessary pci_set_drvdata() net: amd8111e: remove unnecessary pci_set_drvdata() net: alx: remove unnecessary pci_set_drvdata() net: bnx2: remove unnecessary pci_set_drvdata() net: bnx2x: remove unnecessary pci_set_drvdata() net: tg3: remove unnecessary pci_set_drvdata() net: bna: remove unnecessary pci_set_drvdata() net: cxgb4: remove unnecessary pci_set_drvdata() net: cxgb3: remove unnecessary pci_set_drvdata() net: cxgb2: remove unnecessary pci_set_drvdata() net: cxgb4vf: remove unnecessary pci_set_drvdata() net: enic: remove unnecessary pci_set_drvdata() net: tulip: remove unnecessary pci_set_drvdata() net: sundance: remove unnecessary pci_set_drvdata() net: dl2k: remove unnecessary pci_set_drvdata() net: be2net: remove unnecessary pci_set_drvdata() net: fealnx: remove unnecessary pci_set_drvdata() net: icplus: remove unnecessary pci_set_drvdata() net: e100: remove unnecessary pci_set_drvdata() net: jme: remove unnecessary pci_set_drvdata() net: skge: remove unnecessary pci_set_drvdata() net: sky2: remove unnecessary pci_set_drvdata() net: ksz884x: remove unnecessary pci_set_drvdata() net: myri10ge: remove unnecessary pci_set_drvdata() net: natsemi: remove unnecessary pci_set_drvdata() net: neterion: remove unnecessary pci_set_drvdata() net: packetengines: remove unnecessary pci_set_drvdata() net: pasemi: remove unnecessary pci_set_drvdata() net: netxen: remove unnecessary pci_set_drvdata() net: qlge: remove unnecessary pci_set_drvdata() net: qlcnic: remove unnecessary pci_set_drvdata() net: qla3xxx: remove unnecessary pci_set_drvdata() net: r6040: remove unnecessary pci_set_drvdata() net: 8139cp: remove unnecessary pci_set_drvdata() net: 8139too: remove unnecessary pci_set_drvdata() net: r8169: remove unnecessary pci_set_drvdata() net: sis190: remove unnecessary pci_set_drvdata() net: epic100: remove unnecessary pci_set_drvdata() net: smsc9420: remove unnecessary pci_set_drvdata() net: stmmac: remove unnecessary pci_set_drvdata() net: sunhme: remove unnecessary pci_set_drvdata() net: cassini: remove unnecessary pci_set_drvdata() net: cxgb4vf: use DEFINE_PCI_DEVICE_TABLE net: tulip: use DEFINE_PCI_DEVICE_TABLE net: ksz884x: use DEFINE_PCI_DEVICE_TABLE net: sungem: remove unnecessary pci_set_drvdata() net: niu: remove unnecessary pci_set_drvdata() net: tehuti: remove unnecessary pci_set_drvdata() net: tlan: remove unnecessary pci_set_drvdata() net: spider_net: remove unnecessary pci_set_drvdata() net: tc35815: remove unnecessary pci_set_drvdata() net: via-rhine: remove unnecessary pci_set_drvdata() Jiri Benc (1): nfnetlink: do not ack malformed messages Jiri Pirko (9): bonding: push Netlink bits into separate file bonding: move mode setting into separate function bonding: move active_slave setting into separate function bonding: remove bond_ioctl_change_active() bonding: move active_slave getting into separate function bonding: add Netlink support mode option bonding: add Netlink support active_slave option ip6_output: fragment outgoing reassembled skb properly netfilter: push reasm skb through instead of original frag skbs Jitendra Kalsaria (3): qlge: Enhance nested VLAN (Q-in-Q) handling. qlge: Update version to 1.00.00.33 qlcnic: Update ethtool standard pause settings. Joe Perches (96): compat.h: Remove extern from function prototypes dcbevent.h: Remove extern from function prototypes decnet (dn*.h): Remove extern from function prototypes dst.h: Remove extern from function prototypes esp.h: Remove extern from function prototypes fib_rules.h: Remove extern from function prototypes flow.h/flow_keys.h: Remove extern from function prototypes garp.h: Remove extern from function prototypes gen_stats.h: Remove extern from function prototypes genetlink.h: Remove extern from function prototypes icmp.h: Remove extern from function prototypes inet*.h: Remove extern from function prototypes ip*.h: Remove extern from function prototypes ipx.h: Remove extern from function prototypes lapb.h: Remove extern from function prototypes llc*.h: Remove extern from function prototypes mrp.h: Remove extern from function prototypes ndisc.h: Remove extern from function prototypes net_namespace.h: Remove extern from function prototypes iw_handler.h: Remove extern from function prototypes netevent/netlink.h: Remove extern from function prototypes netrom.h: Remove extern from function prototypes p8022.h: Remove extern from function prototypes ping.h: Remove extern from function prototypes protocol.h: Remove extern from function prototypes psnap.h: Remove extern from function prototypes raw/rawv6.h: Remove extern from function prototypes request_sock.h: Remove extern from function prototypes rose.h: Remove extern from function prototypes route.h: Remove extern from function prototypes rtnetlink.h: Remove extern from function prototypes scm.h: Remove extern from function prototypes secure_seq.h: Remove extern from function prototypes sock.h: Remove extern from function prototypes stp.h: Remove extern from function prototypes tcp.h: Remove extern from function prototypes udp.h: Remove extern from function prototypes udplite.h: Remove extern from function prototypes wext.h: Remove extern from function prototypes wimax.h: Remove extern from function prototypes x25.h: Remove extern from function prototypes xfrm.h: Remove extern from function prototypes bluetooth: Remove extern from function prototypes caif_hsi.h: Remove extern from function prototypes irda: Remove extern from function prototypes netfilter: Remove extern from function prototypes sctp: Remove extern from function prototypes can: Remove extern from function prototypes 8390: Remove extern from function prototypes adi: Remove extern from function prototypes atheros: Remove extern from function prototypes broadcom: Remove extern from function prototypes brocade: Remove extern from function prototypes chelsio: Remove extern from function prototypes emulex: Remove extern from function prototypes gianfar: Remove extern from function prototypes amd/7990: Remove extern from function prototypes ibm/emac: Remove extern from function prototypes intel: Remove extern from function prototypes oki-semi: Remove extern from function prototypes qlogic: Remove extern from function prototypes sfc: Remove extern from function prototypes stmicro: Remove extern from function prototypes ti: Remove extern from function prototypes toshiba: Remove extern from function prototypes fddi/skfp: Remove extern from function prototypes irda: Remove extern from function prototypes NFC: Replace nfc_dev_dbg with dev_dbg NFC: Convert nfc_dev_info and nfc_dev_err to nfc_<level> NFC: Standardize logging style vmxnet3: Remove extern from function prototypes wan: Remove extern from function prototypes wimax: Remove extern from function prototypes ath: Remove extern from function prototypes brcm80211: Remove extern from function prototypes ipw2x00: Remove extern from function prototypes iwlegacy: Remove extern from function prototypes iwlwifi: Remove extern from function prototypes mwifiex: Remove extern from function prototypes orinoco: Remove extern from function prototypes rtlwifi: Remove extern from function prototypes netfilter: Remove extern from function prototypes net.h/skbuff.h: Remove extern from function prototypes [networking]device.h: Remove extern from function prototypes net:drivers/net: Miscellaneous conversions to ETH_ALEN ath10k: wmi: Convert use of 6 to ETH_ALEN fib: Use const struct nl_info * in rtmsg_fib net: 8021q/bluetooth/bridge/can/ceph: Remove extern from function prototypes net: dccp: Remove extern from function prototypes net: ipv4/ipv6: Remove extern from function prototypes net: misc: Remove extern from function prototypes nf_tables*.h: Remove extern from function prototypes netconsole: Convert to pr_<level> jme: Remove unused #define PFX smsc9420: Use netif_<level> udp: Remove unnecessary semicolon from do{}while (0) macro Johan Hedberg (60): Bluetooth: Remove unused event mask struct Bluetooth: Fix double error response for l2cap_create_chan_req Bluetooth: Fix L2CAP error return used for failed channel lookups Bluetooth: Fix L2CAP Disconnect response for unknown CID Bluetooth: Fix L2CAP command reject reason Bluetooth: Fix sending responses to identified L2CAP response packets Bluetooth: Fix responding to invalid L2CAP signaling commands Bluetooth: Fix waiting for clearing of BT_SK_SUSPEND flag Bluetooth: Add synchronization train parameters reading support Bluetooth: Add event mask page 2 setting support Bluetooth: Add clarifying comment to bt_sock_wait_state() Bluetooth: Clean up socket locking in l2cap_sock_recvmsg Bluetooth: Fix busy return for mgmt_set_powered in some cases Bluetooth: Move mgmt response convenience functions to a better location Bluetooth: Use async request for LE enable/disable Bluetooth: Add new mgmt setting for LE advertising Bluetooth: Add new mgmt_set_advertising command Bluetooth: Refactor hci_dev_open to a separate hci_dev_do_open function Bluetooth: Fix workqueue synchronization in hci_dev_open Bluetooth: Introduce a new HCI_BREDR_ENABLED flag Bluetooth: Add a new mgmt_set_bredr command Bluetooth: Fix REJECTED vs NOT_SUPPORTED mgmt responses Bluetooth: Fix advertising data flags with disabled BR/EDR Bluetooth: Rename HCI_LE_PERIPHERAL to HCI_ADVERTISING Bluetooth: Add public mgmt function to send New Settings event Bluetooth: Fix re-enabling advertising after a connection Bluetooth: Fix changing advertising setting while LE is connected Bluetooth: Fix potential double-frees of L2CAP skbs Bluetooth: Fix checking for HCI_SETUP flag when receiving mgmt commands Bluetooth: Reorganize set_connectable HCI command sending Bluetooth: Move more logic into set_connectable complete callback Bluetooth: Add missing error handling for Set Connectable Bluetooth: Move static advertising functions to avoid forward declarations Bluetooth: Fix updating advertising data needlessly Bluetooth: Make Set Connectable also update the LE advertising type Bluetooth: Move set_bredr_scan() to avoid forward declaration Bluetooth: Fix updating scan mode in set_bredr() Bluetooth: Convert Set Discoverable to use an asynchronous request Bluetooth: Reject invalid bdaddr types for sockets Bluetooth: Check that bind() bdaddr type matches connect() Bluetooth: Fix L2CAP "Command Reject: Invalid CID" response Bluetooth: Remove unused command reject mapping for EMSGSIZE Bluetooth: Remove useless l2cap_err_to_reason function Bluetooth: Ignore A2MP data on non-BR/EDR links Bluetooth: Ignore SMP data on non-LE links Bluetooth: Fix updating the right variable in update_scan_rsp_data() Bluetooth: Reintroduce socket restrictions for LE sockets Bluetooth: Convert auto accept timer to use delayed work Bluetooth: Convert idle timer to use delayed work Bluetooth: Fix ATT socket backwards compatibility with user space Bluetooth: Check for flag instead of features in update_scan_rsp_data() Bluetooth: Check for flag instead of features in update_adv_data() Bluetooth: Add missing check for BREDR_ENABLED flag in update_class() Bluetooth: Refactor set_connectable settings update to separate function Bluetooth: Fix updating settings when there are no HCI commands to send Bluetooth: Move mgmt_pending_find to avoid forward declarations Bluetooth: Fix sending write_scan_enable when BR/EDR is disabled Bluetooth: Move HCI_LIMITED_DISCOVERABLE changes to a general place Bluetooth: Update Set Discoverable to support LE Bluetooth: Fix enabling fast connectable on LE-only controllers Johannes Berg (24): mac80211: add ieee80211_iterate_active_interfaces_rtnl() mac80211: use ERR_CAST() mac80211: add explicit IBSS driver operations regulatory: enable channels 52-64 and 100-144 for world roaming iwlwifi: pcie: fix merge damage iwlwifi: mvm: implement beacon filtering testmode command iwlwifi: mvm: query firmware for non-QoS seqno iwlwifi: mvm: give client MACs time to synchronise during restart iwlwifi: mvm: fix locking in iwl_mvm_bt_rssi_event() iwlwifi: mvm: implement new IPv6 offload API Bluetooth: Fix variable shadow warnings Merge remote-tracking branch 'wireless-next/master' into HEAD iwlwifi: mvm: keep connection to AP after WoWLAN iwlwifi: pcie: poke device when commands don't complete quickly iwlwifi: mvm: add IBSS support mac80211: disable WMM with invalid parameters cfg80211: fix scheduled scan pointer access mac80211: add missing IEEE80211_HW_SUPPORTS_HT_CCK_RATES docs cfg80211: fix docbook references iwlwifi: transport config n_no_reclaim_cmds should be unsigned iwlwifi: pcie: move warning message into warning iwlwifi: mvm: capture the FCS in monitor mode iwlwifi: mvm: add missing break in debugfs iwlwifi: warn if firmware image doesn't exist John Fastabend (5): macvlan: resolve ENOENT errors on creation net: Add layer 2 hardware acceleration operations for macvlan devices ixgbe: enable l2 forwarding acceleration for macvlans ixgbe: fix build err, num_rx_queues is only available with CONFIG_RPS ixgbe: deleting dfwd stations out of order can cause null ptr deref John W. Linville (21): Merge branch 'for-linville' of git://github.com/kvalo/ath Merge branch 'for-linville' of git://git.kernel.org/.../luca/wl12xx Merge tag 'for-linville-20131001' of git://github.com/kvalo/ath Merge branch 'for-upstream' of git://git.kernel.org/.../bluetooth/bluetooth-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/.../iwlwifi/iwlwifi-fixes Merge branch 'for-john' of git://git.kernel.org/.../jberg/mac80211 Merge branch 'for-upstream' of git://git.kernel.org/.../bluetooth/bluetooth-next Merge branch 'for-linville' of git://github.com/kvalo/ath Merge branch 'for-john' of git://git.kernel.org/.../iwlwifi/iwlwifi-next Merge tag 'nfc-next-3.13-1' of git://git.kernel.org/.../sameo/nfc-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/.../jberg/mac80211 Merge branch 'for-upstream' of git://git.kernel.org/.../bluetooth/bluetooth-next Merge branch 'for-linville' of git://git.kernel.org/.../luca/wl12xx Merge branch 'for-john' of git://git.kernel.org/.../iwlwifi/iwlwifi-next Merge branch 'master' of git://git.kernel.org/.../bluetooth/bluetooth Merge branch 'master' of git://git.kernel.org/.../linville/wireless-next into for-davem Jon Cooper (1): sfc: Use TX PIO for sufficiently small packets Jonas Jensen (2): phy: Add MOXA MDIO driver PHY: Add RTL8201CP phy_driver to realtek Joseph Gasparakis (1): vxlan: Have the NIC drivers do less work for offloads Jouni Malinen (1): mac80211_hwsim: Fix tracking of beaconing for multi-vif Jozsef Kadlecsik (21): netfilter: ipset: Don't call ip_nest_end needlessly in the error path netfilter: ipset: Sparse warning about shadowed variable fixed netfilter: ipset: Fix sparse warnings due to missing rcu annotations netfilter: ipset: Rename simple macro names to avoid namespace issues. netfilter: ipset: Fix "may be used uninitialized" warnings netfilter: ipset: Use fix sized type for timeout in the extension part netfilter: ipset: order matches and targets separatedly in xt_set.c netfilter: ipset: Introduce new operation to get both setname and family netfilter: ipset: Prepare ipset to support multiple networks for hash types netfilter: ipset: Rename extension offset ids to extension ids netfilter: ipset: Move extension data to set structure netfilter: ipset: Generalize extensions support netfilter: ipset: Support extensions which need a per data destroy function netfilter: ipset: list:set: make sure all elements are checked by the gc netfilter: ipset: Kconfig: ipset needs NETFILTER_NETLINK netfilter: ipset: Fix hash resizing with comments netfilter: ipset: For set:list types, replaced elements must be zeroed out netfilter: ipset: Use a common function at listing the extensions netfilter: ipset: Use netlink callback dump args only netfilter: ipset: The unnamed union initialization may lead to compilation error netfilter:ipset: Fix memory allocation for bitmap:port Julian Anastasov (2): ipvs: fix the IPVS_CMD_ATTR_MAX definition ipvs: avoid rcu_barrier during netns cleanup Kalle Valo (28): ath10k: remove un ar_pci->cacheline_sz field ath10k: pci: make host_ce_config_wlan[] more readable ath10k: make target_ce_config_wlan more readable ath10k: remove void pointer from struct ath10k_pci_compl ath10k: convert ath10k_pci_reg_read/write32() to take struct ath10k ath10k: clean up ath10k_ce_completed_send_next_nolock() ath10k: convert ath10k_pci_wake() to return ath10k: simplify ath10k_ce_init() wake up handling ath10k: check chip id from the soc register during probe ath10k: add chip_id file to debugfs ath10k: add trace event ath10k_htt_stats ath10k: implement ath10k_debug_start/stop() ath10k: add htt_stats_enable debugfs file ath10k: add BMI log level ath10k: rename ATH10K_DBG_CORE to BOOT ath10k: cleanup debug messages in core.c ath10k: add boot debug messages to pci.c and ce.c ath10k: add boot debug messages to htc.c ath10k: add boot messages to htt.c ath10k: clean mac.c debug messages ath10k: print phymode as a string ath10k: delete struct ce_sendlist ath10k: rename board_data in struct ath10k ath10k: store separate pointers for firmware data ath10k: implement firmware IE container support ath10k: fix ath10k_debug_start() locking ath10k: fix ath10k_bss_assoc() to not sleep in atomic context ath10k: add might_sleep() to ath10k_wmi_cmd_send() Kevin Lo (4): rt2x00: Fix rf register for RT3070 rt2x00: rt2800lib: no need to toggle RF R30 bit 7 twice rt2x00: rt2800lib: fix RF registers for RT5390/RT5392 rt2x00: rt2800lib: remove duplicate rf_vals for RF3053 Kirill Tkhai (1): rt2x00_pci: Fix interrupt handler name (visible at /proc/interrupts) Larry Finger (16): rtlwifi: rtl8192cu: Convert driver to use rtl_process_phyinfo() rtlwifi: rtl8192du: Fix smatch errors in /rtl8192de/dm.c rtlwifi: rtl8192de: Fix smatch warnings in rtl8192de/hw.c rtlwifi: rtl8192cu: Fix smatch warning in rtl8192cu/trx.c rtlwifi: rtl8192_common: Fix smatch errors and warnings in rtl8192c/dm_common.c rtlwifi: Fix smatch warning in pci.c rtlwifi: Fix smatch warnings in usb.c rtlwifi: rtl8188ee: Fix smatch warning in rtl8188ee/hw.c rtlwifi: Remove all remaining references to variable 'noise' in rtl_stats struct rtlwifi: Implement a common rtl_phy_scan_operation_backup() routine rtlwifi: rtl8192cu: Convert to use new rtl_phy_scan_operation_backup() routine rtlwifi: rtl8192ce: Convert driver to use new rtl_phy_scan_operation_backup() routine rtlwifi: rtl8192c: Remove rtl8192c_phy_scan_operation_backup() rtlwifi: rtl8192ce: Convert driver to use new rtl_phy_scan_operation_backup() routine rtlwifi: rtl8723ae: Convert driver to use new rtl_phy_scan_operation_backup() routine rtlwifi: rtl8188ee: Convert driver to use new rtl_phy_scan_operation_backup() routine Laura Mihaela Vasilescu (1): igb: Add ethtool support to configure number of channels Leigh Brown (4): net: mvmdio: make orion_mdio_wait_ready consistent net: mvmdio: orion_mdio_ready: remove manual poll net: mvmdio: slight optimisation of orion_mdio_write net: mvmdio: doc: mvmdio now used by mv643xx_eth Leonardo Potenza (1): ixgbe: ethtool DCB registers dump for 82599 and x540 Li RongQing (1): ipv6: Not need to set fl6.flowi6_flags as zero Linus Lüssing (2): batman-adv: Add dummy soft-interface rx mode handler batman-adv: refine API calls for unicast transmissions of SKBs Lorenzo Bianconi (4): mac80211: add fixed_rate management to minstrel rc mac80211: do not override fixed_rate_idx in minstrel_ht_update_stats ath9k: add noise floor parameter to ath9k_hw_getchan_noise ath9k: add HT40 spectral scan capability Luciano Coelho (1): iwlwifi: mvm: fix fw_rx_stats debugfs entry Luis R. Rodriguez (11): cfg80211: fix nl80211.h documentation for DFS enum states cfg80211: rename regulatory_hint_11d() to regulatory_hint_country_ie() cfg80211: enable regulatory hints for strict custom settings cfg80211: simplify strict custom alpha2 regdomain check cfg80211: export reg_initiator_name() ath: move common dynamic regulatory domain setting to a helper ath: split user and driver reguluatory hint parsing ath: add support for proper dynamic regulatory hints ath9k: check for NULL rate when using ieee80211_get_rts_cts_rate() ath9k: add TX99 support cfg80211: export reg_initiator_name() Luka Perkov (3): octeon_mgmt: drop redundant mac address check mvneta: drop redundant mac address check arc_emac: drop redundant mac address check Maciej W. Rozycki (1): declance: Remove `incompatible pointer type' warnings Marc Kleine-Budde (4): can: dev: sort can_get_size() by IFLA_CAN_* can: dev: sort can_fill_info() by IFLA_CAN_* can: dev: sort can_changelink() by IFLA_CAN_* can: ti_hecc: remove priv->can.do_get_state() callback Marcel Holtmann (223): Bluetooth: Refactor raw socket filter into more readable code Bluetooth: Fix handling of getpeername() for HCI sockets Bluetooth: Fix handling of getsockname() for HCI sockets Bluetooth: Report error for HCI reset ioctl when device is down Bluetooth: Fix error handling for HCI socket options Bluetooth: Restrict ioctls to HCI raw channel sockets Bluetooth: Introduce user channel flag for HCI devices Bluetooth: Introduce new HCI socket channel for user operation Bluetooth: Use devname:vhci module alias for virtual HCI driver Bluetooth: Add support creating virtual AMP controllers Bluetooth: Disable upper layer connections when user channel is active Bluetooth: Use GFP_KERNEL when cloning SKB in a workqueue Bluetooth: Only schedule raw queue when user channel is active Bluetooth: Use only 2 bits for controller type information Bluetooth: Replace BDADDR_LOCAL with BDADDR_NONE Bluetooth: Provide high speed configuration option Bluetooth: Send new settings event when changing high speed option Bluetooth: Require CAP_NET_ADMIN for HCI User Channel operation Bluetooth: Enable -D__CHECK_ENDIAN__ for sparse by default Bluetooth: Restrict disabling of HS when controller is powered off Bluetooth: Add management command for setting static address Bluetooth: Increment management interface revision Bluetooth: Fix memory leak with L2CAP signal channels Bluetooth: Restrict SSP setting changes to BR/EDR enabled controllers Bluetooth: Allow setting static address even if LE is disabled Bluetooth: Restrict loading of link keys to BR/EDR capable controllers Bluetooth: Restrict loading of long term keys to LE capable controllers Bluetooth: Allow changing device class when BR/EDR is disabled Bluetooth: Fix switch statement order for L2CAP fixed channels Bluetooth: Don't copy L2CAP LE signalling to raw sockets Bluetooth: SMP packets are only valid on LE connections Bluetooth: L2CAP connectionless channels are only valid for BR/EDR Bluetooth: Drop packets on ATT fixed channel on BR/EDR Bluetooth: Check minimum length of SMP packets Bluetooth: Only one command per L2CAP LE signalling is supported Bluetooth: Fix controller list for AMP discover response Bluetooth: Remove useless external function to count controllers Bluetooth: Add constants for AMP controller type Bluetooth: Separate AMP controller type from HCI device type Bluetooth: Use explicit AMP controller id value for BR/EDR Bluetooth: Rename AMP status constants and use them Bluetooth: Remove pointless inline function Bluetooth: Remove check for number of AMP controller Bluetooth: Move hci_amp_capable() function into L2CAP core Bluetooth: Simplify check if L2CAP connection is AMP capable Bluetooth: Check for non BR/EDR controller in AMP discover response Bluetooth: Reject enabling controllers without valid addresses Bluetooth: Use explicit check for BR/EDR device type Bluetooth: Simplify device type check for AMP discover response Bluetooth: Use random address if public address is not available Bluetooth: Add HCI structure for LE advertising parameters command Bluetooth: Make it clear that disabling LE disables advertising Bluetooth: Use helper functions for enabling/disabling advertising Bluetooth: Add constants for LE advertising types Bluetooth: Set LE advertising parameters before enabling it Bluetooth: Use helper function for re-enabling advertising Bluetooth: Remove no longer needed mgmt_new_settings() function Bluetooth: Remove mgmt_valid_hdev() helper function Bluetooth: Send new settings only when pairable changes Bluetooth: Make mgmt_index_added() and mgmt_index_removed() return void Bluetooth: Make mgmt_set_powered_failed() return void Bluetooth: Make mgmt_disconnect_failed() return void Bluetooth: Make mgmt_connect_failed() return void Bluetooth: Make mgmt_device_connected() return void Bluetooth: Make mgmt_device_disconnected() return void Bluetooth: Make mgmt_device_found() return void Bluetooth: Make mgmt_remote_name() return void Bluetooth: Make mgmt_discovering() return void Bluetooth: Power off AMP controllers after setup phase Bluetooth: Make mgmt power down notification for BR/EDR explicit Bluetooth: List powered down AMP controllers correctly Bluetooth: Read supported features and commands on AMP controllers Bluetooth: Read location data on AMP controller init Bluetooth: Read flow control mode on AMP controller init Bluetooth: Remove unneeded val variable when setting SSP Bluetooth: Restrict high speed support to SSP enabled controllers Bluetooth: Fix too long line with set_advertising() function Bluetooth: Use hci_conn_num() for checking number of LE connections Bluetooth: Use hci_conn_num() instead of direct connection hash access Bluetooth: AMP contollers do not support the legacy ioctls Bluetooth: Remove unused bfusb_ioctl() callback Bluetooth: Remove unused bluecard_hci_ioctl() callback Bluetooth: Remove unused bt3c_hci_ioctl() callback Bluetooth: Remove unused btuart_hci_ioctl() callback Bluetooth: Remove unused dtl1_hci_ioctl() callback Bluetooth: Remove unused btmrvl_ioctl() callback Bluetooth: Remove hdev->ioctl driver callback Bluetooth: Move amp.h header file into net/bluetooth/ Bluetooth: Move a2mp.h header file into net/bluetooth/ Bluetooth: Move smp.h header file into net/bluetooth/ Bluetooth: Move skb->dev assignment for hdev->send into central place Bluetooth: Remove pointless check of hci_send_frame parameter Bluetooth: Remove return value from hci_send_frame() function Bluetooth: Remove unused h4_check_data_len() function Bluetooth: Provide hdev parameter to hci_recv_frame() driver callback Bluetooth: Add hdev parameter to hdev->send driver callback Bluetooth: Remove pointless parameter check in bfusb_send_frame() Bluetooth: Remove pointless parameter check in bluecard_hci_send_frame() Bluetooth: Remove pointless parameter check in bt3c_hci_send_frame() Bluetooth: Remove pointless parameter check in btmrvl_send_frame() Bluetooth: Remove pointless parameter check in btuart_hci_send_frame() Bluetooth: Remove pointless parameter check in dtl1_hci_send_frame() Bluetooth: Remove pointless parameter check in hci_uart_send_frame() Bluetooth: Remove pointless parameter check in vhci_send_frame() Bluetooth: Declare btusb_table[] and blacklist_table[] as const Bluetooth: Declare bfusb_table[] as const Bluetooth: Declare bpa10x_table[] as const Bluetooth: Declare ath3k_table[] and ath3k_blist_tbl[] as const Bluetooth: Make LE scan interval and window a controller option Bluetooth: Add management command for setting LE scan parameters Bluetooth: Fix endless loop with HCI_QUIRK_RESET_ON_CLOSE Bluetooth: Don't advertise high speed support without SSP Bluetooth: Add MGMT_OP_SET_SCAN_PARAMS to supported commands list Bluetooth: Fix HCI init for 1st generation BlueFRITZ! devices Bluetooth: Fix PSM value for L2CAP connectionless data packets Bluetooth: Limit security mode 4 level 0 to connection oriented channels Bluetooth: Allow 3D profile to use security mode 4 level 0 Bluetooth: The L2CAP fixed channel connectionless data is supported Bluetooth: Unicast connectionless data reception is supported Bluetooth: Remove l2cap_conn->dst usage from AMP manager Bluetooth: Remove l2cap_conn->src and l2cap_conn->dst usage from SMP Bluetooth: Remove l2cap_conn->src and l2cap_conn->dst usage from L2CAP Bluetooth: Remove l2cap_conn->src and l2cap_conn->dst pointers Bluetooth: Remove pointless bdaddr_to_le() helper function Bluetooth: Store the source address type of LE connections Bluetooth: Store source address of HCI connections Bluetooth: Update source address and type for incoming LE connections Bluetooth: Use hci_conn->src address for SMP functions Bluetooth: Use hci_conn->src address for L2CAP functions Bluetooth: Fix input address type for SMP C1 function Bluetooth: Fix coding style violations in SMP handling Bluetooth: Update L2CAP socket source address from HCI connection Bluetooth: Store address information in L2CAP channel structure Bluetooth: Return the correct address type for L2CAP sockets Bluetooth: Access RFCOMM session addresses through L2CAP channel Bluetooth: Access CMTP session addresses through L2CAP channel Bluetooth: Access HIDP session addresses through L2CAP channel Bluetooth: Access BNEP session addresses through L2CAP channel Bluetooth: Use SCO addresses from HCI connection directly Bluetooth: Store SCO address information in its own socket structure Bluetooth: Store RFCOMM address information in its own socket structure Bluetooth: Remove src and dst fields from bt_sock structure Bluetooth: Use l2cap_pi(sk) directly where possible Bluetooth: Add support for per socket msg_name callback Bluetooth: Provide msg_name callback for L2CAP connectionless channels Bluetooth: Increase minor version of core module Bluetooth: Adjust header for proc socket information Bluetooth: Introduce L2CAP channel flag for defer setup Bluetooth: Introduce L2CAP channel callback for resuming Bluetooth: Check that scan window is smaller or equal than scan interval Bluetooth: Read number of supported IAC on controller setup Bluetooth: Read current IAC LAP on controller setup Bluetooth: Fix minor coding style issue in set_connectable() Bluetooth: Use hci_request for discoverable timeout handling Bluetooth: Update advertising data based on management commands Bluetooth: Introduce flag for limited discoverable mode Bluetooth: Make mgmt_discoverable() return void Bluetooth: Make mgmt_connectable() return void Bluetooth: Make mgmt_write_scan_failed() return void Bluetooth: Update class of device after changing discoverable mode Bluetooth: Move arming of discoverable timeout to complete handler Bluetooth: Simplify the code for re-arming discoverable timeout Bluetooth: Add HCI command structure for writing current IAC LAP Bluetooth: Add support for entering limited discoverable mode Bluetooth: Make mgmt_new_link_key() return void Bluetooth: Move eir_append_data() function into mgmt.c Bluetooth: Move eir_get_length() function into hci_event.c Bluetooth: Update class of device on discoverable timeout Bluetooth: Add l2cap_chan_no_resume stub for A2MP Bluetooth: Make mgmt_pin_code_request() return void Bluetooth: Make mgmt_pin_code_reply_complete() return void Bluetooth: Make mgmt_pin_code_neg_reply_complete() return void Bluetooth: Make mgmt_auth_failed() return void Bluetooth: Make mgmt_auth_enable_complete() return void Bluetooth: Make mgmt_ssp_enable_complete() return void Bluetooth: Make mgmt_set_class_of_dev_complete() return void Bluetooth: Make mgmt_set_local_name_complete() return void Bluetooth: Make mgmt_read_local_oob_data_reply_complete() return void Bluetooth: Make mgmt_new_ltk() return void Bluetooth: Rename create_ad into create_adv_data Bluetooth: Store scan response data in HCI device Bluetooth: Set the scan response data when needed Bluetooth: Store device name in scan response data Bluetooth: Rename update_ad into update_adv_data Bluetooth: Remove duplicate definitions for advertising event types Bluetooth: Remove enable_hs declaration Bluetooth: Socket address parameter for CID is in little endian Bluetooth: Expose inquiry_cache debugfs only on BR/EDR controllers Bluetooth: Expose auto_accept_delay debugfs only when SSP is supported Bluetooth: Expose static address value for LE capable controllers Bluetooth: Expose current voice setting in debugfs Bluetooth: Add address type to device blacklist table Bluetooth: Move blacklist debugfs entry creation into hci_core.c Bluetooth: Move uuids debugfs entry creation into hci_core.c Bluetooth: Use IS_ERR_OR_NULL for checking bt_debugfs Bluetooth: Create HCI device debugfs directory in hci_register_dev Bluetooth: Create root debugfs directory during module init Bluetooth: Move device_add handling into hci_register_dev Bluetooth: Include address type in blacklist debugfs data Bluetooth: Move idle_timeout and sniff_{min,max}_interval to hci_core.c Bluetooth: Use BDADDR_BREDR type for old blacklist ioctl interface Bluetooth: Use hcon directly instead of conn->hcon where possible Bluetooth: Block ATT connection on LE when device is blocked Bluetooth: Move HCI device features into hci_core.c Bluetooth: Add workaround for buggy max_page features page value Bluetooth: Remove debug entry for connection features Bluetooth: Move manufacturer, hci_ver and hci_rev into hci_core.c Bluetooth: Store local version information only during setup phase Bluetooth: Move export of class of device information into hci_core.c Bluetooth: Expose current list of link keys via debugfs Bluetooth: Remove bus attribute in favor of hierarchy Bluetooth: Expose white list size information in debugfs Bluetooth: Expose current list of long term keys via debugfs Bluetooth: Select the own address type during initial setup phase Bluetooth: Expose debugfs entry read/write own address type Bluetooth: Expose setting if debug keys are used or not Bluetooth: Add LE features to debugfs if available Bluetooth: Remove interval parameter from HCI connection Bluetooth: Add support for setting SSP debug mode Bluetooth: Expose debugfs settings for LE connection interval Bluetooth: Add support for setting DUT mode Bluetooth: Fix UUID values in debugfs file Bluetooth: Fix minor coding style issue in hci_core.c Marco Porsch (1): mac80211: fixes for mesh powersave logic Marek Lindner (10): batman-adv: tvlv - basic infrastructure batman-adv: tvlv - gateway download/upload bandwidth container batman-adv: tvlv - add distributed arp table container batman-adv: tvlv - add network coding container batman-adv: tvlv - convert tt data sent within OGMs batman-adv: tvlv - convert tt query packet to use tvlv unicast packets batman-adv: tvlv - convert roaming adv packet to use tvlv unicast packets batman-adv: consider network coding overhead when calculating required mtu batman-adv: update email address for Marek Lindner batman-adv: limit local translation table max size Marek Puzyniak (2): ath10k: fix WEP in AP and IBSS mode ath10k: make monitor vdev down before stoping it Martin Hundebøll (3): batman-adv: Remove old fragmentation code batman-adv: Receive fragmented packets and merge batman-adv: Fragment and send skbs larger than mtu Masatake YAMATO (1): veth: Showing peer of veth type dev in ip link (kernel side) Mathias Krause (5): net: esp{4,6}: remove padlen from struct esp_data net: esp{4,6}: get rid of struct esp_data net: move pskb_put() to core code caif: use pskb_put() instead of reimplementing its functionality net: skbuff - kernel-doc fixes Matthew Whitehead (2): 3com: Fix drivers/net/ethernet/3com/Kconfig references to PCMCIA and 3c515 net: fujitsu: Remove ISA depdendency from Kconfig Max Stepanov (1): iwlwifi: mvm: split ADD_STA and ADD_STA_KEY in firmware API Michael Dalton (1): virtio_net: migrate mergeable rx buffers to page frag allocators Michael Opdenacker (14): hamradio: baycom: remove deprecated IRQF_DISABLED net: hamradio/scc: remove deprecated IRQF_DISABLED net: hamradio/yam: remove deprecated IRQF_DISABLED irda: remove deprecated IRQF_DISABLED net: wan: remove deprecated IRQF_DISABLED net: p54spi: remove deprecated IRQF_DISABLED isdn: remove deprecated IRQF_DISABLED irda: update comment mentioning IRQF_DISABLED cgxb4: remove duplicate include in cxgb4.h ethernet: moxa: remove duplicate includes chelsio: remove duplicate defines atm: firestream: remove duplicate define netfilter: ipset: remove duplicate define iwlwifi: remove duplicate includes Michal Kazior (52): ath10k: clean up monitor start code ath10k: use sizeof(*var) in kmalloc ath10k: clean up PCI completion states ath10k: print errcode when CE ring setup fails ath10k: fix HTT service setup ath10k: implement 802.3 SNAP rx decap type A-MSDU handling ath10k: plug possible memory leak in WMI ath10k: add support for firmware newer than 636 ath10k: add support for HTT 3.0 ath10k: use inline ce_state structure ath10k: remove ce_op_state ath10k: remove unused ce_attr parameters ath10k: rename hif_ce_pipe_info to ath10k_pci_pipe ath10k: rename ce_state to ath10k_ce_pipe ath10k: rename ce_ring_state to ath10k_ce_ring ath10k: prevent CE from looping indefinitely ath10k: simplify HTC credits calculation ath10k: add HTC TX credits replenishing notification ath10k: make WMI commands block by design ath10k: simplify HTC command submitting ath10k: improve beacon submission latency ath10k: remove wmi pending count limit ath10k: remove wmi event worker thread ath10k: fix tracing build for ath10k_wmi_cmd ath10k: fix num_sends_allowed replenishing ath10k: use num_pending_tx instead of msdu id bitmap ath10k: avoid needless memset on TX path ath10k: decouple HTT TX completions ath10k: cleanup HTT TX functions ath10k: use msdu headroom to store txfrag ath10k: report A-MSDU subframes individually ath10k: document decap modes ath10k: cleanup RX decap handling ath10k: fix Native Wifi decap mode RX ath10k: align RX frames properly ath10k: replenish HTT RX buffers in a tasklet mac80211: support reporting A-MSDU subframes individually ath10k: split tid calculation from tx function ath10k: split vdev_id calculation from tx function ath10k: remove ce_sendlist_send ath10k: remove num_sends_allowed ath10k: fix printf format string ath10k: fix possible memory leak in new FW loading ath10k: fix RX performance when using AP 10.X FW ath10k: use workqueue to set WEP TX key ath10k: fix add_interface failure handling ath10k: track vif list internally ath10k: fix scheduling while atomic config bug ath10k: remove unnecessary checks cfg80211: fix DFS channel recovery timeout cfg80211: update dfs_state_entered upon dfs_state change mac80211: fix uninitialized variable Michal Simek (2): net: emaclite: Not necessary to call devm_iounmap net: emaclite: Code cleanup Mihir Singh (1): hp100: replace hardcoded name in /proc/interrupts with interface name Mitch Williams (2): i40e: don't free nonexistent rings i40e: assign correct vector to VF Mohammed Shafi Shajakhan (1): ath10k: Fix mutex unlock balance Mugunthan V N (3): drivers: net: cpsw-phy-sel: Add new driver for phy mode selection for cpsw drivers: net: cpsw: use cpsw-phy-sel driver to configure phy mode ARM: dts: am33xx: adopt to cpsw-phy-sel driver to configure phy mode Nate Levesque (1): lance: Fix hardcoded interrupt name lp->name to use system device value Neal Cardwell (1): tcp: remove redundant code in __tcp_retransmit_skb() Nicolas Dichtel (3): xfrm: announce deleation of temporary SA dev: update __dev_notify_flags() to send rtnl msg dev: always advertise rx_flags changes via netlink Nikolay Aleksandrov (6): flow_dissector: factor out the ports extraction in skb_flow_get_ports bonding: modify the old and add new xmit hash policies bonding: document the new xmit policy modes and update the changed ones net: add missing dev_put() in __netdev_adjacent_dev_insert bonding: extend round-robin mode with packets_per_slave bonding: document the new packets_per_slave option Nithin Sujir (8): tg3: Add function tg3_phy_shdw_write() tg3: Add support for new 577xx device ids tg3: LED in shared mode does not blink during traffic tg3: Remove if 0'd code tg3: Remove redundant if check tg3: Appropriately classify interrupts during request_irq tg3: Remove unnecessary spinlock tg3: Update version to 3.134 Oliver Hartkopp (1): can: add broadcast manager documentation Oliver Smith (6): netfilter: ipset: Add hash:net,net module to kernel. netfilter: ipset: Support comments for ipset entries in the core. netfilter: ipset: Support comments in bitmap-type ipsets. netfilter: ipset: Support comments in the list-type ipset. netfilter: ipset: Support comments in hash-type ipsets. netfilter: ipset: Add hash:net,port,net module to kernel. Olivier Guiter (3): NFC: pn533: Add MI/TG bits only when in Initiator mode NFC: pn533: Add support for incoming fragmented frame in target mode NFC: pn533: Target mode Tx fragmentation support Or Gerlitz (2): net/mlx4: Clean the code to eliminate trivial build warnings net/mlx4: Fix typo, move similar defs to same location Oren Givon (1): iwlwifi: mvm: debugfs: add an option to set antennas for scan command Pablo Neira Ayuso (12): netfilter: cttimeout: allow to set/get default protocol timeouts netfilter: nf_nat: move alloc_null_binding to nf_nat_core.c netfilter: nf_tables: convert built-in tables/chains to chain types netfilter: nf_tables: add compatibility layer for x_tables netfilter: nf_tables: nft_payload: fix transport header base netfilter: nf_tables: add support for dormant tables netfilter: nf_tables: complete net namespace support netfilter: nfnetlink: add batch support and use it from nf_tables netfilter: nf_tables: add trace support netfilter: nf_tables: add ARP filtering support netfilter: bridge: fix nf_tables bridge dependencies with main core netfilter: bridge: nf_tables: add filter chain type Patrice Vilchez (1): phy/micrel: Add suspend/resume support to Micrel PHYs Patrick McHardy (6): netfilter: pass hook ops to hookfn netfilter: add nftables netfilter: nf_tables: add netlink set API netfilter: nf_tables: expression ops overloading netfilter: nf_tables: add optimized data comparison for small values netfilter: nft_payload: add optimized payload implementation for small loads Paul Durrant (5): xen-netback: add support for IPv6 checksum offload to guest xen-netback: add support for IPv6 checksum offload from guest xen-netback: Unconditionally set NETIF_F_RXCSUM xen-netback: handle IPv6 TCP GSO packets from the guest xen-netback: enable IPv6 TCP GSO to the guest Peter Senna Tschudin (7): Bluetooth: Fix assignment of 0/1 to bool variables wireless: rtlwifi: Replace variable with a break net: atl1c: Change variable type to bool net: bnx2x: Change variable type to bool net: myri10ge: Change variable type to bool net: ipv4: Change variable type to bool mwifiex: Change variable type to bool Pratik Pujar (2): qlcnic: Enhance ethtool to display ring indices and interrupt mask qlcnic: Firmware dump collection when auto recovery is disabled. Pravin B Shelar (6): openvswitch: Move flow table rehashing to flow install. openvswitch: Restructure datapath.c and flow.c openvswitch: Move mega-flow list out of rehashing struct. openvswitch: Simplify mega-flow APIs. openvswitch: Enable all GSO features on internal port. openvswitch: Use flow hash during flow lookup operation. Rafał Miłecki (2): bgmac: separate RX descriptor setup code into a new function bgmac: pass received packet to the netif instead of copying it Randy Dunlap (1): netdev: inet_timewait_sock.h missing semi-colon when KMEMCHECK is enabled Rony Efraim (1): net/mlx4_core: Add immediate activate for VGT->VST->VGT Sachin Kamat (9): net: bnx2x: Staticize local symbols net: cxgb4vf: Staticize local symbols net: cdc-phonet: Staticize usbpn_probe NFC: nfcwilink: Remove redundant dev_set_drvdata NFC: pn533: Staticize local symbols net: ath9k: Use NULL instead of false net: ethernet: cpsw: Remove redundant of_match_ptr net: ethernet: cpsw-phy-sel: Remove redundant of_match_ptr net: can: c_can_platform: Remove redundant of_match_ptr Samuel Ortiz (9): NFC: Set active target upon DEP up event reception NFC: pn533: Send ATR_REQ directly for active device detection NFC: pn533: Start listen timer from start_poll NFC: digital: Remove PR_ERR and PR_DBG macros NFC: digital: Add newline to pr_* calls NFC: Document NFC targets sens_res field NFC: Define secure element IO API and commands NFC: netlink: SE API implementation NFC: Fix SE API related sparse warning Sathya Perla (3): be2net: fix adaptive interrupt coalescing be2net: add a counter for pkts dropped in xmit path be2net: add support for ndo_busy_poll Sebastian Hesselbarth (1): MAINTAINERS: mv643xx_eth: take over maintainership from Lennart Sergei Shtylyov (2): sh_eth: add/use RMCR.RNC bit sh_eth: check platform data pointer Sergey Ryazanov (1): mac80211: Remove superfluous is_multicast_ether_addr() call Seth Forshee (1): mac80211: Remove check for offchannel state when waking netdev queues Shahed Shaikh (3): netxen_nic: Print ULA information netxen_nic: Update version to 4.0.82 qlcnic: Skip unknown entry type while collecting firmware dump Shannon Nelson (5): i40e: fixup legacy interrupt handling i40e: tweaking icr0 handling for legacy irq i40e: reorder block declarations in debugfs i40e: check vsi ptrs before dumping them i40e: use pf_id for pf function id in qtx_ctl Shawn Bohrer (3): udp: Only allow busy read/poll on connected sockets udp: ipv4: Add udp early demux net: ipv4 only populate IP_PKTINFO when needed Simon Wunderlich (20): cfg80211: export cfg80211_chandef_dfs_required mac80211: split off channel switch parsing function mac80211: split off ibss disconnect mac80211: add support for CSA in IBSS mode mac80211: send a CSA action frame when changing channel nl80211: enable IBSS support for channel switch announcements nl80211: allow CAC only if no operation is going on batman-adv: remove vis functionality batman-adv: add build check macros for packet member offset batman-adv: reorder packet types batman-adv: remove packed from batadv_ogm_packet batman-adv: reorder batadv_iv_flags batman-adv: only add recordroute information to icmp request/reply batman-adv: remove useless find_router look up batman-adv: update email address for Simon Wunderlich batman-adv: Start new development cycle batman-adv: generalize batman-adv icmp packet handling nl80211/cfg80211: enable DFS for IBSS mode mac80211: enable DFS for IBSS mode ath9k: enable DFS for IBSS mode Sony Chacko (1): qlcnic: Remove redundant eSwitch enable commands Stanislav Fomichev (1): netfilter: ip6t_REJECT: skip checksum verification for outgoing ipv6 packets Stanislaw Gruszka (8): mac80211: change beacon/connection polling rt2800: comment enable radio initialization sequence rt2800: add support for radio chip RF3070 rt2x00: do not pause queue on flush iwlwifi: don't WARN on bad firmware state rt2400pci: fix RSSI read rt2x00: check if device is still available on rt2x00mac_flush() rt2800usb: slow down TX status polling Stefan Assmann (1): igb: fix driver reload with VF assigned to guest Steffen Klassert (3): ipv6: Add a receive path hook for vti6 in xfrm6_mode_tunnel. ipv6: Add support for IPsec virtual tunnel interfaces xfrm: Don't queue retransmitted packets if the original is still on the host Sucheta Chakraborty (3): qlcnic: Print informational messages only once during driver load. qlcnic: dcb code cleanup and refactoring. qlcnic: Register netdev in FAILED state for 83xx/84xx Sujith Manoharan (22): ath10k: Calculate correct peer PHY mode for VHT ath9k: Update initvals for AR9565 1.0 ath9k: Bypass EEPROM for diversity cap for AR9565 ath9k: Fix antenna diversity init for AR9565 ath9k: Use correct RX gain table for AR9565 ath9k: Add support for AR9565 v1.0.1 LNA diversity ath9k: Enable antenna diversity for WB335 ath9k: Identify CUS252 cards ath9k: Identify WB335 Antenna configuration ath9k: Fix regulatory compliance for AR9462/AR9565 ath9k: Add and use initvals for channel 14 ath9k: Update AR9485 1.1 initvals ath9k: Add DELL 1707 to supported card table ath9k: Fix calibration for AR9462 ath9k: Fix issue with parsing malformed CFP IE ath9k: Handle abnormal NAV in AP mode ath9k: Use bitops for calibration flags ath9k: Fix PeakDetect calibration for AR9462 ath9k: Fix NF calibration for single stream cards ath9k: Handle FATAL interrupts correctly ath9k: Remove incorrect diversity initialization ath10k: Fix bug in max. VHT A-MPDU size Sunil Dutt (1): cfg80211: pass station supported channel and oper class info Thierry Escande (12): NFC: Digital Protocol stack implementation NFC Digital: Implement driver commands mechanism NFC Digital: Add NFC-A technology support NFC Digital: Add NFC-F technology support NFC Digital: Add initiator NFC-DEP support NFC Digital: Add target NFC-DEP support NFC: rawsock: Fix a memory leak NFC: digital: Fix sens_res endiannes handling NFC: Sony Port-100 Series driver NFC: port100: Commands mechanism implementation NFC: port100: Add initiator mode support NFC: port100: Add target mode support Tomasz Bursztyka (2): netfilter: nf_tables: Add support for IPv6 NAT netfilter: nft_nat: Fix endianness issue reported by sparse Ursula Braun (1): qeth: avoid buffer overflow in snmp ioctl Uwe Kleine-König (2): can: add explicit copyrights to can headers can: add explicit copyrights to can's netlink header Vasundhara Volam (4): be2net: Call be_vf_setup() even when VFs are enbaled from previous load be2net: pass if_id for v1 and V2 versions of TX_CREATE cmd be2net: Create single TXQ on BE3-R 1G ports be2net: call ENABLE_VF cmd for Skyhawk-R too Veaceslav Falico (42): net: use lists as arguments instead of bool upper net: add adj_list to save only neighbours net: add RCU variant to search for netdev_adjacent link net: add netdev_adjacent->private and allow to use it bonding: populate neighbour's private on enslave bonding: modify bond_get_slave_by_dev() to use neighbours net: add for_each iterators through neighbour lower link's private bonding: remove bond_for_each_slave_continue_reverse() bonding: make bond_for_each_slave() use lower neighbour's private bonding: use bond_for_each_slave() in bond_uninit() bonding: rework bond_3ad_xmit_xor() to use bond_for_each_slave() only bonding: rework rlb_next_rx_slave() to use bond_for_each_slave() bonding: rework bond_find_best_slave() to use bond_for_each_slave() bonding: rework bond_ab_arp_probe() to use bond_for_each_slave() bonding: remove unused bond_for_each_slave_from() bonding: add bond_has_slaves() and use it bonding: convert bond_has_slaves() to use the neighbour list net: add a possibility to get private from netdev_adjacent->list bonding: convert first/last slave logic to use neighbours bonding: remove bond_prev_slave() bonding: add __bond_next_slave() which uses neighbours bonding: use neighbours for bond_next_slave() bonding: remove slave lists vlan: link the upper neighbour only after registering vlan: unlink the upper neighbour before unregistering net: expose the master link to sysfs, and remove it from bond net: create sysfs symlinks for neighbour devices bonding: correctly verify for the first slave in bond_enslave bonding: verify if we still have slaves in bond_3ad_unbind_slave() bonding: remove __get_next_port() bonding: remove __get_first_port() bonding: make ad_port_selection_logic() use bond_for_each_slave() bonding: make __get_active_agg() use bond_for_each_slave() bonding: make ad_agg_selection_logic() use bond_for_each_slave() bonding: make bond_3ad_unbind_slave() use bond_for_each_slave() bonding: remove unused __get_next_agg() bonding: don't use bond_next_slave() in bond_info_seq_next() bonding: remove bond_next_slave() bonding: trivial: remove forgotten bond_next_vlan() bonding: RCUify bond_set_rx_mode() bonding: ensure that TLB mode's active slave has correct mac filter bonding: move bond-specific init after enslave happens Victor Goldenshtein (5): wlcore: cleanup scan debug prints wlcore: fix unsafe dereference of the wlvif wl18xx: fix boot process in high temperature environment wl18xx: print new RDL versions during boot wlcore: print active channel in the driver_state Vitaly Lavrov (1): netfiler: ipset: Add net namespace for ipset Vladimir Murzin (1): ath6kl: fix compilation warning in ath6kl_htc_pipe_conn_service Wei Liu (3): xen-netback: improve ring effeciency for guest RX xen-netfront: convert to GRO API Revert "xen-netback: improve ring effeciency for guest RX" Wei Yongjun (9): openvswitch: remove duplicated include from vport-vxlan.c openvswitch: remove duplicated include from vport-gre.c igbvf: add missing iounmap() on error in igbvf_probe() i40e: remove unused including <linux/version.h> i40e: fix error return code in i40e_probe() netfilter: nf_tables: remove duplicated include from nf_tables_ipv4.c ethernet/arc/arc_emac: add missing platform_set_drvdata() in arc_emac_probe() macmace: add missing platform_set_drvdata() in mace_probe() xtsonic: add missing platform_set_drvdata() in xtsonic_probe() Xose Vazquez Perez (1): wireless: rt2x00: rt2800usb: add new devices Yair Shapira (2): wlcore: add new plt power-mode: CHIP_AWAKE wlcore: disable elp sleep while in plt mode Yang Yingliang (1): net_sched: tbf: support of 64bit rates Yaniv Rosner (2): bnx2x: Change function prototype bnx2x: Add support for EXTPHY2 LED mode Yijing Wang (1): ixgbe: use pcie_capability_read_word() to simplify code Ying Xue (8): tipc: don't use memcpy to copy from user space tipc: remove iovec length parameter from all sending functions tipc: silence sparse warnings tipc: make bearer and media naming consistent tipc: avoid unnecessary lookup for tipc bearer instance tipc: correct return value of recv_msg routine tipc: correct return value of link_cmd_set_value routine tipc: remove two indentation levels in tipc_recv_msg routine Yuchung Cheng (3): tcp: temporarily disable Fast Open on SYN timeout tcp: enable sockets to use MSG_FASTOPEN by default tcp: properly handle stretch acks in slow start Yuval Mintz (4): bnx2x: Test nvram when interface is down bnx2x: Correct VF driver info bnx2x: use pcie_get_minimum_link() bnx2x: Add ndo_get_phys_port_id support ZHAO Gang (1): net: remove function sk_reset_txq() Zefir Kurtisi (1): ath9k: replace snprintf() with scnprintf() Zhi Yong Wu (4): vxlan: silence one build warning net, datagram: fix the incorrect comment in zerocopy_sg_from_iovec() net, iovec: fix the incorrect comment in memcpy_fromiovecend() net, mc: fix the incorrect comments in two mc-related functions baker.zhang (3): fib_trie: avoid a redundant bit judgement in inflate fib_trie: only calc for the un-first node fib_trie: remove duplicated rcu lock cedric Voncken (1): cfg80211: vlan priority handling in WMM dingtianhong (8): bonding: use RCU protection for 3ad xmit path bonding: use RCU protection for alb xmit path bonding: add rtnl lock and remove read lock for bond sysfs bonding: remove bond read lock for bond_mii_monitor() bonding: remove bond read lock for bond_alb_monitor() bonding: remove bond read lock for bond_loadbalance_arp_mon() bonding: remove bond read lock for bond_activebackup_arp_mon() bonding: remove bond read lock for bond_3ad_state_machine_handler() holger@xxxxxxxxxxxxxxxx (2): netfilter: nf_ct_sip: extend RCU read lock in set_expected_rtp_rtcp() netfilter: nf_ct_sip: consolidate NAT hook functions stephen hemminger (5): qdisc: meta return ENOMEM on alloc failure qdisc: basic classifier - remove unnecessary initialization ethernet: cleanup eth_type_trans ethernet: use likely() for common Ethernet encap em_ipset: use dev_net() accessor wangweidong (3): sctp: fix some comments in chunk.c and associola.c sctp: remove the repeat initialize with 0 sctp: merge two if statements to one Documentation/ABI/testing/sysfs-class-net-batman-adv | 4 +- Documentation/ABI/testing/sysfs-class-net-mesh | 34 +- Documentation/DocBook/80211.tmpl | 4 +- Documentation/devicetree/bindings/net/cpsw-phy-sel.txt | 28 + Documentation/networking/batman-adv.txt | 54 +- Documentation/networking/bonding.txt | 75 +- Documentation/networking/can.txt | 217 +++ Documentation/networking/ip-sysctl.txt | 15 +- Documentation/networking/netdevices.txt | 10 +- Documentation/ptp/testptp.c | 65 +- MAINTAINERS | 18 +- arch/alpha/include/uapi/asm/socket.h | 4 +- arch/arm/boot/dts/am33xx.dtsi | 6 + arch/avr32/include/uapi/asm/socket.h | 2 + arch/cris/include/uapi/asm/socket.h | 2 + arch/frv/include/uapi/asm/socket.h | 2 + arch/h8300/include/uapi/asm/socket.h | 2 + arch/ia64/include/uapi/asm/socket.h | 2 + arch/m32r/include/uapi/asm/socket.h | 2 + arch/mips/include/uapi/asm/socket.h | 2 + arch/mn10300/include/uapi/asm/socket.h | 2 + arch/parisc/include/uapi/asm/socket.h | 2 + arch/powerpc/include/uapi/asm/socket.h | 2 + arch/s390/include/uapi/asm/socket.h | 2 + arch/sparc/include/uapi/asm/socket.h | 2 + arch/x86/kernel/jump_label.c | 25 +- arch/x86/net/bpf_jit_comp.c | 2 + arch/xtensa/include/uapi/asm/socket.h | 2 + drivers/atm/firestream.h | 1 - drivers/bcma/host_pci.c | 8 +- drivers/bluetooth/Makefile | 2 + drivers/bluetooth/ath3k.c | 4 +- drivers/bluetooth/bfusb.c | 31 +- drivers/bluetooth/bluecard_cs.c | 30 +- drivers/bluetooth/bpa10x.c | 11 +- drivers/bluetooth/bt3c_cs.c | 30 +- drivers/bluetooth/btmrvl_drv.h | 12 +- drivers/bluetooth/btmrvl_main.c | 295 ++-- drivers/bluetooth/btmrvl_sdio.c | 23 +- drivers/bluetooth/btmrvl_sdio.h | 2 + drivers/bluetooth/btsdio.c | 6 +- drivers/bluetooth/btuart_cs.c | 30 +- drivers/bluetooth/btusb.c | 22 +- drivers/bluetooth/btwilink.c | 9 +- drivers/bluetooth/dtl1_cs.c | 30 +- drivers/bluetooth/hci_bcsp.c | 5 +- drivers/bluetooth/hci_h4.c | 24 - drivers/bluetooth/hci_h5.c | 2 +- drivers/bluetooth/hci_ldisc.c | 12 +- drivers/bluetooth/hci_ll.c | 14 +- drivers/bluetooth/hci_vhci.c | 179 ++- drivers/char/random.c | 5 +- drivers/infiniband/core/cma.c | 28 +- drivers/infiniband/hw/mlx4/main.c | 14 +- drivers/isdn/hardware/eicon/divasmain.c | 2 +- drivers/isdn/hardware/eicon/um_idi.c | 2 +- drivers/isdn/icn/icn.c | 3 +- drivers/isdn/sc/init.c | 2 +- drivers/net/bonding/Makefile | 2 +- drivers/net/bonding/bond_3ad.c | 199 ++- drivers/net/bonding/bond_alb.c | 150 ++- drivers/net/bonding/bond_alb.h | 4 +- drivers/net/bonding/bond_main.c | 715 +++++----- drivers/net/bonding/bond_netlink.c | 131 ++ drivers/net/bonding/bond_options.c | 142 ++ drivers/net/bonding/bond_procfs.c | 21 +- drivers/net/bonding/bond_sysfs.c | 264 ++-- drivers/net/bonding/bonding.h | 113 +- drivers/net/can/at91_can.c | 2 +- drivers/net/can/bfin_can.c | 2 +- drivers/net/can/c_can/c_can_pci.c | 2 - drivers/net/can/c_can/c_can_platform.c | 2 +- drivers/net/can/cc770/cc770_platform.c | 4 +- drivers/net/can/dev.c | 67 +- drivers/net/can/flexcan.c | 2 +- drivers/net/can/janz-ican3.c | 2 +- drivers/net/can/mcp251x.c | 2 +- drivers/net/can/mscan/mscan.h | 6 +- drivers/net/can/pch_can.c | 1 - drivers/net/can/sja1000/ems_pci.c | 1 - drivers/net/can/sja1000/kvaser_pci.c | 1 - drivers/net/can/sja1000/peak_pci.c | 2 - drivers/net/can/sja1000/plx_pci.c | 1 - drivers/net/can/sja1000/sja1000_platform.c | 2 +- drivers/net/can/softing/softing.h | 24 +- drivers/net/can/softing/softing_main.c | 2 +- drivers/net/can/ti_hecc.c | 12 +- drivers/net/ethernet/3com/Kconfig | 4 +- drivers/net/ethernet/3com/typhoon.c | 1 - drivers/net/ethernet/8390/8390.h | 40 +- drivers/net/ethernet/8390/ax88796.c | 2 +- drivers/net/ethernet/8390/ne2k-pci.c | 3 - drivers/net/ethernet/adaptec/starfire.c | 2 - drivers/net/ethernet/adi/bfin_mac.h | 2 +- drivers/net/ethernet/amd/7990.h | 12 +- drivers/net/ethernet/amd/amd8111e.c | 2 - drivers/net/ethernet/amd/atarilance.c | 4 +- drivers/net/ethernet/amd/au1000_eth.c | 2 +- drivers/net/ethernet/amd/declance.c | 16 +- drivers/net/ethernet/amd/lance.c | 2 +- drivers/net/ethernet/amd/pcnet32.c | 3 +- drivers/net/ethernet/apple/bmac.c | 4 +- drivers/net/ethernet/apple/macmace.c | 1 + drivers/net/ethernet/arc/emac_main.c | 7 +- drivers/net/ethernet/atheros/alx/main.c | 1 - drivers/net/ethernet/atheros/atl1c/atl1c.h | 6 +- drivers/net/ethernet/atheros/atl1c/atl1c_hw.c | 2 +- drivers/net/ethernet/atheros/atl1e/atl1e.h | 12 +- drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 46 +- drivers/net/ethernet/atheros/atlx/atl2.h | 2 +- drivers/net/ethernet/broadcom/b44.c | 12 +- drivers/net/ethernet/broadcom/bgmac.c | 117 +- drivers/net/ethernet/broadcom/bnx2.c | 9 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 11 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 18 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 22 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h | 1 + drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | 25 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 80 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 30 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h | 2 - drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c | 149 ++- drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.h | 7 + drivers/net/ethernet/broadcom/cnic.c | 4 +- drivers/net/ethernet/broadcom/cnic_if.h | 4 +- drivers/net/ethernet/broadcom/tg3.c | 154 ++- drivers/net/ethernet/broadcom/tg3.h | 3 + drivers/net/ethernet/brocade/bna/bnad.c | 1 - drivers/net/ethernet/brocade/bna/bnad.h | 43 +- drivers/net/ethernet/calxeda/xgmac.c | 10 +- drivers/net/ethernet/chelsio/cxgb/common.h | 46 +- drivers/net/ethernet/chelsio/cxgb/cxgb2.c | 2 - drivers/net/ethernet/chelsio/cxgb/pm3393.c | 4 +- drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 2 - drivers/net/ethernet/chelsio/cxgb3/regs.h | 35 - drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 1 - drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 5 +- drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 5 +- drivers/net/ethernet/chelsio/cxgb4vf/sge.c | 11 +- drivers/net/ethernet/cisco/enic/enic_main.c | 2 - drivers/net/ethernet/davicom/dm9000.c | 2 +- drivers/net/ethernet/dec/tulip/de2104x.c | 1 - drivers/net/ethernet/dec/tulip/de4x5.c | 2 +- drivers/net/ethernet/dec/tulip/dmfe.c | 3 - drivers/net/ethernet/dec/tulip/tulip_core.c | 1 - drivers/net/ethernet/dec/tulip/uli526x.c | 2 - drivers/net/ethernet/dec/tulip/winbond-840.c | 3 - drivers/net/ethernet/dec/tulip/xircom_cb.c | 2 - drivers/net/ethernet/dlink/dl2k.c | 1 - drivers/net/ethernet/dlink/sundance.c | 2 - drivers/net/ethernet/emulex/benet/be.h | 177 ++- drivers/net/ethernet/emulex/benet/be_cmds.c | 27 +- drivers/net/ethernet/emulex/benet/be_cmds.h | 332 +++-- drivers/net/ethernet/emulex/benet/be_ethtool.c | 40 +- drivers/net/ethernet/emulex/benet/be_main.c | 315 +++-- drivers/net/ethernet/fealnx.c | 1 - drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c | 2 +- drivers/net/ethernet/freescale/gianfar.c | 87 +- drivers/net/ethernet/freescale/gianfar.h | 26 +- drivers/net/ethernet/freescale/ucc_geth.c | 2 +- drivers/net/ethernet/fujitsu/Kconfig | 2 +- drivers/net/ethernet/hp/hp100.c | 2 +- drivers/net/ethernet/i825xx/82596.c | 8 +- drivers/net/ethernet/i825xx/lib82596.c | 6 +- drivers/net/ethernet/ibm/emac/core.c | 2 +- drivers/net/ethernet/ibm/emac/debug.h | 14 +- drivers/net/ethernet/ibm/emac/rgmii.h | 18 +- drivers/net/ethernet/ibm/emac/tah.h | 14 +- drivers/net/ethernet/ibm/emac/zmii.h | 18 +- drivers/net/ethernet/ibm/ibmveth.c | 4 +- drivers/net/ethernet/icplus/ipg.c | 1 - drivers/net/ethernet/intel/e100.c | 2 - drivers/net/ethernet/intel/e1000/e1000.h | 32 +- drivers/net/ethernet/intel/e1000/e1000_main.c | 3 +- drivers/net/ethernet/intel/e1000e/e1000.h | 45 +- drivers/net/ethernet/intel/i40e/i40e.h | 13 +- drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 338 ++--- drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 69 +- drivers/net/ethernet/intel/i40e/i40e_main.c | 484 ++++--- drivers/net/ethernet/intel/i40e/i40e_txrx.c | 433 +++--- drivers/net/ethernet/intel/i40e/i40e_txrx.h | 35 +- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 4 +- drivers/net/ethernet/intel/igb/e1000_82575.h | 16 +- drivers/net/ethernet/intel/igb/e1000_hw.h | 6 +- drivers/net/ethernet/intel/igb/e1000_i210.h | 38 +- drivers/net/ethernet/intel/igb/e1000_mac.h | 2 +- drivers/net/ethernet/intel/igb/e1000_phy.c | 8 +- drivers/net/ethernet/intel/igb/igb.h | 74 +- drivers/net/ethernet/intel/igb/igb_ethtool.c | 145 +- drivers/net/ethernet/intel/igb/igb_main.c | 61 +- drivers/net/ethernet/intel/igbvf/igbvf.h | 22 +- drivers/net/ethernet/intel/igbvf/netdev.c | 8 +- drivers/net/ethernet/intel/igbvf/vf.c | 4 +- drivers/net/ethernet/intel/ixgb/ixgb.h | 22 +- drivers/net/ethernet/intel/ixgb/ixgb_hw.h | 25 +- drivers/net/ethernet/intel/ixgbe/ixgbe.h | 258 ++-- drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 109 +- drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c | 15 +- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 589 ++++++-- drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h | 40 +- drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 30 +- drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 5 + drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c | 12 +- drivers/net/ethernet/intel/ixgbevf/ethtool.c | 234 ++-- drivers/net/ethernet/intel/ixgbevf/ixgbevf.h | 178 ++- drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 255 ++-- drivers/net/ethernet/intel/ixgbevf/vf.c | 4 +- drivers/net/ethernet/jme.c | 6 +- drivers/net/ethernet/jme.h | 1 - drivers/net/ethernet/korina.c | 2 +- drivers/net/ethernet/marvell/mv643xx_eth.c | 5 +- drivers/net/ethernet/marvell/mvmdio.c | 110 +- drivers/net/ethernet/marvell/mvneta.c | 2 +- drivers/net/ethernet/marvell/skge.c | 2 - drivers/net/ethernet/marvell/sky2.c | 3 - drivers/net/ethernet/mellanox/mlx4/cmd.c | 41 +- drivers/net/ethernet/mellanox/mlx4/cq.c | 6 - drivers/net/ethernet/mellanox/mlx4/en_cq.c | 45 +- drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 36 +- drivers/net/ethernet/mellanox/mlx4/en_main.c | 8 +- drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 152 ++- drivers/net/ethernet/mellanox/mlx4/en_port.c | 17 +- drivers/net/ethernet/mellanox/mlx4/en_rx.c | 68 +- drivers/net/ethernet/mellanox/mlx4/en_selftest.c | 2 +- drivers/net/ethernet/mellanox/mlx4/en_tx.c | 54 +- drivers/net/ethernet/mellanox/mlx4/eq.c | 1 - drivers/net/ethernet/mellanox/mlx4/fw.c | 110 +- drivers/net/ethernet/mellanox/mlx4/icm.c | 42 +- drivers/net/ethernet/mellanox/mlx4/main.c | 62 +- drivers/net/ethernet/mellanox/mlx4/mcg.c | 8 +- drivers/net/ethernet/mellanox/mlx4/mlx4.h | 21 +- drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 33 +- drivers/net/ethernet/mellanox/mlx4/mr.c | 11 +- drivers/net/ethernet/mellanox/mlx4/pd.c | 11 +- drivers/net/ethernet/mellanox/mlx4/port.c | 98 +- drivers/net/ethernet/mellanox/mlx4/qp.c | 3 +- drivers/net/ethernet/mellanox/mlx4/resource_tracker.c | 589 +++++++- drivers/net/ethernet/mellanox/mlx4/srq.c | 3 +- drivers/net/ethernet/micrel/ks8851_mll.c | 4 +- drivers/net/ethernet/micrel/ksz884x.c | 4 +- drivers/net/ethernet/moxa/moxart_ether.c | 1 - drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 9 +- drivers/net/ethernet/natsemi/natsemi.c | 2 - drivers/net/ethernet/natsemi/xtsonic.c | 1 + drivers/net/ethernet/neterion/s2io.c | 2 - drivers/net/ethernet/neterion/vxge/vxge-main.c | 2 - drivers/net/ethernet/octeon/octeon_mgmt.c | 2 +- drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h | 56 +- drivers/net/ethernet/packetengines/hamachi.c | 1 - drivers/net/ethernet/packetengines/yellowfin.c | 2 - drivers/net/ethernet/pasemi/pasemi_mac.c | 1 - drivers/net/ethernet/qlogic/netxen/netxen_nic.h | 9 +- drivers/net/ethernet/qlogic/netxen/netxen_nic_hdr.h | 1 + drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c | 2 +- drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c | 30 +- drivers/net/ethernet/qlogic/qla3xxx.c | 2 - drivers/net/ethernet/qlogic/qlcnic/qlcnic.h | 181 +-- drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 145 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h | 18 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c | 78 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c | 47 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c | 20 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic_dcb.c | 184 ++- drivers/net/ethernet/qlogic/qlcnic/qlcnic_dcb.h | 109 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c | 260 ++-- drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c | 2 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.h | 8 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c | 2 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c | 67 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 434 +++--- drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c | 41 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_common.c | 15 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c | 12 +- drivers/net/ethernet/qlogic/qlge/qlge.h | 60 +- drivers/net/ethernet/qlogic/qlge/qlge_main.c | 127 +- drivers/net/ethernet/rdc/r6040.c | 2 - drivers/net/ethernet/realtek/8139cp.c | 1 - drivers/net/ethernet/realtek/8139too.c | 1 - drivers/net/ethernet/realtek/r8169.c | 1 - drivers/net/ethernet/renesas/sh_eth.c | 14 +- drivers/net/ethernet/renesas/sh_eth.h | 3 + drivers/net/ethernet/sfc/ef10.c | 319 ++++- drivers/net/ethernet/sfc/ef10_regs.h | 1 + drivers/net/ethernet/sfc/efx.h | 105 +- drivers/net/ethernet/sfc/ethtool.c | 5 +- drivers/net/ethernet/sfc/io.h | 5 + drivers/net/ethernet/sfc/mcdi.h | 120 +- drivers/net/ethernet/sfc/mdio_10g.h | 26 +- drivers/net/ethernet/sfc/net_driver.h | 10 + drivers/net/ethernet/sfc/nic.c | 73 +- drivers/net/ethernet/sfc/nic.h | 256 ++-- drivers/net/ethernet/sfc/phy.h | 8 +- drivers/net/ethernet/sfc/rx.c | 90 +- drivers/net/ethernet/sfc/selftest.h | 15 +- drivers/net/ethernet/sfc/tx.c | 426 ++++-- drivers/net/ethernet/sgi/meth.c | 2 +- drivers/net/ethernet/sis/sis190.c | 1 - drivers/net/ethernet/smsc/Kconfig | 4 +- drivers/net/ethernet/smsc/epic100.c | 126 +- drivers/net/ethernet/smsc/smc911x.c | 331 +++-- drivers/net/ethernet/smsc/smc911x.h | 2 +- drivers/net/ethernet/smsc/smc9194.c | 56 +- drivers/net/ethernet/smsc/smc91c92_cs.c | 43 +- drivers/net/ethernet/smsc/smc91x.c | 237 ++-- drivers/net/ethernet/smsc/smc91x.h | 4 +- drivers/net/ethernet/smsc/smsc911x.c | 4 +- drivers/net/ethernet/smsc/smsc9420.c | 169 ++- drivers/net/ethernet/stmicro/stmmac/common.h | 12 +- drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h | 17 +- drivers/net/ethernet/stmicro/stmmac/mmc.h | 6 +- drivers/net/ethernet/stmicro/stmmac/stmmac.h | 10 +- drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 1 - drivers/net/ethernet/sun/cassini.c | 4 +- drivers/net/ethernet/sun/niu.c | 2 - drivers/net/ethernet/sun/sungem.c | 4 +- drivers/net/ethernet/sun/sunhme.c | 12 +- drivers/net/ethernet/sun/sunqe.c | 2 +- drivers/net/ethernet/tehuti/tehuti.c | 1 - drivers/net/ethernet/ti/Kconfig | 8 + drivers/net/ethernet/ti/Makefile | 1 + drivers/net/ethernet/ti/cpsw-phy-sel.c | 161 +++ drivers/net/ethernet/ti/cpsw.c | 159 +-- drivers/net/ethernet/ti/cpsw.h | 2 + drivers/net/ethernet/ti/cpts.h | 9 +- drivers/net/ethernet/ti/davinci_emac.c | 2 +- drivers/net/ethernet/ti/tlan.c | 1 - drivers/net/ethernet/tile/tilegx.c | 2 +- drivers/net/ethernet/toshiba/ps3_gelic_net.h | 29 +- drivers/net/ethernet/toshiba/ps3_gelic_wireless.h | 6 +- drivers/net/ethernet/toshiba/spider_net.c | 1 - drivers/net/ethernet/toshiba/spider_net.h | 4 +- drivers/net/ethernet/toshiba/tc35815.c | 1 - drivers/net/ethernet/via/via-rhine.c | 1 - drivers/net/ethernet/xilinx/xilinx_emaclite.c | 41 +- drivers/net/fddi/skfp/fplustm.c | 2 +- drivers/net/fddi/skfp/h/smc.h | 28 +- drivers/net/fddi/skfp/skfddi.c | 6 +- drivers/net/hamradio/baycom_ser_fdx.c | 2 +- drivers/net/hamradio/baycom_ser_hdx.c | 2 +- drivers/net/hamradio/scc.c | 2 +- drivers/net/hamradio/yam.c | 2 +- drivers/net/irda/bfin_sir.c | 4 +- drivers/net/irda/donauboe.c | 4 +- drivers/net/irda/sh_irda.c | 2 +- drivers/net/irda/sh_sir.c | 2 +- drivers/net/irda/sir-dev.h | 29 +- drivers/net/macvlan.c | 47 +- drivers/net/netconsole.c | 57 +- drivers/net/phy/Kconfig | 7 + drivers/net/phy/Makefile | 1 + drivers/net/phy/at803x.c | 57 +- drivers/net/phy/marvell.c | 4 +- drivers/net/phy/mdio-moxart.c | 201 +++ drivers/net/phy/micrel.c | 24 + drivers/net/phy/realtek.c | 15 + drivers/net/plip/plip.c | 2 +- drivers/net/usb/Kconfig | 15 + drivers/net/usb/Makefile | 1 + drivers/net/usb/catc.c | 8 +- drivers/net/usb/cdc-phonet.c | 2 +- drivers/net/usb/cdc_mbim.c | 104 +- drivers/net/usb/cdc_ncm.c | 507 ++++--- drivers/net/usb/huawei_cdc_ncm.c | 230 ++++ drivers/net/usb/qmi_wwan.c | 69 +- drivers/net/veth.c | 9 + drivers/net/virtio_net.c | 219 +-- drivers/net/vmxnet3/vmxnet3_int.h | 4 +- drivers/net/vxlan.c | 37 +- drivers/net/wan/hostess_sv11.c | 2 +- drivers/net/wan/sealevel.c | 2 +- drivers/net/wan/x25_asy.h | 2 +- drivers/net/wan/z85230.h | 27 +- drivers/net/wimax/i2400m/i2400m-usb.h | 27 +- drivers/net/wimax/i2400m/i2400m.h | 117 +- drivers/net/wireless/adm8211.c | 1 - drivers/net/wireless/airo.c | 1 - drivers/net/wireless/ath/Kconfig | 18 + drivers/net/wireless/ath/Makefile | 5 +- drivers/net/wireless/ath/ar5523/ar5523.c | 1 + drivers/net/wireless/ath/ath10k/bmi.c | 42 +- drivers/net/wireless/ath/ath10k/ce.c | 397 +++--- drivers/net/wireless/ath/ath10k/ce.h | 126 +- drivers/net/wireless/ath/ath10k/core.c | 355 ++++- drivers/net/wireless/ath/ath10k/core.h | 80 +- drivers/net/wireless/ath/ath10k/debug.c | 157 ++- drivers/net/wireless/ath/ath10k/debug.h | 27 +- drivers/net/wireless/ath/ath10k/htc.c | 241 +--- drivers/net/wireless/ath/ath10k/htc.h | 5 +- drivers/net/wireless/ath/ath10k/htt.c | 19 +- drivers/net/wireless/ath/ath10k/htt.h | 13 +- drivers/net/wireless/ath/ath10k/htt_rx.c | 314 +++-- drivers/net/wireless/ath/ath10k/htt_tx.c | 287 ++-- drivers/net/wireless/ath/ath10k/hw.h | 79 +- drivers/net/wireless/ath/ath10k/mac.c | 732 +++++----- drivers/net/wireless/ath/ath10k/mac.h | 2 + drivers/net/wireless/ath/ath10k/pci.c | 465 ++++--- drivers/net/wireless/ath/ath10k/pci.h | 76 +- drivers/net/wireless/ath/ath10k/rx_desc.h | 24 +- drivers/net/wireless/ath/ath10k/trace.h | 32 +- drivers/net/wireless/ath/ath10k/txrx.c | 67 +- drivers/net/wireless/ath/ath10k/txrx.h | 5 +- drivers/net/wireless/ath/ath10k/wmi.c | 1277 ++++++++++++++++-- drivers/net/wireless/ath/ath10k/wmi.h | 1037 ++++++++++++++- drivers/net/wireless/ath/ath5k/ahb.c | 15 +- drivers/net/wireless/ath/ath5k/base.c | 6 +- drivers/net/wireless/ath/ath6kl/common.h | 3 +- drivers/net/wireless/ath/ath6kl/debug.h | 9 +- drivers/net/wireless/ath/ath6kl/htc.h | 2 +- drivers/net/wireless/ath/ath9k/Kconfig | 20 + drivers/net/wireless/ath/ath9k/Makefile | 4 +- drivers/net/wireless/ath/ath9k/ahb.c | 4 +- drivers/net/wireless/ath/ath9k/ani.c | 6 +- drivers/net/wireless/ath/ath9k/antenna.c | 36 +- drivers/net/wireless/ath/ath9k/ar5008_phy.c | 48 +- drivers/net/wireless/ath/ath9k/ar9002_calib.c | 11 +- drivers/net/wireless/ath/ath9k/ar9002_hw.c | 26 +- drivers/net/wireless/ath/ath9k/ar9002_phy.c | 25 +- drivers/net/wireless/ath/ath9k/ar9003_calib.c | 92 +- drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 34 +- drivers/net/wireless/ath/ath9k/ar9003_eeprom.h | 2 + drivers/net/wireless/ath/ath9k/ar9003_hw.c | 5 + drivers/net/wireless/ath/ath9k/ar9003_mci.c | 6 +- drivers/net/wireless/ath/ath9k/ar9003_phy.c | 240 ++-- drivers/net/wireless/ath/ath9k/ar9003_phy.h | 4 + drivers/net/wireless/ath/ath9k/ar9003_rtt.c | 58 +- drivers/net/wireless/ath/ath9k/ar9485_initvals.h | 218 ++- drivers/net/wireless/ath/ath9k/ar9565_1p0_initvals.h | 24 +- drivers/net/wireless/ath/ath9k/ath9k.h | 73 +- drivers/net/wireless/ath/ath9k/beacon.c | 2 + drivers/net/wireless/ath/ath9k/calib.c | 33 +- drivers/net/wireless/ath/ath9k/calib.h | 3 +- drivers/net/wireless/ath/ath9k/common.c | 91 +- drivers/net/wireless/ath/ath9k/common.h | 7 +- drivers/net/wireless/ath/ath9k/debug.c | 564 ++++---- drivers/net/wireless/ath/ath9k/debug.h | 12 +- drivers/net/wireless/ath/ath9k/dfs.h | 2 +- drivers/net/wireless/ath/ath9k/dfs_debug.c | 32 +- drivers/net/wireless/ath/ath9k/dfs_debug.h | 16 - drivers/net/wireless/ath/ath9k/eeprom_4k.c | 10 +- drivers/net/wireless/ath/ath9k/eeprom_9287.c | 8 +- drivers/net/wireless/ath/ath9k/eeprom_def.c | 12 +- drivers/net/wireless/ath/ath9k/gpio.c | 22 +- drivers/net/wireless/ath/ath9k/htc_drv_debug.c | 456 +++---- drivers/net/wireless/ath/ath9k/htc_drv_main.c | 32 +- drivers/net/wireless/ath/ath9k/hw-ops.h | 16 + drivers/net/wireless/ath/ath9k/hw.c | 128 +- drivers/net/wireless/ath/ath9k/hw.h | 112 +- drivers/net/wireless/ath/ath9k/init.c | 140 +- drivers/net/wireless/ath/ath9k/link.c | 27 +- drivers/net/wireless/ath/ath9k/mac.c | 6 +- drivers/net/wireless/ath/ath9k/mac.h | 2 - drivers/net/wireless/ath/ath9k/main.c | 327 +++-- drivers/net/wireless/ath/ath9k/mci.c | 8 +- drivers/net/wireless/ath/ath9k/pci.c | 195 ++- drivers/net/wireless/ath/ath9k/rc.c | 32 +- drivers/net/wireless/ath/ath9k/recv.c | 197 ++- drivers/net/wireless/ath/ath9k/wmi.h | 2 +- drivers/net/wireless/ath/ath9k/xmit.c | 70 +- drivers/net/wireless/ath/{ath9k => }/dfs_pattern_detector.c | 23 +- drivers/net/wireless/ath/{ath9k => }/dfs_pattern_detector.h | 28 +- drivers/net/wireless/ath/{ath9k => }/dfs_pri_detector.c | 10 +- drivers/net/wireless/ath/{ath9k => }/dfs_pri_detector.h | 2 + drivers/net/wireless/ath/regd.c | 140 +- drivers/net/wireless/ath/wcn36xx/Kconfig | 16 + drivers/net/wireless/ath/wcn36xx/Makefile | 7 + drivers/net/wireless/ath/wcn36xx/debug.c | 181 +++ drivers/net/wireless/ath/wcn36xx/debug.h | 49 + drivers/net/wireless/ath/wcn36xx/dxe.c | 805 +++++++++++ drivers/net/wireless/ath/wcn36xx/dxe.h | 284 ++++ drivers/net/wireless/ath/wcn36xx/hal.h | 4657 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/net/wireless/ath/wcn36xx/main.c | 1036 +++++++++++++++ drivers/net/wireless/ath/wcn36xx/pmc.c | 62 + drivers/net/wireless/ath/wcn36xx/pmc.h | 33 + drivers/net/wireless/ath/wcn36xx/smd.c | 2126 +++++++++++++++++++++++++++++ drivers/net/wireless/ath/wcn36xx/smd.h | 127 ++ drivers/net/wireless/ath/wcn36xx/txrx.c | 284 ++++ drivers/net/wireless/ath/wcn36xx/txrx.h | 160 +++ drivers/net/wireless/ath/wcn36xx/wcn36xx.h | 238 ++++ drivers/net/wireless/ath/wil6210/cfg80211.c | 4 +- drivers/net/wireless/ath/wil6210/pcie_bus.c | 1 - drivers/net/wireless/atmel.c | 94 +- drivers/net/wireless/b43/phy_n.c | 3 +- drivers/net/wireless/b43/xmit.c | 2 +- drivers/net/wireless/b43legacy/xmit.c | 2 +- drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 186 +-- drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 30 +- drivers/net/wireless/brcm80211/brcmfmac/dhd.h | 32 +- drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h | 29 +- drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c | 38 +- drivers/net/wireless/brcm80211/brcmfmac/dhd_proto.h | 12 +- drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 343 +++-- drivers/net/wireless/brcm80211/brcmfmac/fweh.h | 5 +- drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c | 2 + drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c | 28 + drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h | 31 +- drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h | 96 +- drivers/net/wireless/brcm80211/brcmfmac/tracepoint.h | 21 +- drivers/net/wireless/brcm80211/brcmfmac/usb.c | 5 +- drivers/net/wireless/brcm80211/brcmsmac/aiutils.h | 18 +- drivers/net/wireless/brcm80211/brcmsmac/ampdu.h | 22 +- drivers/net/wireless/brcm80211/brcmsmac/antsel.h | 14 +- drivers/net/wireless/brcm80211/brcmsmac/channel.h | 20 +- drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.h | 38 +- drivers/net/wireless/brcm80211/brcmsmac/main.c | 8 +- drivers/net/wireless/brcm80211/brcmsmac/main.h | 110 +- drivers/net/wireless/brcm80211/brcmsmac/phy/phy_hal.h | 219 ++- drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h | 371 +++--- drivers/net/wireless/brcm80211/brcmsmac/phy_shim.h | 91 +- drivers/net/wireless/brcm80211/brcmsmac/pmu.h | 4 +- drivers/net/wireless/brcm80211/brcmsmac/pub.h | 145 +- drivers/net/wireless/brcm80211/brcmsmac/rate.h | 48 +- drivers/net/wireless/brcm80211/brcmsmac/stf.h | 31 +- drivers/net/wireless/brcm80211/brcmsmac/ucode_loader.h | 16 +- drivers/net/wireless/brcm80211/include/brcm_hw_ids.h | 1 + drivers/net/wireless/brcm80211/include/brcmu_d11.h | 2 +- drivers/net/wireless/brcm80211/include/brcmu_utils.h | 44 +- drivers/net/wireless/cw1200/cw1200_spi.c | 4 +- drivers/net/wireless/hostap/hostap_info.c | 2 +- drivers/net/wireless/ipw2x00/ipw2200.c | 4 +- drivers/net/wireless/ipw2x00/libipw.h | 87 +- drivers/net/wireless/iwlegacy/3945-mac.c | 2 - drivers/net/wireless/iwlegacy/3945.h | 82 +- drivers/net/wireless/iwlegacy/4965-mac.c | 2 - drivers/net/wireless/iwlegacy/4965.h | 2 +- drivers/net/wireless/iwlegacy/common.h | 66 +- drivers/net/wireless/iwlwifi/dvm/agn.h | 2 +- drivers/net/wireless/iwlwifi/dvm/dev.h | 2 +- drivers/net/wireless/iwlwifi/dvm/rs.h | 8 +- drivers/net/wireless/iwlwifi/dvm/tx.c | 14 +- drivers/net/wireless/iwlwifi/dvm/ucode.c | 9 +- drivers/net/wireless/iwlwifi/iwl-7000.c | 14 + drivers/net/wireless/iwlwifi/iwl-config.h | 1 + drivers/net/wireless/iwlwifi/iwl-csr.h | 32 + drivers/net/wireless/iwlwifi/iwl-drv.c | 37 + drivers/net/wireless/iwlwifi/iwl-fw-file.h | 4 + drivers/net/wireless/iwlwifi/iwl-fw.h | 29 +- drivers/net/wireless/iwlwifi/iwl-io.c | 1 - drivers/net/wireless/iwlwifi/iwl-prph.h | 2 + drivers/net/wireless/iwlwifi/iwl-trans.h | 24 +- drivers/net/wireless/iwlwifi/mvm/bt-coex.c | 638 ++++++--- drivers/net/wireless/iwlwifi/mvm/constants.h | 4 +- drivers/net/wireless/iwlwifi/mvm/d3.c | 515 ++++++- drivers/net/wireless/iwlwifi/mvm/debugfs.c | 207 ++- drivers/net/wireless/iwlwifi/mvm/fw-api-bt-coex.h | 149 ++- drivers/net/wireless/iwlwifi/mvm/fw-api-d3.h | 69 +- drivers/net/wireless/iwlwifi/mvm/fw-api-mac.h | 11 + drivers/net/wireless/iwlwifi/mvm/fw-api-power.h | 29 +- drivers/net/wireless/iwlwifi/mvm/fw-api-rs.h | 21 +- drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h | 34 +- drivers/net/wireless/iwlwifi/mvm/fw-api-sta.h | 55 +- drivers/net/wireless/iwlwifi/mvm/fw-api.h | 16 +- drivers/net/wireless/iwlwifi/mvm/fw.c | 31 +- drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c | 81 +- drivers/net/wireless/iwlwifi/mvm/mac80211.c | 256 +++- drivers/net/wireless/iwlwifi/mvm/mvm.h | 89 +- drivers/net/wireless/iwlwifi/mvm/nvm.c | 101 +- drivers/net/wireless/iwlwifi/mvm/ops.c | 62 +- drivers/net/wireless/iwlwifi/mvm/power.c | 70 +- drivers/net/wireless/iwlwifi/mvm/quota.c | 42 +- drivers/net/wireless/iwlwifi/mvm/rs.c | 793 +++++------ drivers/net/wireless/iwlwifi/mvm/rs.h | 163 ++- drivers/net/wireless/iwlwifi/mvm/rx.c | 27 +- drivers/net/wireless/iwlwifi/mvm/scan.c | 462 ++++++- drivers/net/wireless/iwlwifi/mvm/sta.c | 206 ++- drivers/net/wireless/iwlwifi/mvm/sta.h | 4 - drivers/net/wireless/iwlwifi/mvm/testmode.h | 95 ++ drivers/net/wireless/iwlwifi/mvm/time-event.c | 5 +- drivers/net/wireless/iwlwifi/mvm/time-event.h | 4 +- drivers/net/wireless/iwlwifi/mvm/tx.c | 49 +- drivers/net/wireless/iwlwifi/mvm/utils.c | 2 +- drivers/net/wireless/iwlwifi/pcie/drv.c | 8 +- drivers/net/wireless/iwlwifi/pcie/trans.c | 127 +- drivers/net/wireless/iwlwifi/pcie/tx.c | 43 +- drivers/net/wireless/libertas/firmware.c | 5 + drivers/net/wireless/libertas/if_cs.c | 8 +- drivers/net/wireless/libertas/if_sdio.c | 8 +- drivers/net/wireless/libertas/if_spi.c | 6 +- drivers/net/wireless/libertas/if_usb.c | 17 +- drivers/net/wireless/mac80211_hwsim.c | 27 +- drivers/net/wireless/mwifiex/cmdevt.c | 2 +- drivers/net/wireless/mwifiex/join.c | 2 +- drivers/net/wireless/mwifiex/main.c | 4 +- drivers/net/wireless/mwifiex/pcie.c | 6 +- drivers/net/wireless/mwifiex/sta_cmd.c | 2 +- drivers/net/wireless/mwifiex/wmm.c | 2 +- drivers/net/wireless/mwifiex/wmm.h | 24 +- drivers/net/wireless/mwl8k.c | 2 - drivers/net/wireless/orinoco/orinoco.h | 31 +- drivers/net/wireless/orinoco/orinoco_nortel.c | 2 - drivers/net/wireless/orinoco/orinoco_pci.c | 2 - drivers/net/wireless/orinoco/orinoco_plx.c | 2 - drivers/net/wireless/orinoco/orinoco_tmd.c | 2 - drivers/net/wireless/p54/p54pci.c | 1 - drivers/net/wireless/p54/p54spi.c | 2 +- drivers/net/wireless/prism54/isl_ioctl.c | 10 +- drivers/net/wireless/prism54/islpci_dev.c | 2 +- drivers/net/wireless/prism54/oid_mgt.c | 2 +- drivers/net/wireless/rt2x00/Kconfig | 28 +- drivers/net/wireless/rt2x00/Makefile | 2 + drivers/net/wireless/rt2x00/rt2400pci.c | 2 +- drivers/net/wireless/rt2x00/rt2800.h | 44 +- drivers/net/wireless/rt2x00/rt2800lib.c | 289 ++-- drivers/net/wireless/rt2x00/rt2800mmio.c | 873 ++++++++++++ drivers/net/wireless/rt2x00/rt2800mmio.h | 165 +++ drivers/net/wireless/rt2x00/rt2800pci.c | 951 +------------ drivers/net/wireless/rt2x00/rt2800pci.h | 97 -- drivers/net/wireless/rt2x00/rt2800soc.c | 263 ++++ drivers/net/wireless/rt2x00/rt2800usb.c | 29 +- drivers/net/wireless/rt2x00/rt2x00.h | 103 +- drivers/net/wireless/rt2x00/rt2x00crypto.c | 4 +- drivers/net/wireless/rt2x00/rt2x00debug.c | 2 +- drivers/net/wireless/rt2x00/rt2x00dev.c | 8 +- drivers/net/wireless/rt2x00/rt2x00link.c | 74 +- drivers/net/wireless/rt2x00/rt2x00mac.c | 9 +- drivers/net/wireless/rt2x00/rt2x00pci.c | 2 +- drivers/net/wireless/rt2x00/rt2x00queue.c | 39 +- drivers/net/wireless/rt2x00/rt2x00usb.c | 2 + drivers/net/wireless/rt2x00/rt61pci.c | 20 +- drivers/net/wireless/rt2x00/rt73usb.c | 18 +- drivers/net/wireless/rtl818x/rtl8180/dev.c | 1 - drivers/net/wireless/rtlwifi/base.c | 29 + drivers/net/wireless/rtlwifi/base.h | 2 +- drivers/net/wireless/rtlwifi/cam.h | 10 +- drivers/net/wireless/rtlwifi/core.c | 10 +- drivers/net/wireless/rtlwifi/efuse.c | 18 +- drivers/net/wireless/rtlwifi/efuse.h | 29 +- drivers/net/wireless/rtlwifi/pci.c | 4 - drivers/net/wireless/rtlwifi/rtl8188ee/hw.c | 1 + drivers/net/wireless/rtlwifi/rtl8188ee/phy.c | 28 - drivers/net/wireless/rtlwifi/rtl8188ee/phy.h | 52 +- drivers/net/wireless/rtlwifi/rtl8188ee/sw.c | 3 +- drivers/net/wireless/rtlwifi/rtl8188ee/trx.c | 1 - drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c | 25 +- drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c | 30 - drivers/net/wireless/rtlwifi/rtl8192c/phy_common.h | 4 - drivers/net/wireless/rtlwifi/rtl8192ce/def.h | 2 - drivers/net/wireless/rtlwifi/rtl8192ce/phy.h | 52 +- drivers/net/wireless/rtlwifi/rtl8192ce/reg.h | 20 - drivers/net/wireless/rtlwifi/rtl8192ce/rf.h | 13 +- drivers/net/wireless/rtlwifi/rtl8192ce/sw.c | 3 +- drivers/net/wireless/rtlwifi/rtl8192ce/trx.c | 1 - drivers/net/wireless/rtlwifi/rtl8192cu/mac.c | 187 +-- drivers/net/wireless/rtlwifi/rtl8192cu/rf.h | 13 +- drivers/net/wireless/rtlwifi/rtl8192cu/sw.c | 3 +- drivers/net/wireless/rtlwifi/rtl8192cu/trx.c | 2 - drivers/net/wireless/rtlwifi/rtl8192de/dm.c | 8 +- drivers/net/wireless/rtlwifi/rtl8192de/hw.c | 18 - drivers/net/wireless/rtlwifi/rtl8192de/hw.h | 7 +- drivers/net/wireless/rtlwifi/rtl8192de/phy.c | 28 - drivers/net/wireless/rtlwifi/rtl8192de/phy.h | 49 +- drivers/net/wireless/rtlwifi/rtl8192de/rf.h | 18 +- drivers/net/wireless/rtlwifi/rtl8192de/sw.c | 3 +- drivers/net/wireless/rtlwifi/rtl8192de/trx.c | 1 - drivers/net/wireless/rtlwifi/rtl8192se/reg.h | 5 - drivers/net/wireless/rtlwifi/rtl8192se/trx.c | 1 - drivers/net/wireless/rtlwifi/rtl8723ae/phy.c | 29 - drivers/net/wireless/rtlwifi/rtl8723ae/phy.h | 62 +- drivers/net/wireless/rtlwifi/rtl8723ae/rf.h | 13 +- drivers/net/wireless/rtlwifi/rtl8723ae/sw.c | 3 +- drivers/net/wireless/rtlwifi/rtl8723ae/trx.c | 1 - drivers/net/wireless/rtlwifi/usb.c | 6 +- drivers/net/wireless/rtlwifi/wifi.h | 2 - drivers/net/wireless/ti/wl1251/spi.c | 2 +- drivers/net/wireless/ti/wl1251/wl1251.h | 4 +- drivers/net/wireless/ti/wl12xx/main.c | 18 +- drivers/net/wireless/ti/wl18xx/main.c | 127 +- drivers/net/wireless/ti/wl18xx/reg.h | 33 +- drivers/net/wireless/ti/wlcore/acx.c | 10 +- drivers/net/wireless/ti/wlcore/cmd.c | 70 +- drivers/net/wireless/ti/wlcore/cmd.h | 3 +- drivers/net/wireless/ti/wlcore/conf.h | 5 +- drivers/net/wireless/ti/wlcore/debugfs.c | 18 +- drivers/net/wireless/ti/wlcore/event.c | 1 + drivers/net/wireless/ti/wlcore/hw_ops.h | 9 + drivers/net/wireless/ti/wlcore/init.c | 6 + drivers/net/wireless/ti/wlcore/io.h | 4 +- drivers/net/wireless/ti/wlcore/main.c | 232 +++- drivers/net/wireless/ti/wlcore/ps.c | 4 + drivers/net/wireless/ti/wlcore/scan.c | 51 +- drivers/net/wireless/ti/wlcore/spi.c | 2 +- drivers/net/wireless/ti/wlcore/testmode.c | 16 +- drivers/net/wireless/ti/wlcore/tx.c | 27 +- drivers/net/wireless/ti/wlcore/tx.h | 3 + drivers/net/wireless/ti/wlcore/wlcore.h | 11 + drivers/net/wireless/ti/wlcore/wlcore_i.h | 13 +- drivers/net/xen-netback/common.h | 12 +- drivers/net/xen-netback/interface.c | 16 +- drivers/net/xen-netback/netback.c | 294 +++- drivers/net/xen-netback/xenbus.c | 52 +- drivers/net/xen-netfront.c | 4 +- drivers/nfc/Kconfig | 10 + drivers/nfc/Makefile | 1 + drivers/nfc/mei_phy.c | 6 +- drivers/nfc/microread/i2c.c | 32 +- drivers/nfc/microread/mei.c | 4 +- drivers/nfc/microread/microread.c | 7 +- drivers/nfc/nfcsim.c | 38 +- drivers/nfc/nfcwilink.c | 97 +- drivers/nfc/pn533.c | 604 ++++++--- drivers/nfc/pn544/i2c.c | 42 +- drivers/nfc/pn544/pn544.c | 129 +- drivers/nfc/port100.c | 1529 +++++++++++++++++++++ drivers/s390/net/qeth_core_main.c | 6 +- include/linux/crc32.h | 40 + include/linux/etherdevice.h | 35 +- include/linux/fcdevice.h | 2 +- include/linux/fddidevice.h | 7 +- include/linux/hippidevice.h | 10 +- include/linux/ieee80211.h | 24 +- include/linux/if_macvlan.h | 1 + include/linux/if_vlan.h | 101 ++ include/linux/inetdevice.h | 28 +- include/linux/ipv6.h | 76 +- include/linux/jump_label.h | 10 + include/linux/jump_label_ratelimit.h | 2 + include/linux/mlx4/cmd.h | 6 +- include/linux/mlx4/device.h | 25 +- include/linux/net.h | 109 +- include/linux/netdev_features.h | 6 + include/linux/netdevice.h | 502 +++---- include/linux/netfilter.h | 24 +- include/linux/netfilter/ipset/ip_set.h | 161 ++- include/linux/netfilter/ipset/ip_set_comment.h | 57 + include/linux/netfilter/ipset/ip_set_timeout.h | 4 +- include/linux/netfilter/nf_conntrack_common.h | 2 +- include/linux/netfilter/nf_conntrack_h323.h | 14 +- include/linux/netfilter/nf_conntrack_proto_gre.h | 4 +- include/linux/netfilter/nf_conntrack_sip.h | 162 +-- include/linux/netfilter/nfnetlink.h | 29 +- include/linux/netfilter/nfnetlink_acct.h | 6 +- include/linux/netfilter/x_tables.h | 128 +- include/linux/netfilter_bridge.h | 4 +- include/linux/netfilter_ipv4.h | 6 +- include/linux/netfilter_ipv6.h | 10 +- include/linux/random.h | 14 +- include/linux/rtnetlink.h | 2 +- include/linux/skbuff.h | 320 ++--- include/linux/ssb/ssb_driver_gige.h | 14 + include/linux/usb/cdc_ncm.h | 33 +- include/net/bluetooth/bluetooth.h | 27 +- include/net/bluetooth/hci.h | 155 ++- include/net/bluetooth/hci_core.h | 193 +-- include/net/bluetooth/l2cap.h | 35 +- include/net/bluetooth/mgmt.h | 18 + include/net/bluetooth/rfcomm.h | 6 +- include/net/bluetooth/sco.h | 5 +- include/net/caif/caif_hsi.h | 2 +- include/net/cfg80211.h | 32 + include/net/checksum.h | 11 + include/net/codel.h | 19 +- include/net/compat.h | 48 +- include/net/dcbevent.h | 6 +- include/net/dn.h | 20 +- include/net/dn_dev.h | 30 +- include/net/dn_fib.h | 47 +- include/net/dn_neigh.h | 12 +- include/net/dn_nsp.h | 49 +- include/net/dn_route.h | 13 +- include/net/dst.h | 25 +- include/net/esp.h | 12 - include/net/fib_rules.h | 17 +- include/net/flow.h | 11 +- include/net/flow_keys.h | 3 +- include/net/garp.h | 27 +- include/net/gen_stats.h | 51 +- include/net/genetlink.h | 26 +- include/net/gre.h | 8 +- include/net/icmp.h | 10 +- include/net/if_inet6.h | 5 +- include/net/inet6_connection_sock.h | 32 +- include/net/inet6_hashtables.h | 67 +- include/net/inet_common.h | 48 +- include/net/inet_connection_sock.h | 79 +- include/net/inet_frag.h | 4 + include/net/inet_hashtables.h | 99 +- include/net/inet_sock.h | 49 +- include/net/inet_timewait_sock.h | 69 +- include/net/inetpeer.h | 12 +- include/net/ip.h | 189 +-- include/net/ip6_checksum.h | 4 +- include/net/ip6_fib.h | 51 +- include/net/ip6_route.h | 98 +- include/net/ip_fib.h | 61 +- include/net/ip_tunnels.h | 3 + include/net/ip_vs.h | 283 ++-- include/net/ipv6.h | 271 ++-- include/net/ipx.h | 12 +- include/net/irda/ircomm_tty.h | 14 +- include/net/irda/irda.h | 21 +- include/net/irda/irda_device.h | 2 +- include/net/irda/irlap_event.h | 2 +- include/net/irda/irlap_frame.h | 4 +- include/net/iw_handler.h | 38 +- include/net/lapb.h | 52 +- include/net/llc.h | 50 +- include/net/llc_c_ac.h | 190 ++- include/net/llc_c_ev.h | 207 ++- include/net/llc_conn.h | 36 +- include/net/llc_if.h | 7 +- include/net/llc_pdu.h | 33 +- include/net/llc_s_ac.h | 20 +- include/net/llc_s_ev.h | 21 +- include/net/llc_sap.h | 22 +- include/net/mac80211.h | 60 + include/net/mrp.h | 26 +- include/net/ndisc.h | 61 +- include/net/net_namespace.h | 32 +- include/net/netevent.h | 6 +- include/net/netfilter/ipv4/nf_conntrack_ipv4.h | 6 +- include/net/netfilter/ipv4/nf_defrag_ipv4.h | 2 +- include/net/netfilter/ipv6/nf_defrag_ipv6.h | 13 +- include/net/netfilter/nf_conntrack.h | 69 +- include/net/netfilter/nf_conntrack_acct.h | 22 +- include/net/netfilter/nf_conntrack_core.h | 69 +- include/net/netfilter/nf_conntrack_ecache.h | 22 +- include/net/netfilter/nf_conntrack_extend.h | 4 +- include/net/netfilter/nf_conntrack_helper.h | 40 +- include/net/netfilter/nf_conntrack_l3proto.h | 16 +- include/net/netfilter/nf_conntrack_l4proto.h | 32 +- include/net/netfilter/nf_conntrack_seqadj.h | 30 +- include/net/netfilter/nf_conntrack_synproxy.h | 28 +- include/net/netfilter/nf_conntrack_timeout.h | 4 +- include/net/netfilter/nf_conntrack_timestamp.h | 8 +- include/net/netfilter/nf_nat.h | 13 +- include/net/netfilter/nf_nat_core.h | 8 +- include/net/netfilter/nf_nat_helper.h | 29 +- include/net/netfilter/nf_nat_l3proto.h | 23 +- include/net/netfilter/nf_nat_l4proto.h | 30 +- include/net/netfilter/nf_queue.h | 2 +- include/net/netfilter/nf_tables.h | 519 ++++++++ include/net/netfilter/nf_tables_core.h | 42 + include/net/netfilter/nf_tables_ipv4.h | 23 + include/net/netfilter/nf_tables_ipv6.h | 30 + include/net/netfilter/xt_rateest.h | 4 +- include/net/netlink.h | 63 +- include/net/netns/ipv4.h | 7 +- include/net/netns/nftables.h | 19 + include/net/netrom.h | 89 +- include/net/nfc/digital.h | 227 ++++ include/net/nfc/hci.h | 6 - include/net/nfc/nci.h | 4 + include/net/nfc/nci_core.h | 46 +- include/net/nfc/nfc.h | 25 +- include/net/p8022.h | 18 +- include/net/ping.h | 4 +- include/net/protocol.h | 24 +- include/net/psnap.h | 4 +- include/net/raw.h | 6 +- include/net/rawv6.h | 3 +- include/net/request_sock.h | 15 +- include/net/rose.h | 114 +- include/net/route.h | 78 +- include/net/rtnetlink.h | 40 +- include/net/sch_generic.h | 11 +- include/net/scm.h | 10 +- include/net/sctp/checksum.h | 56 +- include/net/sctp/sctp.h | 13 +- include/net/secure_seq.h | 26 +- include/net/sock.h | 276 ++-- include/net/stp.h | 4 +- include/net/tcp.h | 452 +++---- include/net/tcp_memcontrol.h | 12 - include/net/udp.h | 109 +- include/net/udplite.h | 6 +- include/net/vxlan.h | 11 + include/net/wext.h | 16 +- include/net/wimax.h | 33 +- include/net/x25.h | 141 +- include/net/xfrm.h | 382 +++--- include/uapi/asm-generic/socket.h | 2 + include/uapi/linux/can/bcm.h | 32 + include/uapi/linux/can/error.h | 32 + include/uapi/linux/can/gw.h | 32 + include/uapi/linux/can/netlink.h | 8 + include/uapi/linux/can/raw.h | 32 + include/uapi/linux/hsr_netlink.h | 50 + include/uapi/linux/if.h | 1 + include/uapi/linux/if_bonding.h | 2 + include/uapi/linux/if_ether.h | 1 + include/uapi/linux/if_link.h | 24 + include/uapi/linux/in.h | 5 + include/uapi/linux/ip_vs.h | 2 +- include/uapi/linux/netfilter/Kbuild | 2 + include/uapi/linux/netfilter/ipset/ip_set.h | 16 +- include/uapi/linux/netfilter/nf_conntrack_common.h | 4 + include/uapi/linux/netfilter/nf_tables.h | 718 ++++++++++ include/uapi/linux/netfilter/nf_tables_compat.h | 38 + include/uapi/linux/netfilter/nfnetlink.h | 10 +- include/uapi/linux/netfilter/nfnetlink_cttimeout.h | 2 + include/uapi/linux/nfc.h | 4 + include/uapi/linux/nl80211.h | 27 +- include/uapi/linux/openvswitch.h | 18 +- include/uapi/linux/pkt_cls.h | 14 + include/uapi/linux/pkt_sched.h | 4 + include/uapi/linux/random.h | 7 - include/xen/interface/io/netif.h | 18 +- init/main.c | 7 + kernel/jump_label.c | 5 + lib/Kconfig | 7 + lib/crc32.c | 456 ++++--- lib/random32.c | 307 ++++- mm/memcontrol.c | 6 +- net/8021q/vlan.c | 18 +- net/8021q/vlan.h | 105 +- net/8021q/vlan_dev.c | 23 +- net/Kconfig | 1 + net/Makefile | 1 + net/ax25/af_ax25.c | 2 +- net/batman-adv/Makefile | 3 +- net/batman-adv/bat_iv_ogm.c | 510 +++++-- net/batman-adv/bridge_loop_avoidance.c | 64 +- net/batman-adv/bridge_loop_avoidance.h | 10 +- net/batman-adv/debugfs.c | 9 - net/batman-adv/distributed-arp-table.c | 231 +++- net/batman-adv/distributed-arp-table.h | 5 + net/batman-adv/fragmentation.c | 491 +++++++ net/batman-adv/fragmentation.h | 50 + net/batman-adv/gateway_client.c | 247 ++-- net/batman-adv/gateway_client.h | 2 +- net/batman-adv/gateway_common.c | 230 ++-- net/batman-adv/gateway_common.h | 14 +- net/batman-adv/hard-interface.c | 110 +- net/batman-adv/hard-interface.h | 2 +- net/batman-adv/icmp_socket.c | 128 +- net/batman-adv/icmp_socket.h | 2 +- net/batman-adv/main.c | 689 +++++++++- net/batman-adv/main.h | 68 +- net/batman-adv/network-coding.c | 71 +- net/batman-adv/network-coding.h | 5 + net/batman-adv/originator.c | 364 +++-- net/batman-adv/originator.h | 13 +- net/batman-adv/packet.h | 356 +++-- net/batman-adv/routing.c | 557 ++++---- net/batman-adv/routing.h | 13 +- net/batman-adv/send.c | 239 +++- net/batman-adv/send.h | 53 + net/batman-adv/soft-interface.c | 269 +++- net/batman-adv/soft-interface.h | 4 + net/batman-adv/sysfs.c | 274 ++-- net/batman-adv/sysfs.h | 10 + net/batman-adv/translation-table.c | 2086 +++++++++++++++++++++-------- net/batman-adv/translation-table.h | 46 +- net/batman-adv/types.h | 436 +++--- net/batman-adv/unicast.c | 491 ------- net/batman-adv/unicast.h | 92 -- net/batman-adv/vis.c | 938 ------------- net/batman-adv/vis.h | 36 - net/bluetooth/Makefile | 2 + net/bluetooth/a2mp.c | 72 +- {include/net => net}/bluetooth/a2mp.h | 0 net/bluetooth/af_bluetooth.c | 73 +- net/bluetooth/amp.c | 10 +- {include/net => net}/bluetooth/amp.h | 0 net/bluetooth/bnep/core.c | 18 +- net/bluetooth/cmtp/core.c | 6 +- net/bluetooth/hci_conn.c | 194 ++- net/bluetooth/hci_core.c | 1160 +++++++++++++--- net/bluetooth/hci_event.c | 175 ++- net/bluetooth/hci_sock.c | 210 ++- net/bluetooth/hci_sysfs.c | 373 ------ net/bluetooth/hidp/core.c | 18 +- net/bluetooth/hidp/hidp.h | 4 +- net/bluetooth/l2cap_core.c | 538 ++++---- net/bluetooth/l2cap_sock.c | 222 +++- net/bluetooth/mgmt.c | 1641 +++++++++++++++++------ net/bluetooth/rfcomm/core.c | 33 +- net/bluetooth/rfcomm/sock.c | 49 +- net/bluetooth/sco.c | 57 +- net/bluetooth/smp.c | 98 +- {include/net => net}/bluetooth/smp.h | 0 net/bridge/br_multicast.c | 4 +- net/bridge/br_netfilter.c | 24 +- net/bridge/br_private.h | 300 ++--- net/bridge/br_private_stp.h | 24 +- net/bridge/netfilter/Kconfig | 4 + net/bridge/netfilter/Makefile | 2 + net/bridge/netfilter/ebt_among.c | 2 +- net/bridge/netfilter/ebtable_filter.c | 16 +- net/bridge/netfilter/ebtable_nat.c | 16 +- net/bridge/netfilter/nf_tables_bridge.c | 102 ++ net/caif/cfpkt_skbuff.c | 12 +- net/can/af_can.h | 6 +- net/ceph/auth_none.h | 2 +- net/ceph/auth_x.h | 2 +- net/ceph/crypto.h | 48 +- net/core/datagram.c | 2 +- net/core/dev.c | 557 +++++--- net/core/dev_addr_lists.c | 4 +- net/core/ethtool.c | 3 + net/core/fib_rules.c | 3 +- net/core/flow_dissector.c | 79 +- net/core/iovec.c | 2 +- net/core/neighbour.c | 2 +- net/core/net-sysfs.c | 2 +- net/core/netprio_cgroup.c | 3 +- net/core/rtnetlink.c | 12 +- net/core/secure_seq.c | 16 +- net/core/skbuff.c | 144 +- net/core/sock.c | 45 +- net/core/utils.c | 49 + net/dccp/ackvec.h | 21 +- net/dccp/ccid.h | 18 +- net/dccp/ccids/lib/loss_interval.h | 8 +- net/dccp/ccids/lib/packet_history.h | 25 +- net/dccp/ccids/lib/tfrc.h | 22 +- net/dccp/dccp.h | 186 ++- net/dccp/feat.h | 26 +- net/dccp/ipv4.c | 19 +- net/dccp/ipv6.c | 83 +- net/dccp/ipv6.h | 2 - net/dccp/minisocks.c | 15 +- net/dccp/output.c | 4 +- net/dccp/proto.c | 4 +- net/decnet/netfilter/dn_rtmsg.c | 2 +- net/ethernet/eth.c | 30 +- net/hsr/Kconfig | 27 + net/hsr/Makefile | 7 + net/hsr/hsr_device.c | 596 +++++++++ net/hsr/hsr_device.h | 29 + net/hsr/hsr_framereg.c | 503 +++++++ net/hsr/hsr_framereg.h | 53 + net/hsr/hsr_main.c | 469 +++++++ net/hsr/hsr_main.h | 166 +++ net/hsr/hsr_netlink.c | 457 +++++++ net/hsr/hsr_netlink.h | 30 + net/ieee802154/6lowpan.c | 50 +- net/ipv4/af_inet.c | 94 +- net/ipv4/esp4.c | 49 +- net/ipv4/fib_frontend.c | 2 - net/ipv4/fib_lookup.h | 26 +- net/ipv4/fib_semantics.c | 2 +- net/ipv4/fib_trie.c | 15 +- net/ipv4/gre_demux.c | 29 - net/ipv4/gre_offload.c | 3 +- net/ipv4/icmp.c | 5 + net/ipv4/inet_connection_sock.c | 54 +- net/ipv4/inet_diag.c | 120 +- net/ipv4/inet_fragment.c | 3 - net/ipv4/inet_hashtables.c | 110 +- net/ipv4/inet_timewait_sock.c | 59 +- net/ipv4/ip_fragment.c | 1 + net/ipv4/ip_output.c | 33 +- net/ipv4/ip_sockglue.c | 27 +- net/ipv4/ip_tunnel_core.c | 33 + net/ipv4/ip_vti.c | 67 +- net/ipv4/ipip.c | 11 +- net/ipv4/netfilter/Kconfig | 21 + net/ipv4/netfilter/Makefile | 6 + net/ipv4/netfilter/arptable_filter.c | 5 +- net/ipv4/netfilter/ipt_CLUSTERIP.c | 112 +- net/ipv4/netfilter/ipt_SYNPROXY.c | 2 +- net/ipv4/netfilter/iptable_filter.c | 7 +- net/ipv4/netfilter/iptable_mangle.c | 10 +- net/ipv4/netfilter/iptable_nat.c | 26 +- net/ipv4/netfilter/iptable_raw.c | 6 +- net/ipv4/netfilter/iptable_security.c | 7 +- net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 12 +- net/ipv4/netfilter/nf_defrag_ipv4.c | 6 +- net/ipv4/netfilter/nf_tables_arp.c | 102 ++ net/ipv4/netfilter/nf_tables_ipv4.c | 127 ++ net/ipv4/netfilter/nft_chain_nat_ipv4.c | 205 +++ net/ipv4/netfilter/nft_chain_route_ipv4.c | 90 ++ net/ipv4/netfilter/nft_reject_ipv4.c | 123 ++ net/ipv4/ping.c | 29 +- net/ipv4/raw.c | 6 +- net/ipv4/route.c | 20 +- net/ipv4/syncookies.c | 80 +- net/ipv4/sysctl_net_ipv4.c | 137 +- net/ipv4/tcp.c | 17 +- net/ipv4/tcp_bic.c | 5 +- net/ipv4/tcp_cong.c | 47 +- net/ipv4/tcp_cubic.c | 5 +- net/ipv4/tcp_fastopen.c | 29 +- net/ipv4/tcp_highspeed.c | 4 +- net/ipv4/tcp_htcp.c | 4 +- net/ipv4/tcp_hybla.c | 5 +- net/ipv4/tcp_illinois.c | 5 +- net/ipv4/tcp_input.c | 137 +- net/ipv4/tcp_ipv4.c | 125 +- net/ipv4/tcp_lp.c | 5 +- net/ipv4/tcp_memcontrol.c | 90 +- net/ipv4/tcp_metrics.c | 27 +- net/ipv4/tcp_minisocks.c | 7 +- net/ipv4/tcp_offload.c | 8 +- net/ipv4/tcp_output.c | 33 +- net/ipv4/tcp_probe.c | 29 +- net/ipv4/tcp_scalable.c | 5 +- net/ipv4/tcp_timer.c | 9 +- net/ipv4/tcp_vegas.c | 11 +- net/ipv4/tcp_vegas.h | 10 +- net/ipv4/tcp_veno.c | 9 +- net/ipv4/tcp_yeah.c | 5 +- net/ipv4/udp.c | 235 +++- net/ipv4/udp_impl.h | 36 +- net/ipv4/udp_offload.c | 1 + net/ipv4/xfrm4_mode_tunnel.c | 16 +- net/ipv6/Kconfig | 29 +- net/ipv6/Makefile | 1 + net/ipv6/addrconf.c | 41 +- net/ipv6/af_inet6.c | 65 +- net/ipv6/datagram.c | 25 +- net/ipv6/esp6.c | 48 +- net/ipv6/inet6_connection_sock.c | 33 +- net/ipv6/inet6_hashtables.c | 122 +- net/ipv6/ip6_fib.c | 205 ++- net/ipv6/ip6_flowlabel.c | 67 +- net/ipv6/ip6_offload.c | 40 +- net/ipv6/ip6_output.c | 3 +- net/ipv6/ip6_vti.c | 1056 +++++++++++++++ net/ipv6/ipv6_sockglue.c | 35 +- net/ipv6/netfilter/Kconfig | 13 + net/ipv6/netfilter/Makefile | 5 + net/ipv6/netfilter/ip6t_REJECT.c | 7 +- net/ipv6/netfilter/ip6t_SYNPROXY.c | 2 +- net/ipv6/netfilter/ip6table_filter.c | 5 +- net/ipv6/netfilter/ip6table_mangle.c | 10 +- net/ipv6/netfilter/ip6table_nat.c | 27 +- net/ipv6/netfilter/ip6table_raw.c | 5 +- net/ipv6/netfilter/ip6table_security.c | 5 +- net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 66 +- net/ipv6/netfilter/nf_conntrack_reasm.c | 35 +- net/ipv6/netfilter/nf_defrag_ipv6_hooks.c | 11 +- net/ipv6/netfilter/nf_tables_ipv6.c | 127 ++ net/ipv6/netfilter/nft_chain_nat_ipv6.c | 211 +++ net/ipv6/netfilter/nft_chain_route_ipv6.c | 88 ++ net/ipv6/ping.c | 2 +- net/ipv6/raw.c | 17 +- net/ipv6/reassembly.c | 12 +- net/ipv6/route.c | 66 +- net/ipv6/sit.c | 28 +- net/ipv6/syncookies.c | 75 +- net/ipv6/tcp_ipv6.c | 113 +- net/ipv6/tcpv6_offload.c | 2 +- net/ipv6/udp.c | 88 +- net/ipv6/udp_impl.h | 41 +- net/ipv6/udp_offload.c | 4 +- net/ipv6/xfrm6_mode_tunnel.c | 69 + net/irda/irnet/irnet.h | 15 +- net/l2tp/l2tp_core.c | 10 +- net/l2tp/l2tp_core.h | 57 +- net/l2tp/l2tp_debugfs.c | 5 +- net/l2tp/l2tp_ip6.c | 16 +- net/l2tp/l2tp_netlink.c | 4 +- net/l2tp/l2tp_ppp.c | 12 +- net/mac80211/Kconfig | 12 + net/mac80211/aes_ccm.c | 169 +-- net/mac80211/aes_ccm.h | 14 +- net/mac80211/cfg.c | 234 +++- net/mac80211/chan.c | 5 - net/mac80211/debug.h | 10 + net/mac80211/debugfs.c | 55 +- net/mac80211/debugfs_netdev.c | 25 +- net/mac80211/driver-ops.h | 27 + net/mac80211/ht.c | 41 +- net/mac80211/ibss.c | 594 +++++++-- net/mac80211/ieee80211_i.h | 71 +- net/mac80211/iface.c | 7 + net/mac80211/key.c | 2 +- net/mac80211/key.h | 2 +- net/mac80211/mesh.c | 302 ++++- net/mac80211/mesh_plink.c | 3 +- net/mac80211/mesh_ps.c | 33 +- net/mac80211/mlme.c | 453 +++---- net/mac80211/rate.c | 15 +- net/mac80211/rate.h | 12 +- net/mac80211/rc80211_minstrel.c | 14 + net/mac80211/rc80211_minstrel_ht.c | 23 +- net/mac80211/rc80211_pid_debugfs.c | 26 +- net/mac80211/rx.c | 42 +- net/mac80211/scan.c | 3 +- net/mac80211/spectmgmt.c | 169 +++ net/mac80211/sta_info.c | 72 + net/mac80211/sta_info.h | 5 + net/mac80211/status.c | 31 +- net/mac80211/trace.h | 39 +- net/mac80211/tx.c | 84 +- net/mac80211/util.c | 286 +++- net/mac80211/vht.c | 4 +- net/mac80211/wpa.c | 44 +- net/mac802154/ieee802154_dev.c | 6 +- net/mac802154/wpan.c | 2 + net/mpls/mpls_gso.c | 1 + net/netfilter/Kconfig | 52 + net/netfilter/Makefile | 18 + net/netfilter/core.c | 2 +- net/netfilter/ipset/Kconfig | 20 +- net/netfilter/ipset/Makefile | 2 + net/netfilter/ipset/ip_set_bitmap_gen.h | 174 +-- net/netfilter/ipset/ip_set_bitmap_ip.c | 125 +- net/netfilter/ipset/ip_set_bitmap_ipmac.c | 156 +-- net/netfilter/ipset/ip_set_bitmap_port.c | 114 +- net/netfilter/ipset/ip_set_core.c | 409 ++++-- net/netfilter/ipset/ip_set_getport.c | 18 +- net/netfilter/ipset/ip_set_hash_gen.h | 545 ++++---- net/netfilter/ipset/ip_set_hash_ip.c | 58 +- net/netfilter/ipset/ip_set_hash_ipport.c | 80 +- net/netfilter/ipset/ip_set_hash_ipportip.c | 86 +- net/netfilter/ipset/ip_set_hash_ipportnet.c | 108 +- net/netfilter/ipset/ip_set_hash_net.c | 85 +- net/netfilter/ipset/ip_set_hash_netiface.c | 98 +- net/netfilter/ipset/ip_set_hash_netnet.c | 481 +++++++ net/netfilter/ipset/ip_set_hash_netport.c | 92 +- net/netfilter/ipset/ip_set_hash_netportnet.c | 586 ++++++++ net/netfilter/ipset/ip_set_list_set.c | 274 ++-- net/netfilter/ipvs/ip_vs_core.c | 95 +- net/netfilter/ipvs/ip_vs_ctl.c | 6 +- net/netfilter/ipvs/ip_vs_lblc.c | 2 +- net/netfilter/ipvs/ip_vs_lblcr.c | 2 +- net/netfilter/ipvs/ip_vs_pe_sip.c | 8 +- net/netfilter/ipvs/ip_vs_proto_sctp.c | 48 +- net/netfilter/ipvs/ip_vs_sh.c | 39 +- net/netfilter/nf_conntrack_acct.c | 12 +- net/netfilter/nf_conntrack_core.c | 16 +- net/netfilter/nf_conntrack_netlink.c | 51 +- net/netfilter/nf_conntrack_sip.c | 133 +- net/netfilter/nf_internals.h | 28 +- net/netfilter/nf_nat_core.c | 20 + net/netfilter/nf_nat_sip.c | 35 +- net/netfilter/nf_tables_api.c | 3275 +++++++++++++++++++++++++++++++++++++++++++++ net/netfilter/nf_tables_core.c | 270 ++++ net/netfilter/nfnetlink.c | 177 ++- net/netfilter/nfnetlink_cttimeout.c | 161 ++- net/netfilter/nfnetlink_log.c | 11 +- net/netfilter/nfnetlink_queue_core.c | 6 +- net/netfilter/nft_bitwise.c | 146 ++ net/netfilter/nft_byteorder.c | 173 +++ net/netfilter/nft_cmp.c | 223 ++++ net/netfilter/nft_compat.c | 768 +++++++++++ net/netfilter/nft_counter.c | 113 ++ net/netfilter/nft_ct.c | 258 ++++ net/netfilter/nft_expr_template.c | 94 ++ net/netfilter/nft_exthdr.c | 133 ++ net/netfilter/nft_hash.c | 231 ++++ net/netfilter/nft_immediate.c | 132 ++ net/netfilter/nft_limit.c | 119 ++ net/netfilter/nft_log.c | 146 ++ net/netfilter/nft_lookup.c | 141 ++ net/netfilter/nft_meta.c | 228 ++++ net/netfilter/nft_meta_target.c | 117 ++ net/netfilter/nft_nat.c | 224 ++++ net/netfilter/nft_payload.c | 160 +++ net/netfilter/nft_rbtree.c | 247 ++++ net/netfilter/xt_TCPMSS.c | 72 +- net/netfilter/xt_TPROXY.c | 2 +- net/netfilter/xt_connbytes.c | 6 +- net/netfilter/xt_set.c | 222 ++-- net/netfilter/xt_socket.c | 15 +- net/netlabel/netlabel_kapi.c | 2 +- net/nfc/Kconfig | 14 + net/nfc/Makefile | 2 + net/nfc/core.c | 22 +- net/nfc/digital.h | 170 +++ net/nfc/digital_core.c | 737 ++++++++++ net/nfc/digital_dep.c | 729 ++++++++++ net/nfc/digital_technology.c | 770 +++++++++++ net/nfc/nci/spi.c | 239 ++-- net/nfc/netlink.c | 91 ++ net/nfc/rawsock.c | 7 +- net/openvswitch/Makefile | 2 + net/openvswitch/datapath.c | 668 +--------- net/openvswitch/datapath.h | 9 +- net/openvswitch/flow.c | 1605 +--------------------- net/openvswitch/flow.h | 132 +- net/openvswitch/flow_netlink.c | 1630 +++++++++++++++++++++++ net/openvswitch/flow_netlink.h | 60 + net/openvswitch/flow_table.c | 592 +++++++++ net/openvswitch/flow_table.h | 81 ++ net/openvswitch/vport-gre.c | 2 - net/openvswitch/vport-internal_dev.c | 2 +- net/openvswitch/vport-vxlan.c | 3 +- net/rds/connection.c | 12 +- net/rds/rds.h | 2 +- net/rfkill/Kconfig | 2 +- net/rfkill/rfkill-gpio.c | 211 ++- net/rxrpc/ar-internal.h | 150 +-- net/sched/Kconfig | 10 + net/sched/Makefile | 1 + net/sched/act_police.c | 4 +- net/sched/cls_basic.c | 2 +- net/sched/cls_bpf.c | 385 ++++++ net/sched/cls_cgroup.c | 4 +- net/sched/em_ipset.c | 7 +- net/sched/em_meta.c | 4 +- net/sched/sch_api.c | 3 + net/sched/sch_generic.c | 13 +- net/sched/sch_htb.c | 17 +- net/sched/sch_netem.c | 1 - net/sched/sch_tbf.c | 22 +- net/sctp/associola.c | 4 +- net/sctp/auth.c | 14 +- net/sctp/chunk.c | 2 +- net/sctp/ipv6.c | 22 +- net/sctp/output.c | 9 +- net/sctp/sm_make_chunk.c | 29 +- net/sctp/socket.c | 2 +- net/sunrpc/svcsock.c | 4 +- net/tipc/bcast.c | 16 +- net/tipc/bearer.c | 18 +- net/tipc/bearer.h | 10 +- net/tipc/core.h | 28 +- net/tipc/eth_media.c | 68 +- net/tipc/ib_media.c | 58 +- net/tipc/link.c | 492 +++---- net/tipc/link.h | 24 +- net/tipc/msg.c | 27 +- net/tipc/msg.h | 15 +- net/tipc/node.c | 7 +- net/tipc/node.h | 6 +- net/tipc/port.c | 66 +- net/tipc/port.h | 16 +- net/tipc/socket.c | 12 +- net/wimax/wimax-internal.h | 18 +- net/wireless/chan.c | 4 +- net/wireless/core.h | 15 +- net/wireless/debugfs.c | 24 +- net/wireless/genregdb.awk | 6 + net/wireless/ibss.c | 24 +- net/wireless/mlme.c | 6 +- net/wireless/nl80211.c | 102 +- net/wireless/reg.c | 53 +- net/wireless/reg.h | 4 +- net/wireless/scan.c | 4 +- net/wireless/sme.c | 4 +- net/wireless/sysfs.h | 4 +- net/wireless/util.c | 23 +- net/xfrm/xfrm_algo.c | 13 - net/xfrm/xfrm_hash.h | 4 +- net/xfrm/xfrm_ipcomp.c | 6 +- net/xfrm/xfrm_policy.c | 7 + net/xfrm/xfrm_state.c | 6 +- security/lsm_audit.c | 7 +- security/selinux/hooks.c | 12 +- 1332 files changed, 78932 insertions(+), 32377 deletions(-) create mode 100644 Documentation/devicetree/bindings/net/cpsw-phy-sel.txt create mode 100644 drivers/net/bonding/bond_netlink.c create mode 100644 drivers/net/bonding/bond_options.c create mode 100644 drivers/net/ethernet/ti/cpsw-phy-sel.c create mode 100644 drivers/net/phy/mdio-moxart.c create mode 100644 drivers/net/usb/huawei_cdc_ncm.c rename drivers/net/wireless/ath/{ath9k => }/dfs_pattern_detector.c (95%) rename drivers/net/wireless/ath/{ath9k => }/dfs_pattern_detector.h (87%) rename drivers/net/wireless/ath/{ath9k => }/dfs_pri_detector.c (98%) rename drivers/net/wireless/ath/{ath9k => }/dfs_pri_detector.h (97%) create mode 100644 drivers/net/wireless/ath/wcn36xx/Kconfig create mode 100644 drivers/net/wireless/ath/wcn36xx/Makefile create mode 100644 drivers/net/wireless/ath/wcn36xx/debug.c create mode 100644 drivers/net/wireless/ath/wcn36xx/debug.h create mode 100644 drivers/net/wireless/ath/wcn36xx/dxe.c create mode 100644 drivers/net/wireless/ath/wcn36xx/dxe.h create mode 100644 drivers/net/wireless/ath/wcn36xx/hal.h create mode 100644 drivers/net/wireless/ath/wcn36xx/main.c create mode 100644 drivers/net/wireless/ath/wcn36xx/pmc.c create mode 100644 drivers/net/wireless/ath/wcn36xx/pmc.h create mode 100644 drivers/net/wireless/ath/wcn36xx/smd.c create mode 100644 drivers/net/wireless/ath/wcn36xx/smd.h create mode 100644 drivers/net/wireless/ath/wcn36xx/txrx.c create mode 100644 drivers/net/wireless/ath/wcn36xx/txrx.h create mode 100644 drivers/net/wireless/ath/wcn36xx/wcn36xx.h create mode 100644 drivers/net/wireless/iwlwifi/mvm/testmode.h create mode 100644 drivers/net/wireless/rt2x00/rt2800mmio.c create mode 100644 drivers/net/wireless/rt2x00/rt2800mmio.h create mode 100644 drivers/net/wireless/rt2x00/rt2800soc.c create mode 100644 drivers/nfc/port100.c create mode 100644 include/linux/netfilter/ipset/ip_set_comment.h create mode 100644 include/net/netfilter/nf_tables.h create mode 100644 include/net/netfilter/nf_tables_core.h create mode 100644 include/net/netfilter/nf_tables_ipv4.h create mode 100644 include/net/netfilter/nf_tables_ipv6.h create mode 100644 include/net/netns/nftables.h create mode 100644 include/net/nfc/digital.h create mode 100644 include/uapi/linux/hsr_netlink.h create mode 100644 include/uapi/linux/netfilter/nf_tables.h create mode 100644 include/uapi/linux/netfilter/nf_tables_compat.h create mode 100644 net/batman-adv/fragmentation.c create mode 100644 net/batman-adv/fragmentation.h delete mode 100644 net/batman-adv/unicast.c delete mode 100644 net/batman-adv/unicast.h delete mode 100644 net/batman-adv/vis.c delete mode 100644 net/batman-adv/vis.h rename {include/net => net}/bluetooth/a2mp.h (100%) rename {include/net => net}/bluetooth/amp.h (100%) rename {include/net => net}/bluetooth/smp.h (100%) create mode 100644 net/bridge/netfilter/nf_tables_bridge.c create mode 100644 net/hsr/Kconfig create mode 100644 net/hsr/Makefile create mode 100644 net/hsr/hsr_device.c create mode 100644 net/hsr/hsr_device.h create mode 100644 net/hsr/hsr_framereg.c create mode 100644 net/hsr/hsr_framereg.h create mode 100644 net/hsr/hsr_main.c create mode 100644 net/hsr/hsr_main.h create mode 100644 net/hsr/hsr_netlink.c create mode 100644 net/hsr/hsr_netlink.h create mode 100644 net/ipv4/netfilter/nf_tables_arp.c create mode 100644 net/ipv4/netfilter/nf_tables_ipv4.c create mode 100644 net/ipv4/netfilter/nft_chain_nat_ipv4.c create mode 100644 net/ipv4/netfilter/nft_chain_route_ipv4.c create mode 100644 net/ipv4/netfilter/nft_reject_ipv4.c create mode 100644 net/ipv6/ip6_vti.c create mode 100644 net/ipv6/netfilter/nf_tables_ipv6.c create mode 100644 net/ipv6/netfilter/nft_chain_nat_ipv6.c create mode 100644 net/ipv6/netfilter/nft_chain_route_ipv6.c create mode 100644 net/netfilter/ipset/ip_set_hash_netnet.c create mode 100644 net/netfilter/ipset/ip_set_hash_netportnet.c create mode 100644 net/netfilter/nf_tables_api.c create mode 100644 net/netfilter/nf_tables_core.c create mode 100644 net/netfilter/nft_bitwise.c create mode 100644 net/netfilter/nft_byteorder.c create mode 100644 net/netfilter/nft_cmp.c create mode 100644 net/netfilter/nft_compat.c create mode 100644 net/netfilter/nft_counter.c create mode 100644 net/netfilter/nft_ct.c create mode 100644 net/netfilter/nft_expr_template.c create mode 100644 net/netfilter/nft_exthdr.c create mode 100644 net/netfilter/nft_hash.c create mode 100644 net/netfilter/nft_immediate.c create mode 100644 net/netfilter/nft_limit.c create mode 100644 net/netfilter/nft_log.c create mode 100644 net/netfilter/nft_lookup.c create mode 100644 net/netfilter/nft_meta.c create mode 100644 net/netfilter/nft_meta_target.c create mode 100644 net/netfilter/nft_nat.c create mode 100644 net/netfilter/nft_payload.c create mode 100644 net/netfilter/nft_rbtree.c create mode 100644 net/nfc/digital.h create mode 100644 net/nfc/digital_core.c create mode 100644 net/nfc/digital_dep.c create mode 100644 net/nfc/digital_technology.c create mode 100644 net/openvswitch/flow_netlink.c create mode 100644 net/openvswitch/flow_netlink.h create mode 100644 net/openvswitch/flow_table.c create mode 100644 net/openvswitch/flow_table.h create mode 100644 net/sched/cls_bpf.c ��.n��������+%������w��{.n����z�����n�r������&��z�ޗ�zf���h���~����������_��+v���)ߣ�