* [GIT] Networking
@ 2011-01-12 0:24 David Miller
0 siblings, 0 replies; 12+ messages in thread
From: David Miller @ 2011-01-12 0:24 UTC (permalink / raw)
To: torvalds; +Cc: akpm, netdev, netfilter-devel, linux-wireless, linux-kernel
Mostly driver stuff (as usual), a TCP bind fix, some checksum
offloading cures, and random other small bits all over.
1) Fix signedness bugs in phonet, from Dan Carpenter.
2) Sequence number checking fixes in DCCP from Samuel Jero and
Gerrit Renker.
3) Support both ports of FEC ethernet device properly, from
Shawn Guo.
4) Memory leak fix in hamradio and ATM ambassador driver from Jesper
Juhl.
5) MSI interrupt and statistic handling fixes in bnx2x from Vladislav
Zolotarov and Eilon Greenstein.
6) Autonegotiation and VLAN fixes in sky2 from Stephen Hemminger.
7) Power management fixes in forcedeth from Rafael J. Wysocki.
8) Fix handling of NLM_F_ROOT | NLM_F_MATCH (can be mistaken as
a NLM_F_DUMP request) in genetlink. From Jan Engelhardt.
9) Kernel doc fixes in net/sock.h and net/core/filter.c from Randy
Dunlap
10) Do PHY init, and thus firmware request, at ->open() time to
workaround bootup 60 second delay when r8169 is built statically
into the kernel. From Francois Romieu.
11) Checksumming offload flags are handled improperly, in particular
when VLAN's are nested. From Jesse Gross.
12) Various Intel wired driver fixes from Bruce Allan, Jeff Kirsher,
Dirk Brandewie, Yi Zou, and Alexander Duyck.
13) Software interrupts are disabled way too long when reading counters
(for "iptables -L" output, for example). Fix from Eric Dumazet.
14) bfin_mac driver has to disable checksum offloading when a writeback
cache is in use, since corrupt packets can result, fix from
Sonic Zhang.
15) Firmware version detection and ethtool diag dixes in qlcnic from
Amit Kumar Salecha and Sony Chacko.
16) Mailbox register coherency, and ->open() failure unwinding fixes
in cxgb4vf from Casey Leedom.
17) On user copy failure, we erroneously leave the connection request
parameter size set, in CAIF protocol. Fix from Dan Rosenberg.
18) MLX4 driver needs to be able to allocate different numbers of
TX vs. RX queues, add a helper for that and use it. From Tom
Herbert.
19) Only HTB scheduler handles packet counting in statistics properly
wrt. segmented SKBs. Fix this by creating a helper function and
using it everywhere. From Eric Dumazet.
20) Firewire needs to be able to invalidate specific ARP entries since
it uses ARP to discover private info about firewiare network nodes.
From Maxim Levitsky.
21) IPV6 not handled properly in CAIF, fix from Sjur Braendeland and
Kumar Sanghvi.
22) Firmware parsing function in r8169 needs some minor tweaks, from
Hayes Wang.
23) TCP binding bug fix from Eric Dumazet.
24) ehea RX ring initialization fix on device up from Breno Leitao.
25) AUTH truncation bug fixes in IPSEC from Nicolas Dichtel.
26) AH protocol header parsing needs to reload pointers after
skb COW, also from Nicolas Dichtel.
27) Fix netfilter conntrack race between table dumping and destroy of
entries, from Stephen Hemminger.
28) RCU annotation addition to bridge netfilter broke broute table,
fix from Florian Westphal.
Please pull, thanks a lot!
The following changes since commit 0c21e3aaf6ae85bee804a325aa29c325209180fd:
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/hfsplus (2011-01-07 17:16:27 -0800)
are available in the git repository at:
master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git master
Alexander Duyck (3):
ixgbe: cleanup flow director hash computation to improve performance
ixgbe: further flow director performance optimizations
ixgbe: update ntuple filter configuration
Breno Leitao (1):
ehea: Increase the skb array usage
Bruce Allan (6):
e1000e: cleanup variables set but not used
e1000e: convert calls of ops.[read|write]_reg to e1e_[r|w]phy
e1000e: properly bounds-check string functions
e1000e: use either_crc_le() rather than re-write it
e1000e: power off PHY after reset when interface is down
e1000e: add custom set_d[0|3]_lplu_state function pointer for 82574
Casey Leedom (2):
cxgb4vf: fix mailbox data/control coherency domain race
cxgb4vf: recover from failure in cxgb4vf_open()
Changli Gao (1):
net: ppp: use {get,put}_unaligned_be{16,32}
Dan Carpenter (1):
phonet: some signedness bugs
Dan Rosenberg (1):
caif: don't set connection request param size before copying data
Dang Hongwu (1):
ah: reload pointers to skb data after calling skb_cow_data()
David S. Miller (2):
Merge branch 'dccp' of git://eden-feed.erg.abdn.ac.uk/net-next-2.6
Merge branch 'master' of git://1984.lsi.us.es/net-2.6
Dirk Brandewie (1):
e1000: Add support for the CE4100 reference platform
Eric Dumazet (3):
netfilter: x_tables: dont block BH while reading counters
net_sched: factorize qdisc stats handling
tcp: disallow bind() to reuse addr/port
Florian Westphal (1):
netfilter: ebtables: make broute table work again
Gerrit Renker (1):
dccp: make upper bound for seq_window consistent on 32/64 bit
Jan Engelhardt (1):
netlink: test for all flags of the NLM_F_DUMP composite
Jesper Juhl (2):
hamradio: Resolve memory leak due to missing firmware release in add_mcs()
Madge Ambassador ATM Adapter driver: Always release_firmware() in ucode_init() and don't leak memory.
Jesse Gross (6):
net offloading: Accept NETIF_F_HW_CSUM for all protocols.
net offloading: Generalize netif_get_vlan_features().
net offloading: Pass features into netif_needs_gso().
net offloading: Convert dev_gso_segment() to use precomputed features.
net offloading: Convert skb_need_linearize() to use precomputed features.
net offloading: Convert checksums to use centrally computed features.
Ken Kawasaki (1):
pcnet_cs: add new_id
Kumar Sanghvi (1):
CAIF: Fix IPv6 support in receive path for GPRS/3G
Maxim Levitsky (1):
arp: allow to invalidate specific ARP entries
Mike Frysinger (4):
netdev: bfin_mac: clean up printk messages
netdev: bfin_mac: mark setup_system_regs as static
netdev: bfin_mac: drop unused Mac data
netdev: bfin_mac: let boards set vlan masks
Nicolas Dichtel (2):
xfrm: check trunc_len in XFRMA_ALG_AUTH_TRUNC
ah: update maximum truncated ICV length
Rafael J. Wysocki (1):
forcedeth: Do not use legacy PCI power management
Randy Dunlap (2):
net/sock.h: make some fields private to fix kernel-doc warning(s)
net: fix kernel-doc warning in core/filter.c
Samuel Jero (2):
dccp: fix return value for sequence-invalid packets
dccp: fix bug in updating the GSR
Shawn Guo (6):
net/fec: fix MMFR_OP type in fec_enet_mdio_write
net/fec: remove the use of "index" which is legacy
net/fec: add mac field into platform data and consolidate fec_get_mac
net/fec: improve pm for better suspend/resume
net/fec: add dual fec support for mx28
net/fec: remove config FEC2 as it's used nowhere
Sonic Zhang (1):
netdev: bfin_mac: disable hardware checksum if writeback cache is enabled
Sony Chacko (1):
qlcnic: fix ethtool diagnostics test
Stephen Hemminger (3):
sky2: fix limited auto negotiation
sky2: convert to new VLAN model (v0.2)
netfilter: fix race in conntrack between dump_table and destroy
Tom Herbert (2):
net: Add alloc_netdev_mqs function
mlx4: Call alloc_etherdev to allocate RX and TX queues
Vladislav Zolotarov (4):
bnx2x: Don't prevent RSS configuration in INT#x and MSI interrupt modes.
bnx2x: registers dump fixes
bnx2x: Move to D0 before clearing MSI/MSI-X configuration.
bnx2x: Fix the race on bp->stats_pending.
Yi Zou (1):
ixgbe: make sure per Rx queue is disabled before unmapping the receive buffer
amit salecha (2):
qlcnic: fix flash fw version read
qlcnic: change module parameter permissions
françois romieu (1):
r8169: delay phy init until device opens.
hayeswang (1):
net/r8169: Update the function of parsing firmware
Documentation/networking/dccp.txt | 1 +
drivers/atm/ambassador.c | 19 +-
drivers/net/Kconfig | 9 +-
drivers/net/bfin_mac.c | 74 ++--
drivers/net/bfin_mac.h | 11 +-
drivers/net/bnx2x/bnx2x.h | 1 +
drivers/net/bnx2x/bnx2x_dump.h | 988 +++++++++++++++++++--------------
drivers/net/bnx2x/bnx2x_ethtool.c | 22 +-
drivers/net/bnx2x/bnx2x_init.h | 220 ++++++++
drivers/net/bnx2x/bnx2x_main.c | 70 +--
drivers/net/bnx2x/bnx2x_reg.h | 74 +++
drivers/net/bnx2x/bnx2x_stats.c | 5 +
drivers/net/cxgb4vf/cxgb4vf_main.c | 15 +-
drivers/net/cxgb4vf/t4vf_hw.c | 11 +
drivers/net/e1000/e1000_hw.c | 328 +++++++++---
drivers/net/e1000/e1000_hw.h | 59 ++-
drivers/net/e1000/e1000_main.c | 35 ++
drivers/net/e1000/e1000_osdep.h | 19 +-
drivers/net/e1000e/82571.c | 77 +++-
drivers/net/e1000e/e1000.h | 3 +
drivers/net/e1000e/es2lan.c | 4 +-
drivers/net/e1000e/ethtool.c | 54 ++-
drivers/net/e1000e/hw.h | 1 +
drivers/net/e1000e/ich8lan.c | 77 +--
drivers/net/e1000e/lib.c | 3 +-
drivers/net/e1000e/netdev.c | 53 ++-
drivers/net/e1000e/phy.c | 40 +-
drivers/net/ehea/ehea.h | 2 +-
drivers/net/ehea/ehea_main.c | 6 +-
drivers/net/fec.c | 248 ++++++---
drivers/net/fec.h | 5 +-
drivers/net/forcedeth.c | 34 +-
drivers/net/hamradio/yam.c | 4 +-
drivers/net/ixgbe/ixgbe.h | 21 +-
drivers/net/ixgbe/ixgbe_82599.c | 749 ++++++++++----------------
drivers/net/ixgbe/ixgbe_ethtool.c | 142 ++++--
drivers/net/ixgbe/ixgbe_main.c | 169 +++++--
drivers/net/ixgbe/ixgbe_type.h | 91 ++--
drivers/net/mlx4/en_netdev.c | 3 +-
drivers/net/pcmcia/pcnet_cs.c | 1 +
drivers/net/ppp_async.c | 10 +-
drivers/net/ppp_deflate.c | 9 +-
drivers/net/ppp_generic.c | 9 +-
drivers/net/ppp_mppe.c | 7 +-
drivers/net/ppp_synctty.c | 3 +-
drivers/net/qlcnic/qlcnic.h | 24 +-
drivers/net/qlcnic/qlcnic_ethtool.c | 2 +-
drivers/net/qlcnic/qlcnic_init.c | 63 +++-
drivers/net/qlcnic/qlcnic_main.c | 10 +-
drivers/net/r8169.c | 143 +++++-
drivers/net/sky2.c | 143 +++---
drivers/net/sky2.h | 6 +-
drivers/net/xen-netfront.c | 2 +-
include/linux/bfin_mac.h | 1 +
include/linux/etherdevice.h | 4 +-
include/linux/fec.h | 3 +
include/linux/if_bridge.h | 2 +-
include/linux/netdevice.h | 24 +-
include/linux/netfilter/x_tables.h | 10 +-
include/net/ah.h | 2 +-
include/net/arp.h | 1 +
include/net/phonet/phonet.h | 4 +-
include/net/sch_generic.h | 20 +-
include/net/sock.h | 4 +
net/caif/caif_socket.c | 2 +-
net/caif/chnl_net.c | 18 +-
net/core/dev.c | 149 +++---
net/core/filter.c | 2 +-
net/core/rtnetlink.c | 2 +-
net/dccp/dccp.h | 3 +-
net/dccp/input.c | 2 +-
net/dccp/sysctl.c | 4 +-
net/ethernet/eth.c | 12 +-
net/ipv4/ah4.c | 7 +-
net/ipv4/arp.c | 29 +-
net/ipv4/inet_connection_sock.c | 5 +-
net/ipv4/inet_diag.c | 2 +-
net/ipv4/netfilter/arp_tables.c | 45 +--
net/ipv4/netfilter/ip_tables.c | 45 +--
net/ipv6/ah6.c | 8 +-
net/ipv6/inet6_connection_sock.c | 2 +-
net/ipv6/netfilter/ip6_tables.c | 45 +--
net/netfilter/nf_conntrack_netlink.c | 18 +-
net/netfilter/x_tables.c | 3 +-
net/netlink/genetlink.c | 2 +-
net/phonet/af_phonet.c | 6 +-
net/sched/act_csum.c | 3 +-
net/sched/act_ipt.c | 3 +-
net/sched/act_mirred.c | 3 +-
net/sched/act_nat.c | 3 +-
net/sched/act_pedit.c | 3 +-
net/sched/act_police.c | 3 +-
net/sched/act_simple.c | 3 +-
net/sched/act_skbedit.c | 3 +-
net/sched/sch_atm.c | 6 +-
net/sched/sch_cbq.c | 6 +-
net/sched/sch_drr.c | 8 +-
net/sched/sch_dsmark.c | 3 +-
net/sched/sch_hfsc.c | 6 +-
net/sched/sch_htb.c | 17 +-
net/sched/sch_ingress.c | 3 +-
net/sched/sch_multiq.c | 3 +-
net/sched/sch_netem.c | 6 +-
net/sched/sch_prio.c | 3 +-
net/sched/sch_red.c | 3 +-
net/sched/sch_sfq.c | 3 +-
net/sched/sch_tbf.c | 3 +-
net/sched/sch_teql.c | 3 +-
net/xfrm/xfrm_user.c | 6 +-
109 files changed, 2901 insertions(+), 1867 deletions(-)
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 12+ messages in thread
* [GIT] Networking
@ 2011-03-16 21:21 David Miller
0 siblings, 0 replies; 12+ messages in thread
From: David Miller @ 2011-03-16 21:21 UTC (permalink / raw)
To: torvalds-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b
Cc: akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b,
netdev-u79uwXL29TY76Z2rM5mHXA,
linux-wireless-u79uwXL29TY76Z2rM5mHXA,
netfilter-devel-u79uwXL29TY76Z2rM5mHXA,
linux-bluetooth-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: Text/Plain; charset=utf-8, Size: 181391 bytes --]
I just did a test merge of this work into your tree and it went without
any conflicts, so it should go easy for you too.
1) The long awaited addition of Jozsef Kadlecsik's totally awesome
"ipset" to netfilter.
2) Several major changes to our routing infrastructure:
a) Routing metrics are stored in inetpeer cache and are COW'able.
b) PMTU and redirect information can be stored in the inetpeer
cache as well. IPV4 is fully converted over to this scheme.
Changes 'a' and 'b' are significant because it paves the way
to be able to legitimately remove the ipv4 routing cache once
we can get the FIB backend efficient enough.
c) Route flow lookup keys and compacted, and optimized for the
individual address families. On ipv4 this means the (often
on-stack) flow keys are 32 bytes in size, instead of the
whopping 60 bytes they used to be.
d) Instead of returning an error code, and writing the resulting
route entry pointer on the callers stack by reference, we
return error encoded pointers instead.
e) We had two ipv4 routing table lookup algorithms, selected
at compile time, one based upon a set of hash tables and
another based upon the LC-trie data structure. After many
years it is time to stop having two sets of code to update
when fixes or API changes take place, and settle on the
LC-trie. fib_hash has therefore been completely removed.
f) Several optimizations to the slow paths of IPV4 routing lookups,
in particular caching of per-nexthop source address selection
values in the FIB table entries.
g) The routing cache entry data structure, struct rtable, has
been completely stripped of extraneous and unnecessary members.
3) The initial TCP congestion window is increased to 10, as per
draft-hkchu-tcpm-initcwnd-01
4) Multi-threaded sending on UDP sockets are significantly improved
by eliminating the use of shared socket state in the non-cork
cases of I/O. From Herbert Xu.
5) Several fixes to the Hystart mechanism of CUBIC TCP congestion
control. From Stephem Hemminger, Sangtae Ha, and Lucas Nussbaum.
6) Many cleanups and improvements to IPVS support in netfilter from
Simon Horman, Julian Anastasov, and many others.
7) Add the XEN network backend driver, from Ian Campbell.
8) Numerous cleanups, simplifications, and fixes to the TIPC stack
from Allan Stephens and Paul Gortmaker.
9) Support for extended sequence numbers in IPSEC, from Steffen
Klassert.
10) Socket filters can now be used with AF_UNIX sockets. From
Alban Crequy.
11) Socket filter running no longer blocks softirqs, as they are fully
re-entrant and lock-less. From Eric Dumazet.
12) Support for network device groups, which allows manipulation of
settings on a group basis, from Vlad Dogaru.
13) Add HW based qos support, in that we can now use the skb->priority
field to steer packets to individual HW TX queues. From John
Fastabend.
14) Convert PPP away from direct SKB list implementation details as
much as possible, with much help from Paul Mackerras.
15) RPS can now be accelerated directly in hardware, thanks to
Ben Hutchings.
16) New packet schedulers, CHOKe and SFB, From Stephen Hemminger and
Eric Dumazet.
17) Consolidation of how bonding binds master and slave devices, as well
as how RX packet processing works. From Jiri Pirko and others.
18) Harmonization of network device checksum offload setting
management, from Michał Mirosław.
19) Support correlated packet loss support to the network emulator
packet scheduler, from Stephen Hemminger and based upon work done
by Stefano Salsano and Fabio Ludovici.
20) An entry in the ip_tos2prio[] table has been wrong for ~8 years :-)
Thanks to Dan Siemon and Eric Dumazet.
21) As usual the wired and wireless developers have been busy little
bees fixing bugs, improving performance, and adding new features.
See the changelog for details.
Please pull, thanks a lot.
The following changes since commit 76ca07832842100b14a31ad8996dab7b0c28aa42:
Merge branch 'for-linus' of git://xenbits.xen.org/people/sstabellini/linux-pvhvm (2011-03-15 10:59:09 -0700)
are available in the git repository at:
master.kernel.org:/pub/scm/linux/kernel/git/davem/net-next-2.6.git master
Ajit Khaparde (23):
be2net: While configuring QOS for VF, pass proper domain id
be2net: endianness fix in be_cmd_set_qos().
be2net: Use domain id when be_cmd_if_destroy is called.
be2net: Initialize and cleanup sriov resources only if pci_enable_sriov has succeeded.
be2net: call be_vf_eth_addr_config() after register_netdev
be2net: Cleanup the VF interface handles
be2net: For the VF MAC, use the OUI from current MAC address
be2net: pass domain numbers for pmac_add/del functions
be2net: Allow VFs to call be_cmd_reset_function.
be2net: Fix broken priority setting when vlan tagging is enabled.
be2net: pass proper hdr_size while flashing redboot.
be2net: fix be_suspend/resume/shutdown
be2net: gracefully handle situations when UE is detected
be2net: detect a UE even when a interface is down.
be2net: restrict WOL to PFs only.
be2net: add new counters to display via ethtool stats
be2net: fixes in ethtool selftest
be2net: variable name change
be2net: fix to ignore transparent vlan ids wrongly indicated by NIC
be2net: add code to display temperature of ASIC
be2net: use hba_port_num instead of port_num
be2net: Copyright notice change. Update to Emulex instead of ServerEngines
be2net: Bump up the version number
Alban Crequy (2):
af_unix: implement socket filter
af_unix: coding style: remove one level of indentation in unix_shutdown()
Alessio Igor Bogani (2):
rtlwifi: Add the missing rcu_read_lock/unlock
rtlwifi: fix places where uninitialized data is used
Alexander Duyck (1):
ixgbe: balance free_irq calls with request_irq calls
Allan Stephens (42):
tipc: Combine port structure with tipc_port structure
tipc: Combine bearer structure with tipc_bearer structure
tipc: Remove unused global variable tipc_user_count
tipc: Prevent invalid memory access when sending to configuration service
tipc: Improve handling of invalid link tolerance values
tipc: Fix print statements that assume pointers are 32-bit values
tipc: Clean out all remaining instances of #if 0'd unused code
tipc: Clean up tracking of node requesting a broadcast retransmit
tipc: Eliminate unnecessary locking when starting topology service
tipc: Improve accuracy of link transmit queue maximum size statistic
tipc: Set unused probe field of link protocol messages to defined value
tipc: Minor optimization to topology service connection establishment
tipc: Fix port counter handling to correct congestion control
tipc: Add in missing lock during link initialization
tipc: Remove support for per-connection message sequence numbering
tipc: Remove unused message header field for requested number of links
tipc: Avoid reliable broadcast preparation for NACK messages
tipc: Allow receiving into iovec containing multiple entries
tipc: Correct broadcast link peer info when displaying links
tipc: Add network address mask helper routines
tipc: Prevent null pointer error when removing a node subscription
tipc: Cosmetic changes to node subscription code
tipc: Add support for SO_RCVTIMEO socket option
tipc: Fix problem with missing link in "tipc-config -l" output
tipc: Split up unified structure of network-related variables
tipc: Eliminate configuration for maximum number of cluster nodes
tipc: Convert node object array to a hash table
tipc: manually inline net_start/stop, make assoc. vars static
tipc: Eliminate timestamp from link protocol messages
tipc: make msg_set_redundant_link() consistent with other set ops
tipc: Fix redundant link field handling in link protocol message
tipc: Cosmetic changes to neighbor discovery logic
tipc: Give Tx of discovery responses priority over link messages
tipc: Optimizations to link creation code
tipc: Correct misnamed references to neighbor discovery domain
tipc: Remove unused field in bearer structure
tipc: Eliminate unnecessary constant for neighbor discovery msg size
tipc: Don't respond to neighbor discovery request on blocked bearer
tipc: Remove bearer flag indicating existence of broadcast address
tipc: Eliminate remaining support for routing table messages
tipc: Eliminate obsolete routine for handling routed messages
tipc: Update maintenance information
Amerigo Wang (5):
bonding: sync netpoll code with bridge
netpoll: remove IFF_IN_NETPOLL flag
bond: service netpoll arp queue on master device
bonding: use the correct size for _simple_hash()
bonding: move procfs code into bond_procfs.c
Anand Gadiyar (2):
Bluetooth: fix build break on hci_sock.c
Bluetooth: remove unnecessary call to hci_sock_cleanup
Anders Berggren (2):
net: TX timestamps for IPv6 UDP packets
igb: fix hw timestamping
Anderson Briglia (1):
Bluetooth: Fix LE conn creation
Andrei Emeltchenko (3):
Bluetooth: Use non-flushable by default L2CAP data packets
Bluetooth: Do not use assignments in IF conditions
Bluetooth: fix crash by disabling tasklet in sock accept
Andrei Warkentin (1):
Bluetooth: Make hci a child of the corresponding tty device.
Andy Gospodarek (2):
ixgbe: fix compile failure in ixgbe_init_mbx_params_pf
bonding: enable netpoll without checking link status
Ariel Elior (1):
bnx2x: fix swap of rx-ticks and tx-ticks parameters in interrupt coalescing flow
Arik Nemtsov (33):
wl12xx: Add AP related configuration to conf_drv_settings
wl12xx: AP mode - AP specific CMD_CONFIGURE sub-commands
wl12xx: AP mode - add AP specific event
wl12xx: AP-mode high level commands
wl12xx: AP mode - workaround for FW bug on station remove
wl12xx: AP mode - init sequence
wl12xx: AP specific RX filter configuration
wl12xx: Add AP related definitions to HOST-FW interface
wl12xx: Configure AP on BSS info change
wl12xx: AP mode config in ieee80211_ops.config
wl12xx: AP mode - change filter config
wl12xx: AP mode - add STA add/remove ops
wl12xx: AP mode - changes in TX path
wl12xx: AP mode - record TX configuration settings
wl12xx: AP mode - encryption support
wl12xx: AP mode - fetch appropriate firmware for AP
wl12xx: Read MAC address from NVS file on HW startup
wl12xx: Enable AP-mode
wl12xx: add missing MODULE_FIRMWARE statment for AP-mode FW
wl12xx: Add channel 14 to list of supported 2ghz channels
mac80211: do not calc frame duration when using HW rate-control
mac80211: add HW flag for disabling auto link-PS in AP mode
mac80211: pass up beacons from external BSS when operating as AP
wl12xx: avoid blocking while holding rcu lock on bss info change
wl12xx: fix potential race condition with TX queue watermark
wl12xx: AP-mode - fix race condition on sta connection
wl12xx: AP-mode - TX queue per link in AC
wl12xx: report invalid TX rate when returning non-TX-ed skbs
wl12xx: AP-mode - support HW based link PS monitoring
wl12xx: AP mode - fix bug in cleanup of wl1271_op_sta_add()
wl12xx: AP-mode - count free FW TX blocks per link
wl12xx: AP-mode - management of links in PS-mode
wl12xx: wakeup chip from ELP during scan
Atita Shirwaikar (1):
ixgbe: Adding 100MB FULL support in ethtool
Bala Shanmugam (1):
Bluetooth: Add firmware support for Atheros 3012
Baruch Siach (1):
phy/micrel: add ability to support 50MHz RMII clock on KZS8051RNL
Ben Dooks (1):
DM9000: Allow randomised ethernet address
Ben Greear (32):
mac80211: Show max retry-counts in kernel messages.
ath9k: Fix up hardware mode and beacons with multiple vifs.
mac80211: Fix skb-copy failure debug message.
ath9k: Show some live tx-queue values in debugfs.
ath9k: Initialize ah->hw
ath9k: Add more information to debugfs xmit file.
ath9k: Remove un-used member from ath_node.
ath9k: Ensure xmit makes progress.
ath9k: Add counters to distinquish AMPDU enqueues.
ath9k: Keep track of stations for debugfs.
ath9k: More xmit queue debugfs information.
ath9k: Restart xmit logic in xmit watchdog.
ath9k: Add 'misc' file to debugfs, fix queue indexes.
ath9k: Try more than one queue when scheduling new aggregate.
mac80211: Add sdata state and flags to debugfs.
mac80211: Be more careful when changing channels.
mac80211: Show configured channel-type in netdev debugfs.
mac80211: Warn users if HT fails because of freq mismatch.
ath9k: Show channel type and frequency in debugfs.
mac80211: Recalculate channel-type on iface removal.
mac80211: Optimize scans on current operating channel.
mac80211: Make some mlme timers module paramaters.
ath9k: Print channel-type in chan-change dbg message.
mac80211: Properly set work-item channel-type.
mac80211: Allow scanning on existing channel-type.
mac80211: Allow work items to use existing channel type.
ath9k: Add debug info for configuring power level.
mac80211: Ensure power-level set properly for scanning.
network: Allow af_packet to transmit +4 bytes for VLAN packets.
mac80211: Add power to debugfs.
ath9k: Fix txq memory address printing in debugfs.
ath5k: Put hardware in PROMISC mode if there is more than 1 stations.
Ben Hutchings (18):
genirq: Add IRQ affinity notifiers
lib: cpu_rmap: CPU affinity reverse-mapping
net: RPS: Enable hardware acceleration of RFS
sch_mqprio: Always set num_tc to 0 in mqprio_destroy()
net: Adjust TX queue kobjects if number of queues changes during unregister
sfc: Move TX queue core queue mapping into tx.c
sfc: Distinguish queue lookup from test for queue existence
sfc: Add TX queues for high-priority traffic
net: RPS: Make hardware-accelerated RFS conditional on NETIF_F_NTUPLE
sfc: Limit filter search depth further for performance hints (i.e. RFS)
sfc: Implement hardware acceleration of RFS
sfc: Read MC firmware version when requested through ethtool
sfc: Do not read STAT1.FAULT in efx_mdio_check_mmd()
sfc: Update copyright dates
sfc: Expose TX push and TSO counters through ethtool statistics
sfc: Remove configurable FIFO thresholds for pause frame generation
sfc: Bump version to 3.1
sfc: Use write-combining to reduce TX latency
Bernard Pidoux (2):
ROSE: rose AX25 packet routing improvement
ROSE: AX25: finding routes simplification
Bhupesh Sharma (1):
can: c_can: Added support for Bosch C_CAN controller
Bing Zhao (1):
ieee80211: add IEEE80211_COUNTRY_STRING_LEN definition
Bob Copeland (3):
ath5k: use tracing for packet tx/rx dump
ath5k: remove debug_dump_skb() functions
ath5k: move external function definitions to a header file
Bruce Allan (13):
e1000e: reduce scope of some variables, remove unnecessary ones
e1000e: Use kmemdup rather than duplicating its implementation
e1000e: replace unbounded sprintf with snprintf
e1000e: use correct pointer when memcpy'ing a 2-dimensional array
e1000e: return appropriate errors for 'ethtool -r'
e1000e: use dev_kfree_skb_irq() instead of dev_kfree_skb()
e1000e: magic number cleanup - ETH_ALEN
e1000e: extend timeout for ethtool link test diagnostic
e1000e: extend EEE LPI timer to prevent dropped link
e1000e: do not toggle LANPHYPC value bit when PHY reset is blocked
e1000e: disable jumbo frames on 82579 when MACsec enabled in EEPROM
e1000e: do not suggest the driver supports Wake-on-ARP
e1000e: bump version number
Bruno Randolf (14):
cfg80211: Extend channel to frequency mapping for 802.11j
ath5k: Use mac80211 channel mapping function
ath5k: Rename ath5k_copy_channels
ath5k: Add 802.11j 4.9GHz channels to allowed channels
ath5: Remove unused CTL definitions
ath5k: Remove unused sc->curmode
ath5k: Remove redundant sc->curband
ath5k: Simplify loop when setting up channels
ath5k: ath5k_setup_channels cleanup and whitespace
ath5k: Use local variable for capabilities
ath: Add function to check if 4.9GHz channels are allowed
ath5k: Enable 802.11j 4.9GHz frequencies
ath9k: Remove unused IEEE80211_WEP_NKID
ath5k: Fix short and long retry configuration
Carolyn Wyborny (12):
igb: Add support for i340 Quad Port Fiber Adapter
igb: Enable PF side of SR-IOV support for i350 devices
igb: Update Intel copyright notice for driver source.
igb: update version string
igb: Fix reg pattern test in ethtool for i350 devices
igb: Fix strncpy calls to be safe per source code review tools
igb: Add stats output for OS2BMC feature on i350 devices
igb: Add Energy Efficient Ethernet (EEE) for i350 devices.
igb: Update NVM functions to work with i350 devices
igb: Add DMA Coalescing feature to driver
igb: Bump version to 3.0.6
igb: Add messaging for thermal sensor events on i350 devices
Changli Gao (22):
netfilter: nf_conntrack: don't always initialize ct->proto
netfilter: xt_NFQUEUE: remove modulo operations
netfilter: ct_extend: fix the wrong alloc_size
netfilter: nf_conntrack: define ct_*_info as needed
netfilter: nf_nat: don't use atomic bit operation
netfilter: ct_extend: define NF_CT_EXT_* as needed
netfilter: nf_nat: define nat_pptp_info as needed
netfilter: nf_nat: fix conversion to non-atomic bit ops
netfilter: nf_conntrack: remove an atomic bit operation
netfilter: nf_nat: place conntrack in source hash after SNAT is done
netfilter: ipvs: fix compiler warnings
netfilter: ipvs: fix compiler warnings
ipvs: use hlist instead of list
ipvs: use enum to instead of magic numbers
ipvs: unify the formula to estimate the overhead of processing connections
llc: avoid skb_clone() if there is only one handler
bonding: remove the unused dummy functions when net poll controller isn't enabled
bonding: COW before overwriting the destination MAC address
netfilter: xt_connlimit: fix daddr connlimit in SNAT scenario
netfilter: xt_connlimit: use kmalloc() instead of kzalloc()
netfilter: xt_connlimit: use hlist instead
netfilter: xt_connlimit: remove connlimit_rnd_inited
Chaoming Li (1):
rtlwifi: Fix error registering rate-control
Christian Lamparter (11):
carl9170: update fw/hw headers
carl9170: enable wake-on-lan feature testing
carl9170: utilize fw seq counter for mgmt/non-QoS data frames
mac80211: fix race between next beacon dtim and ieee80211_get_buffered_bc
p54: sort channel list by frequency instead of channel index
p54: p54_generate_band cleanup
p54: enhance rssi->dBm database import
p54spi: update sample eeprom
p54: implement flush callback
ar9170usb: mark the old driver as obsolete
p54: implement set_coverage_class
Claudio Takahasi (3):
Bluetooth: Add LE signaling commands handling
Bluetooth: Add connection parameter update response
Bluetooth: Send LE Connection Update Command
Dan Carpenter (6):
wl12xx: use after free in debug code
IPVS: precedence bug in ip_vs_sync_switch_mode()
mac80211: remove unneeded check
wl12xx: change type from u8 to int
iwlwifi: remove duplicate initialization
libertas: fix write past end of array in mesh_id_get()
Dan Siemon (1):
net_sched: fix ip_tos2prio
Daniel Baluta (1):
af_unix: update locking comment
Daniel Halperin (1):
mac80211: update minstrel_ht sample rate when probe is set
Daniel Lezcano (1):
macvlan : fix checksums error when we are in bridge mode
Daniel Turull (1):
pktgen: bug fix in transmission headers with frags=0
David Gnedt (6):
wl1251: fix queue stopping/waking for TX path
wl1251: fix 4-byte TX buffer alignment
wl1251: enable beacon early termination while in power-saving mode
wl1251: implement connection quality monitoring
wl1251: enable adhoc mode
wl1251: set rate index and preamble flag on received packets
David S. Miller (204):
Merge branch 'master' of master.kernel.org:/.../davem/net-2.6
Merge branch 'master' of git://git.kernel.org/.../kaber/nf-next-2.6
ppp: Clean up kernel log messages.
ppp: Reconstruct fragmented packets using frag lists instead of copying.
net: Add safe reverse SKB queue walkers.
ppp: Use SKB queue abstraction interfaces in fragment processing.
Merge branch 'master' of master.kernel.org:/.../jkirsher/net-next-2.6
Merge branch 'master' of master.kernel.org:/.../davem/net-2.6
Merge branch 'irq/numa' of git://git.kernel.org/.../tip/linux-2.6-tip
typhoon: Kill references to UTS_RELEASE
Merge branch 'master' of master.kernel.org:/.../davem/net-2.6
net: Implement read-only protection and COW'ing of metrics.
inetpeer: Add metrics storage to inetpeer entries.
inetpeer: Mark metrics as "new" in fresh inetpeer entries.
Merge branch 'master' of master.kernel.org:/.../davem/net-2.6
net: Store ipv4/ipv6 COW'd metrics in inetpeer cache.
Merge branch 'master' of ssh://master.kernel.org/.../linville/wireless-next-2.6
net: Pre-COW metrics for TCP.
ipv4: Allocate fib metrics dynamically.
ipv4: Attach FIB info to dst_default_metrics when possible
ipv4: If fib metrics are default, no need to grab ref to FIB info.
Merge branch 'master' of git://git.kernel.org/.../kaber/nf-next-2.6
Merge branch 'master' of master.kernel.org:/.../davem/net-2.6
Merge branch 'batman-adv/next' of git://git.open-mesh.org/ecsv/linux-merge
ipv4: Remember FIB alias list head and table in lookup results.
ipv4: Consolidate all default route selection implementations.
ipv4: Remove fib_hash.
ipv4: Update some fib_hash centric interface names.
ipv4: Rename fib_hash_* locals in fib_semantics.c
Merge branch 'master' of git://git.kernel.org/.../kaber/nf-next-2.6
tcp: Increase the initial congestion window to 10.
ipv4: Fix fib_trie build in some configurations.
sch_choke: Need linux/vmalloc.h
Merge branch 'master' of git://git.kernel.org/.../linville/wireless-next-2.6
Merge branch 'master' of master.kernel.org:/.../davem/net-2.6
ipv4: Don't miss existing cached metrics in new routes.
inetpeer: Move ICMP rate limiting state into inet_peer entries.
tcp: Add reference to initial CWND ietf draft.
Merge branch 'master' of git://git.kernel.org/.../linville/wireless-next-2.6
net: Remove bogus barrier() in dst_allfrag().
net: Kill NETEVENT_PMTU_UPDATE.
Merge branch 'master' of master.kernel.org:/.../davem/net-2.6
Merge branch 'master' of git://git.kernel.org/.../kaber/nf-next-2.6
inetpeer: Abstract address representation further.
inetpeer: Add redirect and PMTU discovery cached info.
inet: Create a mechanism for upward inetpeer propagation into routes.
Merge branch 'master' of master.kernel.org:/.../jkirsher/net-next-2.6
Merge branch 'batman-adv/next' of git://git.open-mesh.org/ecsv/linux-merge
ipv4: Cache learned PMTU information in inetpeer.
ipv4: Cache learned redirect information in inetpeer.
Merge branch 'fec' of git://git.pengutronix.de/git/ukl/linux-2.6
Merge branch 'for-davem' of git://git.kernel.org/.../bwh/sfc-next-2.6
ipv4: Simplify output route creation call sequence.
ipv4: Move rcu_read_{lock,unlock}() into ip_route_output_slow().
ipv4: Consolidate ipv4 dst allocation logic.
net: Add initial_ref arg to dst_alloc().
ipv4: Avoid use of signed integers in fib_trie code.
ipv4: Mark fib_combine_itag()'s 'res' arg as const.
ipv4: Use const'ify fib_result deep in the route call chains.
ipv4: Add hash table of interface addresses.
ipv4: Implement __ip_dev_find using new interface address hash.
Merge branch 'master' of master.kernel.org:/.../davem/net-2.6
Merge branch 'fec' of git://git.pengutronix.de/git/ukl/linux-2.6
Merge branch 'for-davem' of git://git.kernel.org/.../bwh/sfc-next-2.6
Merge branch 'net/ax88796' of git://git.pengutronix.de/git/mkl/linux-2.6
xfrm: Mark flowi arg const in key extraction helpers.
xfrm: Mark flowi arg to ->get_tos() const.
xfrm: Mark flowi arg to ->fill_dst() const.
xfrm: Mark flowi arg to ->init_tempsel() const.
xfrm: Mark flowi arg to xfrm_type->reject() const.
xfrm: Mark token args to addr_match() const.
xfrm: Mark flowi arg to xfrm_selector_match() const.
xfrm: Mark flowi arg to security_xfrm_state_pol_flow_match() const.
xfrm: Mark flowi arg to xfrm_state_look_at() const.
xfrm: Mark flowi arg to xfrm_init_tempstate() const.
xfrm: Mark flowi arg to xfrm_state_find() const.
net: Mark flowi arg to flow_cache_uli_match() const.
xfrm: Kill strict arg to xfrm_bundle_ok().
xfrm: Mark flowi arg to xfrm_policy_{lookup_by_type,match}() const.
xfrm: Mark flowi arg to xfrm_expand_policies() const.
xfrm: Mark flowi arg to xfrm_tmpl_resolve{,_one}() const.
xfrm: Mark flowi arg to xfrm_bundle_create() const.
xfrm: Mark flowi arg to xfrm_dst_{alloc_copy,update_origin}() const.
xfrm: Mark flowi arg to xfrm_resolve_and_create_bundle() const.
net: Make flow cache paths use a const struct flowi.
Merge branch 'tipc-Feb23-2011' of git://git.kernel.org/.../paulg/net-next-2.6
xfrm: Pass km_event pointers around as const when possible.
xfrm: Const'ify tmpl and address arguments to ->init_temprop()
xfrm: Const'ify selector argument to xfrm_selector_match()
xfrm: Const'ify address arguments to ->dst_lookup()
xfrm: Const'ify address arguments to __xfrm_dst_lookup()
xfrm: Const'ify address arguments to xfrm_addr_cmp()
xfrm: Const'ify address argument to xfrm_addr_any()
xfrm: Const'ify pointer args to migrate_tmpl_match and xfrm_migrate_check
xfrm: Const'ify pointer args to km_migrate() and implementations.
xfrm: Const'ify address args to hash helpers.
xfrm: Const'ify selector args in xfrm_migrate paths.
xfrm: Const'ify local xfrm_address_t pointers in xfrm_policy_lookup_bytype.
xfrm: Const'ify policy arg and local selector in xfrm_policy_match.
xfrm: Const'ify policy arg to xp_net.
xfrm: Const'ify policy arg to clone_policy.
xfrm: Const'ify selector arg to xfrm_dst_update_parent.
xfrm: Const'ify xfrm_tmpl and xfrm_state args to xfrm_state_addr_cmp.
xfrm: Const'ify ptr args to xfrm_state_*_check and xfrm_state_kern.
xfrm: Const'ify ptr args to xfrm_state_ok.
xfrm: Const'ify ptr args to xfrm_policy_ok.
xfrm: Const'ify sec_path arg to secpath_has_nontransport.
xfrm: Const'ify xfrm_address_t args to xfrm_*_hash.
xfrm: Const'ify xfrm_tmpl arg to xfrm_init_tempstate.
xfrm: Const'ify xfrm_address_t args to __xfrm_state_lookup{,_byaddr}.
xfrm: Remove unused 'saddr' and 'daddr' args to xfrm_state_look_at.
xfrm: Const'ify xfrm_address_t args to xfrm_state_find.
ipv4: Rearrange how ip_route_newports() gets port keys.
Merge branch 'master' of master.kernel.org:/.../jkirsher/net-next-2.6
Merge branch 'for-davem' of git://git.kernel.org/.../linville/wireless-next-2.6
sch_netem: Need to include vmalloc.h
rtlwifi: Need to include vmalloc.h
phonet: Protect pipe_do_remove() with appropriate ifdefs.
pfkey: Use const where possible.
xfrm: Pass name as const to xfrm_*_get_byname().
xfrm: Pass const arg to xfrm_alg_len and xfrm_alg_auth_len.
xfrm: Pass const xfrm_address_t objects to xfrm_state_lookup* and xfrm_find_acq.
xfrm: Pass const xfrm_mark to xfrm_mark_put().
net: Forgot to commit net/core/dev.c part of Jiri's ->rx_handler patch.
Merge branch 'for-davem' of git://git.kernel.org/.../bwh/sfc-next-2.6
ipv6: Consolidate route lookup sequences.
ipv4: Can final ip_route_connect() arg to boolean "can_sleep".
ipv4: Make final arg to ip_route_output_flow to be boolean "can_sleep"
net: Add FLOWI_FLAG_CAN_SLEEP.
ipv4: Kill can_sleep arg to ip_route_output_flow()
ipv6: Change final dst lookup arg name to "can_sleep"
xfrm: Kill XFRM_LOOKUP_WAIT flag.
ipv6: Normalize arguments to ip6_dst_blackhole().
xfrm: Handle blackhole route creation via afinfo.
ipv4: Make icmp route lookup code a bit clearer.
ipv6: Make icmp route lookup code a bit clearer.
Merge branch 'master' of git://git.kernel.org/.../kaber/nf-next-2.6
xfrm: Return dst directly from xfrm_lookup()
ipv4: Make output route lookup return rtable directly.
ipv4: ip_route_output_key() is better as an inline.
ipv4: Fix crash in dst_release when udp_sendmsg route lookup fails.
ipv4: Fix __ip_dev_find() to use ifa_local instead of ifa_address.
Merge branch 'master' of master.kernel.org:/.../jkirsher/net-next-2.6
ipv6: Use ERR_CAST in addrconf_dst_alloc.
Merge branch 'master' of master.kernel.org:/.../davem/net-2.6
Merge branch 'for-davem' of ssh://master.kernel.org/.../linville/wireless-next-2.6
ipv4: Optimize flow initialization in output route lookup.
ipv4: Get peer more cheaply in rt_init_metrics().
ipv4: Use passed-in protocol in ip_route_newports().
ipv4: Set rt->rt_iif more sanely on output routes.
ipv4: Remove flowi from struct rtable.
Merge branch 'batman-adv/next' of git://git.open-mesh.org/ecsv/linux-merge
ipv4: Validate route entry type at insert instead of every lookup.
ipv4: Inline fib_semantic_match into check_leaf
Merge branch 'davem-next.r8169' of git://git.kernel.org/.../romieu/netdev-2.6
ipv4: Cache source address in nexthop entries.
ipv4: Fix scope value used in route src-address caching.
Merge branch 'master' of master.kernel.org:/.../jkirsher/net-next-2.6
Merge branch 'for-davem' of git://git.kernel.org/.../bwh/sfc-next-2.6
inetpeer: Don't disable BH for initial fast RCU lookup.
ipv4: Lookup multicast routes by rtable using helper.
ipv4: Optimize flow initialization in input route lookup.
ipv4: Optimize flow initialization in fib_validate_source().
Merge branch 'master' of master.kernel.org:/.../davem/net-2.6
ipv4: Remove redundant RCU locking in ip_check_mc().
ipv4: Remove unnecessary test from ip_mkroute_input()
ipv4: Kill flowi arg to fib_select_multipath()
Merge branch 'for-davem' of git://git.kernel.org/.../linville/wireless-next-2.6
Merge branch 'master' of master.kernel.org:/.../jkirsher/net-next-2.6
ipv4: Create and use route lookup helpers.
net: Remove unnecessary padding in struct flowi
xfrm: Eliminate "fl" and "pol" args to xfrm_bundle_ok().
net: Put flowi_* prefix on AF independent members of struct flowi
net: Create struct flowi_common
net: Create union flowi_uli
net: Make flowi ports AF dependent.
net: Break struct flowi out into AF specific instances.
net: Add flowiX_to_flowi() shorthands.
ipv4: Pass ipv4 flow objects into fib_lookup() paths.
ipv4: Use struct flowi4 internally in routing lookups.
ipv4: Use flowi4 in public route lookup interfaces.
ipv4: Use flowi4 in FIB layer.
ipv4: Use flowi4 in ipmr code.
netfilter: Use flowi4 in nf_nat_standalone.c
ipv4: Use flowi4 in UDP
netfilter: Use flowi4 and flowi6 in nf_conntrack_h323_main
netfilter: Use flowi4 and flowi6 in xt_TCPMSS
net: Add flowi6_* member helper macros.
net: Use flowi4 and flowi6 in xfrm layer.
ipv4: Kill fib_semantic_match declaration from fib_lookup.h
net: Put fl4_* macros to struct flowi4 and use them again.
ipv6: Convert to use flowi6 where applicable.
net: Put fl6_* macros to struct flowi6 and use them again.
decnet: Convert to use flowidn where applicable.
Merge branch 'tipc-Mar13-2011' of git://git.kernel.org/.../paulg/net-next-2.6
Merge branch 'tipc-Mar14-2011' of git://git.kernel.org/.../paulg/net-next-2.6
Merge branch 'master' of git://git.kernel.org/.../kaber/nf-next-2.6
Merge branch 'for-davem' of git://git.kernel.org/.../linville/wireless-next-2.6
Merge branch 'master' of master.kernel.org:/.../jkirsher/net-next-2.6
Merge branch 'irq/numa' of git://git.kernel.org/.../tip/linux-2.6-tip
Merge branch 'master' of master.kernel.org:/.../davem/net-2.6
Merge branch 'master' of git://git.kernel.org/.../linville/wireless-2.6
Merge branch 'stable/backends' of git://git.kernel.org/.../konrad/xen
Merge branch 'master' of git://git.kernel.org/.../kaber/nf-next-2.6
Denis Kirjanov (1):
sungem: Use net_device's internal stats
Dimitris Michailidis (1):
cxgb{3,4}*: improve Kconfig dependencies
Domenico Andreoli (2):
CS89x0: Finish transition to CS89x0_NONISA_IRQ
CS89x0: Add networking support for QQ2440
Don Skidmore (7):
ixgbe: fix namespace issue with ixgbe_dcb_txq_to_tc
ixgbe: cleanup namespace complaint by removing little used function
ixgbe: cleanup ixgbe_init_mbx_params_pf namespace issue
ixgbe: cleanup X540 PHY reset function pointer
ixgbe: add function pointer for semaphore function
ixgbe: cleanup copyright string for 2011
ixgbe: fix missing function pointer conversion
Eliad Peller (14):
wl12xx: remove redundant debugfs_remove_recursive() call
wl12xx: fix some sparse warnings
wl12xx: don't join upon disassociation
wl12xx: fix some endianess bugs
wl12xx: wrong values are returned in gpio_power_write()
wl12xx: disable auto-arp
wl12xx: mcp2.5 - add config_ps acx
wl12xx: move to new firmware (6.1.3.50.49)
wl12xx: use the conf struct instead of macros for memory configuration
wl12xx: set supported_rates after association
wl12xx: fix identification of beacon packets (debug)
wl12xx: declare support for IEEE80211_HW_REPORTS_TX_ACK_STATUS
wl12xx: use standard ALIGN() macro
wl12xx: always set mac_address when configuring ht caps
Emil Tantilov (28):
ixgbe: cleanup wake on LAN defines
ixgbe: cleanup logic related to HW semaphores
ixgbe: set media type for 82599 T3 LOM
ixgbe: Add ability to double reset on failure to clear master enable
ixgbe: cleanup code in ixgbe_identify_sfp_module_generic
ixgbe: Check link wants report current link state
ixgbe: add polling test to end of PHY reset
ixgbe: Fill out PCIe speed and width enums with values
ixgbe: Bounds checking for set_rar, clear_rar, set_vmdq, clear_vmdq
ixgbe: rework ixgbe MTA handling to not drop packets
ixgbe: Drop unused code for setting up unicast addresses
ixgbe: Specific check for 100 Full link speed
ixgbe: Numerous whitespace / formatting cleanups
ixgbe: store permanent address before initializing Rx addresses
ixgbe: cleanup handling of I2C interface to PHY
e1000e: fix build issue due to undefined reference to crc32_le
ixgbe: cleanup PHY init
ixgbe: clear correct counters for flow control on 82599
ixgbe: Add x540 statistic counter definitions
ixgbe: Enable flow control pause parameter auto-negotiation support
ixgbe: add function description
ixgbe: improve logic in ixgbe_init_mbx_params_pf
ixgbe: fix spelling errors
ixgbe: fix setting and reporting of advertised speeds
ixgb: convert to new VLAN model
ixgbe: remove timer reset to 0 on timeout
ixgbe: update PHY code to support 100Mbps as well as 1G/10G
ixgbe: correct typo in define name
Eric Dumazet (38):
netfilter: add __rcu annotations
netfilter: nf_ct_frag6_sysctl_table is static
netfilter: add __rcu annotations
netfilter: nf_nat_amanda: rename a variable
netfilter: rcu sparse cleanups
ipvs: add static and read_mostly attributes
ipvs: remove shadow rt variable
netfilter: nf_conntrack: one less atomic op in nf_ct_expect_insert()
netfilter: x_table: speedup compat operations
netfilter: ipt_CLUSTERIP: remove "no conntrack!"
net: filter: dont block softirqs in sk_run_filter()
net_sched: cleanups
netfilter: add a missing include in nf_conntrack_reasm.c
net: dev_close_many() is static
net_sched: sfq: allow divisor to be a parameter
net_sched: move TCQ_F_THROTTLED flag
net_sched: RCU conversion of stab
net: ipv6: sit: fix rcu annotations
neigh: __rcu annotations
ipv6: raw: rcu annotations
net: netif_setup_tc() is static
net_sched: TCQ_F_CAN_BYPASS generalization
pktgen: speedup fragmented skbs
net_sched: sch_mqprio: dont leak kernel memory
net: fix dev_seq_next()
drivers/net: remove some rcu sparse warnings
ipv4: fix rcu lock imbalance in fib_select_default()
net: add __rcu annotations to sk_wq and wq
net_sched: SFB flow scheduler
sch_choke: add choke_skb_cb
net_sched: reduce fifo qdisc size
benet: use GFP_KERNEL allocations when possible
inetpeer: seqlock optimization
inetpeer: should use call_rcu() variant
ftmac100: use GFP_ATOMIC allocations where needed
xen: netfront: fix xennet_get_ethtool_stats()
xfrm: fix __xfrm_route_forward()
e1000e: fix kconfig for crc32 dependency
Felix Fietkau (33):
ath9k: fix bogus sequence number increases on aggregation tid flush
ath9k: fix initial sequence number after starting an ampdu session
ath9k: reinitialize block ack window data when starting aggregation
ath9k: reduce the likelihood of baseband hang check false positives
ath9k_hw: partially revert "fix dma descriptor rx error bit parsing"
ath9k: try more than one tid when scheduling a new aggregate
ath9k: fix excessive BAR sending when a frame exceeds its retry limit
mac80211: drop non-auth 3-addr data frames when running as a 4-addr station
ath9k: remove a bogus error message
ath9k_hw: replace magic values in register writes with proper defines
ath9k: fix misplaced debug code
ath9k: clean up the code that wakes the mac80211 queues
ath9k: remove the virtual wiphy debugfs interface
ath9k: remove support for virtual wiphys
ath9k: remove the bf->aphy field
ath9k: fold struct ath_wiphy into struct ath_softc
ath9k: fix tx queue index confusion in debugfs code
ath9k: use split rx buffers to get rid of order-1 skb allocations
ath9k: fix compile error in non-debug ath_debug_stat_tx() stub
mac80211: do not send duplicate data frames to the cooked monitor interface
ath9k: add additional checks for the baseband hang detection
mac80211: as a 4-addr station, do not receive packets for other stations
p54: fix a NULL pointer dereference bug
ath9k: use generic mac80211 LED blinking code
cfg80211: add a field for the bitrate of the last rx data packet from a station
mac80211: add support for showing the last rx bitrate
ath9k: remove support for the FIF_PROMISC_IN_BSS filter flag
ath9k_hw: fix REG_SET_BIT and REG_CLR_BIT for multiple bits
ath9k: fix stopping tx dma on reset
ath9k: fix the .flush driver op implementation
ath9k: improve reliability of beacon transmission and stuck beacon handling
mac80211: fix channel type recalculation with HT and non-HT interfaces
ath9k: fix aggregation related interoperability issues
Florian Fainelli (1):
r6040: bump to version 0.27 and date 23Feb2011
Florian Westphal (10):
netfilter: ebt_ip6: allow matching on ipv6-icmp types/codes
netfilter: Kconfig: NFQUEUE is useless without NETFILTER_NETLINK_QUEUE
netfilter: nfnetlink_queue: return error number to caller
netfilter: nfnetlink_queue: do not free skb on error
netfilter: reduce NF_VERDICT_MASK to 0xff
netfilter: allow NFQUEUE bypass if no listener is available
netfilter: do not omit re-route check on NF_QUEUE verdict
netfilter: nfnetlink_log: remove unused parameter
netfilter: ipt_addrtype: rename to xt_addrtype
netfilter: xt_addrtype: ipv6 support
Francois Romieu (1):
r8169: convert to new VLAN model.
Frank Blaschka (1):
qeth: change some configurations defaults
Fry, Donald H (2):
iwlagn: Support new 1000 microcode.
iwlagn: report correct temperature for WiFi/BT devices.
Frédéric Leroy (1):
netfilter: xt_CLASSIFY: add ARP support, allow CLASSIFY target on any table
Gabor Juhos (1):
rt2x00: fix whitespace damage in the rt2800 specific code
George (9):
rtlwifi: Add usb driver
rtlwifi: Add headers for rtl8187cu
rtlwifi: rtl8192cu: Add routines dm, fw, led and sw
rtlwifi: rtl8192cu: Add routine hw
rtlwifi: rtl8192cu: Add routine mac
rtlwifi: rtl8192cu: Add routine phy
rtlwifi: rtl8192cu: Add routine rf
rtlwifi: rtl8192cu: Add routine table
rtlwifi: rtl8192cu: Add routine trx
Gertjan van Wingerde (7):
rt2x00: Fix WPA TKIP Michael MIC failures.
rt2x00: Copy the MAC address to the WCID entry properly.
rt2x00: Fix FIXME comments in rt61pci and rt73usb on Michael MIC.
rt2x00: Don't treat ATIM queue as second beacon queue.
rt2x00: Include ATIM queue support in rt2x00queue_get_tx_queue.
rt2x00: Optimize getting the beacon queue structure.
rt2x00: Remove unused rt2x00queue_get_queue function.
Gery Kahn (1):
wl12xx: update PLT initialization for new firmware
Grazvydas Ignotas (2):
wl1251: remove wl1251_ps_set_elp function
wl1251: fix elp_work race condition
Greg Rose (7):
ixgbe: Enable Jumbo Frames on the X540 10Gigabit Controller
ixgbevf: Enable jumbo frame support for X540 VF
ixgbevf: Fix name of function in function header comment
ixgbevf: Fix Compiler Warnings
ixgbe: X540 Cleanup
ixgbevf: Fix Version String
ixgbevf: Fix Driver String
Guo-Fu Tseng (9):
jme: Extract main and sub chip revision
jme: PHY Power control for new chip
jme: Fix bit typo of JMC250A2 workaround
jme: Rename phyfifo function for easier understand
jme: Fix hardware action of full-duplex
jme: Safer MAC processor reset sequence
jme: Refill receive unicase MAC addr after resume
jme: Don't show UDP Checksum error if HW misjudged
jme: Advance driver version
Gustavo F. Padovan (29):
Merge branch 'master' of git://git.kernel.org/.../padovan/bluetooth-2.6 into wireless
Bluetooth: Fix setting of MTU for ERTM and Streaming Mode
Bluetooth: Rename l2cap.c to l2cap_core.c
Bluetooth: Initial work for L2CAP split.
Bluetooth: move l2cap_sock_ops to l2cap_sock.c
Bluetooth: move l2cap_sock_release() to l2cap_sock.c
Bluetooth: move l2cap_sock_bind()/listen() to l2cap_sock.c
Bluetooth: move l2cap_sock_accept() to l2cap_sock.c
Bluetooth: move l2cap_sock_getname() to l2cap_sock.c
Bluetooth: move l2cap_sock_setsockopt() to l2cap_sock.c
Bluetooth: move l2cap_sock_getsockopt() to l2cap_sock.c
Bluetooth: move l2cap_sock_connect() to l2cap_sock.c
Bluetooth: move l2cap_sock_recvmsg() to l2cap_sock.c
Bluetooth: move l2cap_sock_shutdown() to l2cap_sock.c
Bluetooth: move l2cap_sock_sendmsg() to l2cap_sock.c
Bluetooth: move L2CAP sock timers function to l2cap_sock.c
Bluetooth: move l2cap_sock_kill() to l2cap_sock.c
Bluetooth: move __l2cap_sock_close() to l2cap_sock.c
Bluetooth: update Bluetooth daemon name in Kconfig help
Bluetooth: Merge L2CAP and SCO modules into bluetooth.ko
Bluetooth: remove l2cap_load() hack
Bluetooth: Add L2CAP mode to debugfs output
Bluetooth: Use usb_fill_int_urb()
Bluetooth: Fix crash when ioctl(HCIUARTSETPROTO) fails
Bluetooth: fix errors reported by checkpatch.pl
Bluetooth: Fix errors reported by checkpatch.pl
Bluetooth: fix checkpatch errors in af_bluetooth.c
Bluetooth: Remove duplicated BT_INFO() from L2CAP
Bluetooth: Fix BT_L2CAP and BT_SCO in Kconfig
Guy Eilam (1):
wl12xx: change debug_level module param sysfs permissions
Hagen Paul Pfeifer (10):
dccp: newdp is declared/assigned but never be used
ipv6: totlen is declared and assigned but not used
ipv6: hash is calculated but not used afterwards
ipv6: variable next is never used in this function
ipv6: ignore rtnl_unicast() return code
sched: protocol only needed when CONFIG_NET_CLS_ACT is enabled
mcast: net_device dev not used
af_packet: struct socket declared/assigned but unused
sctp: several declared/set but unused fixes
af_unix: remove unused struct sockaddr_un cruft
Hans Schillstrom (31):
IPVS: Backup, Prepare for transferring firewall marks (fwmark) to the backup daemon.
IPVS: Split ports[2] into src_port and dst_port
IPVS: skb defrag in L7 helpers
IPVS: Handle Scheduling errors.
IPVS: Backup, Adding structs for new sync format
IPVS: Backup, Adding Version 1 receive capability
IPVS: Backup, Change sending to Version 1 format
IPVS: Backup, adding version 0 sending capabilities
IPVS: netns, add basic init per netns.
IPVS: netns to services part 1
IPVS: netns awarness to lblcr sheduler
IPVS: netns awarness to lblc sheduler
IPVS: netns, prepare protocol
IPVS: netns preparation for proto_tcp
IPVS: netns preparation for proto_udp
IPVS: netns preparation for proto_sctp
IPVS: netns preparation for proto_ah_esp
IPVS: netns, use ip_vs_proto_data as param.
IPVS: netns, common protocol changes and use of appcnt.
IPVS: netns awareness to ip_vs_app
IPVS: netns awareness to ip_vs_est
IPVS: netns awareness to ip_vs_sync
IPVS: netns, ip_vs_stats and its procfs
IPVS: netns, connection hash got net as param.
IPVS: netns, ip_vs_ctl local vars moved to ipvs struct.
IPVS: netns, defense work timer.
IPVS: netns, trash handling
IPVS: netns, svc counters moved in ip_vs_ctl,c
IPVS: netns, misc init_net removal in core.
IPVS: netns, final patch enabling network name space.
IPVS netns BUG, register sysctl for root ns
Hayes Wang (2):
r8169: adjust rtl8169_set_speed_xmii function.
r8169: support the new chips for RTL8105E.
Helmut Schaa (34):
rt2x00: Refactor beacon code to make use of start- and stop_queue
rt2x00: Introduce beacon_update_locked that requires caller locking
rt2x00: Limit beacon updates in bss_info_changed to USB devices
rt2x00: Make periodic beacon updates for PCI devices atomic
rt2x00: Introduce tasklets for interrupt handling
rt2x00: Disable txstatus tasklet by default
rt2x00: Convert rt2800pci to use tasklets
rt2x00: Convert rt61pci to use tasklets
rt2x00: Convert rt2500pci interrupt handling to use tasklets
rt2x00: Convert rt2400pci interrupt handling to use tasklets
rt2x00: Remove interrupt thread registration
rt2x00: Remove STATE_RADIO_IRQ_OFF_ISR and STATE_RADIO_IRQ_ON_ISR
rt2x00: Update MAINTAINERS
mac80211: Remove superfluous if clause
rt2x00: Minor optimization for devices with RTS/CTS offload
Revert "rt2x00 : avoid timestamp for monitor injected frame."
rt2x00: Remove superfluos empty line
wl12xx: Correctly set up protection if non-GF STAs are present
rt2x00: Optimize calls to rt2x00queue_get_queue
rt2x00: Make use of unlikely during tx status processing
rt2x00: Remove useless NULL check
rt2x00: Add unlikely macro to special case tx status handling
rt2x00: Use unlikely for unexpected error condition in rt2x00_mac_tx
rt2x00: Generate sw sequence numbers only for devices that need it
rt2x00: Optimize TX descriptor handling
rt2x00: Move TX descriptor field "ifs" into plcp substruct
rt2x00: Don't call ieee80211_get_tx_rate for MCS rates
rt2x00: Use an enum instead of u16 for the rate_mode TX descriptor field
rt2x00: Fix rt2800 key assignment in multi bssid setups
rt2x00: Remove now unused crypto.aid field
rt2x00: Revise irqmask locking for PCI devices
rt2x00: Fix comment in rt2800pci
mac80211: Remove redundant preamble and RTS flag setup in minstrel_ht
mac80211: Shortcut minstrel_ht rate setup for non-MRR capable devices
Henry Ptasinski (1):
wireless-next-2.6: brcm80211: fix compile issue
Herbert Xu (6):
inet: Remove unused sk_sndmsg_* from UFO
inet: Remove explicit write references to sk/inet in ip_append_data
inet: Add ip_make_skb and ip_finish_skb
udp: Switch to ip_finish_skb
udp: Add lockless transmit path
inet: Replace left-over references to inet->cork
Hiroaki SHIMODA (1):
ipv4: Fix PMTU update.
Ian Campbell (3):
xen/irq: implement bind_interdomain_evtchn_to_irqhandler for backend drivers
xen: netfront: ethtool stats fields should be unsigned long
xen network backend driver
Ido Yariv (9):
wl12xx: Don't rely on runtime PM for toggling power
wl12xx: Remove private headers in wl1271_tx_reset
wl12xx: Reorder data handling in irq_work
wl12xx: Do end-of-transactions transfers only if needed
wl12xx: Change claiming of the SDIO bus
wl12xx: Switch to a threaded interrupt handler
wl12xx: Switch to level trigger interrupts
wl12xx: Avoid redundant TX work
wl12xx: Modify requested number of memory blocks
Ilpo Järvinen (1):
tcp: document tcp_max_ssthresh (Limited Slow-Start)
Ivan Vecera (2):
bna: use device model DMA API
be2net: use device model DMA API
Ivo van Doorn (3):
rt2x00: Kill all tasklets during device removal
rt2x00: Move TX/RX work into dedicated workqueue
rt2x00: Optimize TX descriptor memory layout
Jan Beulich (1):
small adjustment to net/mac80211/Kconfig
Jan Engelhardt (13):
netfilter: xt_LOG: do print MAC header on FORWARD
netfilter: xtables: use guarded types
netfilter: xt_comment: drop unneeded unsigned qualifier
netfilter: xtables: add missing aliases for autoloading via iptables
audit: export symbol for use with xt_AUDIT
netfilter: xtables: use __uXX guarded types for userspace exports
netfilter: xtables: add missing header files to export list
netfilter: xtables: connlimit revision 1
netfilter: xtables: remove extraneous header that slipped in
netfilter: xtables: remove duplicate member
netfilter: xtables: add missing header inclusions for headers_check
netfilter: xt_connlimit: pick right dstaddr in NAT scenario
netfilter: xt_conntrack: warn about use in raw table
Jason Young (1):
mac80211: do not enable ps if 802.1x controlled port is unblocked
Jay Sternberg (1):
iwlwifi: correct debugfs data dumped from sram
Jeff Kirsher (1):
e1000e: convert to stats64
Jeongtae Park (1):
smsc911x: Fix build error when SMSC_TRACE() used
Jesper Juhl (3):
Bluetooth: Fix failure to release lock in read_index_list()
batman-adv: Remove two duplicate includes.
IPVS: Fix variable assignment in ip_vs_notrack
Jiri Olsa (1):
netfilter: nf_conntrack: nf_conntrack snmp helper
Jiri Pirko (15):
veth: remove unneeded ifname code from veth_newlink()
bonding: fix return value of couple of store functions
net: remove the unnecessary dance around skb_bond_should_drop
net: make dev->master general
rtnetlink: implement setting of master device
bond: implement [add/del]_slave ops
bridge: implement [add/del]_slave ops
net: convert bonding to use rx_handler
net: allow handlers to be processed for orig_dev
fcoe: correct checking for bonding
bonding: register slave pointer for rx_handler
net: get rid of multiple bond-related netdevice->priv_flags
bonding: wrap slave state work
bonding: get rid of IFF_SLAVE_INACTIVE netdev->priv_flag
net: introduce rx_handler results and logic around that
Jiri Slaby (2):
NET: cdc-phonet, fix stop-queue handling
NET: cdc-phonet, handle empty phonet header
Joe Gunn (1):
orinoco: Drop scan results with unknown channels
Joe Perches (7):
tun: Convert logging messages to pr_<level> and tun_debug
tlan: Remove changelog
tlan: Use pr_fmt, pr_<level> and netdev_<level>
mv643xx_eth: Use netdev_<level> and pr_<level>
mii: Convert printks to netdev_info
eql: Convert printks to pr_<level> and netdev_<level>
netdevice: Convert printk to pr_info in netif_tx_stop_queue
Joel A Fernandes (1):
mac80211: Rewrote code for checking if destinations are proxied.
Johan Hedberg (33):
Bluetooth: Implement automatic setup procedure for local adapters
Bluetooth: Add support for management powered event
Bluetooth: Add support for set_powered management command
Bluetooth: Add support for set_discoverable management command
Bluetooth: Add set_connectable management command
Bluetooth: Unify mode related management messages to a single struct
Bluetooth: Add flag to track managment controlled adapters
Bluetooth: Add send_mode_rsp convenience function for mgmt.c
Bluetooth: Implement set_pairable managment command
Bluetooth: Implement UUID handling through the management interface
Bluetooth: Implement debugfs support for listing UUIDs
Bluetooth: Reject pairing requests when in non-pairable mode
Bluetooth: Add special handling with __hci_request and HCI_INIT
Bluetooth: Add controller side link key clearing to hci_init_req
Bluetooth: Remove page timeout setting from HCI init sequence
Bluetooth: Implement a more complete adapter initialization sequence
Bluetooth: Add class of device control to the management interface
Bluetooth: Implement link key handling for the management interface
Bluetooth: Add connected/disconnected management events
Bluetooth: Add disconnect managment command
Bluetooth: Add support for connect failed management event
Bluetooth: Add get_connections managment interface command
Bluetooth: Create common cmd_complete function for mgmt.c
Bluetooth: Add support for PIN code handling in the management interface
Bluetooth: Add set_io_capability management command
Bluetooth: Make pending_add return a pointer to the added entry
Bluetooth: Add mgmt_pair_device command
Bluetooth: Add management support for user confirmation request
Bluetooth: Fix mgmt_pin_code_reply command status opcode
Bluetooth: Fix mgmt_pin_code_reply return parameters
Bluetooth: Add mgmt_auth_failed event
Bluetooth: Fix inititial value for remote authentication requirements
Bluetooth: Fix unnecessary list traversal in mgmt_pending_remove
Johannes Berg (30):
mac80211: don't return beacons when mesh is disabled
mac80211: track receiver's aggregation reorder buffer size
mac80211: allow advertising correct maximum aggregate size
iwlagn: make iwl_rx_handle static
iwlagn: add support for waiting for notifications
iwlagn: properly wait for PAN disable
iwlagn: return error if PAN disable timeout
iwlwifi: fix 4965 notification wait setup
iwlwifi: implement remain-on-channel
iwlwifi: replace minimum slot time constant
mac80211: use DECLARE_EVENT_CLASS
mac80211: add MCS information to radiotap
iwlwifi: support RSN IBSS
iwlwifi: advertise max aggregate size
iwlwifi: use maximum aggregation size
iwlwifi: fix beacon notification parsing
mac80211: allow GO to scan like AP
iwlwifi: remove unnecessary locking
mac80211: reply to directed probes in IBSS
mac80211: fix 2.4 GHz 40 MHz disabling
mac80211: rename RX_FLAG_TSFT
rtl8192c: fix compilation errors
mac80211: make tx() operation return void
mac80211: remove IBSS merge delay
mac80211: copy peer MCS TX parameters
iwlagn: fix iwlagn_check_needed_chains
mac80211: support direct offchannel TX offload
mac80211: make rate control Kconfig warning depend on mac80211
mac80211: fix scan race, simplify code
iwlagn: support off-channel TX
Johannes Stezenbach (1):
rt2x00: trivial: add \n to WARNING message
John Fastabend (20):
net: implement mechanism for HW based QOS
net_sched: implement a root container qdisc sch_mqprio
ixgbe: DCB, only reprogram HW if the FCoE priority is changed
ixgbe: DCB, remove round robin mode on 82598 devices
ixgbe: DCB, abstract out dcb_config from DCB hardware configuration
ixgbe: DCB, implement 802.1Qaz routines
ixgbe: DCB, do not reset on CEE pg changes
ixgbe: DCB, remove RESET bit it is no longer needed
ixgbe: DCB, use hardware independent routines
ixgbe: DCB, implement capabilities flags
ixgbe: DCB, implement ieee_setapp dcbnl ops
ixgbe: DCB remove ixgbe_fcoe_getapp routine
ixgbe: DCB, use multiple Tx rings per traffic class
ixgbe: enable ndo_tc_setup
ixgbe: DCB: enable RSS to be used with DCB
ixgbe: DCB, missed translation from 8021Qaz TSA to CEE link strict
ixgbe: IEEE 802.1Qaz, implement priority assignment table
ixgbe: DCB during ifup use correct CEE or IEEE mode
ixgbe: DCB, set minimum bandwidth per traffic class
ixgbe: DCB, PFC not cleared until reset occurs
John W. Linville (26):
Merge branch 'wireless-next-2.6' of git://git.kernel.org/.../iwlwifi/iwlwifi-2.6
Merge branch 'for-linville' of git://git.kernel.org/.../luca/wl12xx
Merge branch 'master' of git://git.kernel.org/.../linville/wireless-2.6
Merge branch 'master' of git://git.kernel.org/.../linville/wireless-2.6
Merge branch 'master' of git://git.kernel.org/.../linville/wireless-2.6
Merge branch 'wireless-next-2.6' of git://git.kernel.org/.../iwlwifi/iwlwifi-2.6
Merge branch 'for-linville' of git://git.kernel.org/.../luca/wl12xx
Merge branch 'master' of git://git.kernel.org/.../padovan/bluetooth-next-2.6
Merge ssh://master.kernel.org/.../linville/wireless-2.6
Merge branch 'master' of git://git.kernel.org/.../linville/wireless-next-2.6 into for-davem
Merge branch 'wireless-next-2.6' of git://git.kernel.org/.../iwlwifi/iwlwifi-2.6
Merge branch 'for-linville' of git://git.kernel.org/.../luca/wl12xx
iwlegacy: change some symbols duplicated from iwlwifi directory
at76c50x-usb: fix warning caused by at76_mac80211_tx now returning void
Merge branch 'wireless-next-2.6' of git://git.kernel.org/.../iwlwifi/iwlwifi-2.6
Merge branch 'master' of git://git.kernel.org/.../padovan/bluetooth-next-2.6
Merge branch 'for-linville' of git://git.kernel.org/.../luca/wl12xx
Merge branch 'wireless-next-2.6' of git://git.kernel.org/.../iwlwifi/iwlwifi-2.6
rtlwifi: usb parts should depend on CONFIG_USB
Merge branch 'master' of git://git.kernel.org/.../linville/wireless-next-2.6 into for-davem
ath5k: restrict AR5K_TX_QUEUE_ID_DATA_MAX to reflect the [0,3] range
Merge branch 'master' of git://git.kernel.org/.../linville/wireless-next-2.6 into for-davem
wireless: add support for ethtool_ops->{get,set}_ringparam
mac80211: implement support for cfg80211_ops->{get,set}_ringparam
ath5k: implement ieee80211_ops->{get,set}_ringparam
Merge branch 'master' of git://git.kernel.org/.../linville/wireless-next-2.6 into for-davem
Jon Mason (4):
vxge: cleanup probe error paths
vxge: correct eprom version detection
vxge: MSIX one shot mode
vxge: update driver version
Jouni Malinen (3):
mac80211: Remove obsolete TKIP flexibility
mac80211: Add testing functionality for TKIP
ath: Fix clearing of secondary key cache entry for TKIP
Jozsef Kadlecsik (14):
netfilter: NFNL_SUBSYS_IPSET id and NLA_PUT_NET* macros
netfilter: ipset: IP set core support
netfilter: ipset: bitmap:ip set type support
netfilter: ipset: bitmap:ip,mac type support
netfilter: ipset; bitmap:port set type support
netfilter: ipset: hash:ip set type support
netfilter: ipset: hash:ip,port set type support
netfilter: ipset: hash:ip,port,ip set type support
netfilter: ipset: hash:ip,port,net set type support
netfilter: ipset: hash:net set type support
netfilter: ipset: hash:net,port set type support
netfilter: ipset: list:set set type support
netfilter: xtables: "set" match and "SET" target support
netfilter: ipset: send error message manually
Julia Lawall (1):
net/wireless/nl80211.c: Avoid call to genlmsg_cancel
Julian Anastasov (9):
ipvs: remove extra lookups for ICMP packets
ipvs: avoid lookup for fwmark 0
ipvs: remove _bh from percpu stats reading
ipvs: move struct netns_ipvs
ipvs: reorganize tot_stats
ipvs: properly zero stats and rates
ipvs: remove unused seqcount stats
ipvs: optimize rates reading
ipvs: rename estimator functions
Jussi Kivilinna (25):
zd1211rw: use urb anchors for tx and fix tx-queue disabling
zd1211rw: cancel process_intr work on zd_chip_disable_int()
zd1211rw: add locking for mac->process_intr
zd1211rw: fix beacon interval setup
zd1211rw: move set_multicast_hash and set_rx_filter from workers to configure_filter
zd1211rw: move set_rts_cts_work to bss_info_changed
zd1211rw: support setting BSSID for AP mode
zd1211rw: fix ack_pending in filter_ack causing tx-packet ordering problem on monitor
zd1211rw: let zd_set_beacon_interval() set dtim_period and add AP-beacon flag
zd1211rw: implement beacon fetching and handling ieee80211_get_buffered_bc()
zd1211rw: add beacon watchdog and setting HW beacon more failsafe
zd1211rw: batch beacon config commands together
zd1211rw: use stack and preallocated memory for small cmd-buffers
zd1211rw: change interrupt URB buffer to DMA buffer
zd1211rw: lower hw command timeouts
zd1211rw: collect driver settings and add function to restore theim
zd1211rw: add TX watchdog and device resetting
zd1211rw: reset device when CR_BCN_FIFO_SEMAPHORE freezes in beacon setup
zd1211rw: reset rx urbs after idle period of 30 seconds
zd1211rw: enable NL80211_IFTYPE_AP
zd1211rw: add useful debug output
zd1211rw: correct use of usb_bulk_msg on interrupt endpoints
zd1211rw: use async urb for write command
zd1211rw: move async iowrite16v up to callers
zd1211rw: add unlikely to ZD_ASSERT
Justin P. Mattock (1):
drivers:net:ipw2100.c change a typo comamnd to command
Juuso Oikarinen (4):
wl12xx: Cleanup PLT mode when module is removed
wl12xx: Increase scan channel dwell time for passive scans
cfg80211: Allow non-zero indexes for device specific pair-wise ciphers
cfg80211: Fix power save state after interface type change
KOVACS Krisztian (1):
netfilter: fix compilation when conntrack is disabled but tproxy is enabled
Larry Finger (15):
rtlwifi: Modify core routines
rtlwifi: rtl8192ce: Refactor rtl8192ce/dm
rtlwifi: rtl8192ce: Refactor rtl8192ce/fw
rtlwifi: rtl8192ce: Rework rtl8192ce/phy.c
p54: Fix compile warning
rtlwifi: Make changes in rtlwifi/rtl8192ce/reg.h to support rtl8192cu
rtlwifi: Make changes in rtlwifi/rtl8192ce/def.h to support rtl8192cu
rtlwifi: Modify some rtl8192ce routines for merging rtl8192cu
rtlwifi: Modify wifi.h for rtl8192cu
rtlwifi: Move common parts of rtl8192ce/phy.c
rtlwifi: Modify build system for rtl8192cu
rtlwifi: rtl8192ce: Fix endian warnings
rtlwifi: Remove obsolete/unused macros
rtlwifi: rtl8192ce: rtl8192cu: Fix multiple def errors for allyesconfig build
rtl8187: Change rate-control feedback
Levi, Shahar (2):
wl12xx: BA initiator support
wl12xx: BA receiver support
Linus Lüssing (6):
batman-adv: Remove duplicate types.h inclusions
batman-adv: Disallow originator addressing within mesh layer
batman-adv: Make bat_priv->curr_gw an rcu protected pointer
batman-adv: Increase orig_node refcount before releasing rcu read lock
batman-adv: Fix possible buffer overflow in softif neigh list output
batman-adv: Remove unused hdr_size variable in route_unicast_packet()
Lior Levy (4):
igbvf: remove Tx hang detection
igb: add support for VF Transmit rate limit using iproute2
ixgbevf: remove Tx hang detection
ixgbe: add support for VF Transmit rate limit using iproute2
Luciano Coelho (7):
mac80211: add hw configuration for max ampdu buffer size
MAINTAINERS: update information for the wl12xx driver
wl12xx: don't modify the global supported band structures
wl12xx: lock the RCU when accessing sta via ieee80211_find_sta()
wl12xx: add hw configuration for max supported AMDPU size
wl12xx: fix warning due to missing arg in ampdu_action
wl12xx: fix MODULE_AUTHOR email address
Marc Kleine-Budde (9):
ax88796: fix codingstyle and checkpatch warnings
ax88796: don't use magic ei_status to acces private data
ax88796: remove memset of private data
ax88796: remove first_init parameter from ax_init_dev()
ax88796: use netdev_<LEVEL> instead of dev_<LEVEL> and pr_<LEVEL>
ax88796: remove platform_device member from struct ax_device
ax88796: make pointer to platform data const
ax88796: clean up probe and remove function
ax88796: use generic mdio_bitbang driver
Marek Lindner (22):
batman-adv: Split combined variable declarations
batman-adv: protect neighbor nodes with reference counters
batman-adv: convert neighbor list to hlist
batman-adv: protect neighbor list with rcu locks
batman-adv: free neighbors when an interface is deactivated
batman-adv: protect neigh_nodes used outside of rcu_locks with refcounting
batman-adv: protect each hash row with rcu locks
batman-adv: protect originator nodes with reference counters
batman-adv: protect ogm counter arrays with spinlock
batman-adv: Correct rcu refcounting for neigh_node
batman-adv: Correct rcu refcounting for gw_node
batman-adv: Correct rcu refcounting for softif_neigh
batman-adv: Correct rcu refcounting for batman_if
batman-adv: protect bit operations to count OGMs with spinlock
batman-adv: make broadcast seqno operations atomic
batman-adv: separate ethernet comparing calls from hash functions
batman-adv: remove extra layer between hash and hash element - hash bucket
batman-adv: Correct rcu refcounting for orig_node
batman-adv: increase refcount in create_neighbor to be consistent
batman-adv: remove orig_hash spinlock
batman-adv: rename global if_list to hardif_list
batman-adv: rename batman_if struct to hard_iface
Mario Schuknecht (1):
tcp: ioctl type SIOCOUTQNSD returns amount of data not sent
Mark Einon (1):
Trivial typo fix in comment
Mark Rustad (3):
net: dcbnl: Update copyright dates
net: dcbnl: Fix misspellings
net: dcbnl: Add IEEE app selector value definitions
Matt Carlson (19):
tg3: Revise 5719 internal FIFO overflow solution
tg3: Fix 5719 A0 tx completion bug
tg3: Use new VLAN code
tg3: Disable multivec mode for 1 MSIX vector
tg3: Restrict phy ioctl access
tg3: Fix loopback tests
tg3: Disable MAC loopback test for CPMU devices
tg3: Disable EEE during loopback tests
tg3: Fix EEE interoperability issue
tg3: Fix eee preprocessor naming
tg3: Update copyrights and update version to 3.117
tg3: Expand 5719 workaround
tg3: Add missed 5719 workaround change
tg3: Fix NVRAM selftest
tg3: Add code to verify RODATA checksum of VPD
tg3: cleanup pci device table vars
tg3: Refine VAux decision process
tg3: Move tg3_init_link_config to tg3_phy_probe
tg3: Remove 5750 PCI code
Meenakshi Venkataraman (1):
iwlagn: Enable idle powersave mode in 1000 series
Michael Buesch (4):
ssb: Make ssb_wait_bit multi-bit safe
lib-average: Make config option selectable
mac80211: Add log message to ieee80211_restart_hw()
p54spi: Update kconfig help text
Michael Chan (1):
bnx2: Update firmware and version
Michał Mirosław (16):
net: Move check of checksum features to netdev_fix_features()
net: change netdev->features to u32
net: reduce and unify printk level in netdev_fix_features()
ethtool: move EXPORT_SYMBOL(ethtool_op_set_tx_csum) to correct place
ethtool: enable GSO and GRO by default
ethtool: factorize ethtool_get_strings() and ethtool_get_sset_count()
ethtool: factorize get/set_one_feature
net: Introduce new feature setting ops
net: ethtool: use ndo_fix_features for offload setting
net: use ndo_fix_features for ethtool_ops->set_flags
net: introduce NETIF_F_RXCSUM
loopback: convert to hw_features
Fix "(unregistered net_device): Features changed" message
net: avoid initial "Features changed" message
net: Fix ETHTOOL_GFEATURES compatibility
net: Implement SFEATURES compatibility for not updated drivers
Michel Lespinasse (1):
drivers/net: fix build warnings with CONFIG_PM_SLEEP disabled
Mohammed Shafi Shajakhan (4):
ath9k: clean up enums and unused macros
ath9k: Fix memory leak due to failed PAPRD frames
mac80211: Update comments on radiotap MCS index
ath9k: Update comments for not parsing DTIM period
Nick Kossifidis (1):
ath5k: Fix fast channel switching
Nick Ledovskikh (1):
mac80211:mesh_mpp_table_grow call should depend on MESH_WORK_GROW_MPP_TABLE flag.
Nicolas Dichtel (1):
ipsec: allow to align IPv4 AH on 32 bits
Nicolas de Pesloüan (1):
bonding: documentation update: mailing lists.
Nishant Sarmukadam (7):
mwl8k: Modify add_dma_header to include pad parameters
mwl8k: Add encapsulation of data packet for crypto
mwl8k: Set mac80211 rx status flags appropriately when hw crypto is enabled
mwl8k: Enable HW encryption for AP mode
mwl8k: fix rf_antenna rx argument for AP
mwl8k: Tell mac80211 we have rate adaptation in FW
mwl8k: Invert tx queues for set_hw_spec and set_edca_params
Nobuhiro Iwamatsu (1):
sh: sh_eth: Add support ethtool
Oliver Neukum (1):
r8169: support control of advertising.
Pablo Neira Ayuso (2):
netfilter: nf_conntrack_tstamp: add flow-based timestamp extension
netfilter: nf_ct_tcp: fix out of sync scenario while in SYN_RECV
Padmanabh Ratnakar (8):
be2net: Remove ERR compl workaround for Lancer
be2net: Checksum field valid only for TCP/UDP
be2net: Add error recovery during load for Lancer
be2net: Change f/w command versions for Lancer
be2net: Remove TX Queue stop in close
be2net: Disarm CQ and EQ to disable interrupt in Lancer
be2net: Add multicast filter capability for Lancer
be2net: Fix UDP packet detected status in RX compl
Patrick McHardy (24):
Merge branch 'for-patrick' of git://git.kernel.org/.../horms/lvs-test-2.6
netfilter: xt_conntrack: support matching on port ranges
netfilter: fix Kconfig dependencies
Merge branch 'master' of git://1984.lsi.us.es/net-next-2.6
netfilter: nf_conntrack: use is_vmalloc_addr()
Merge branch 'master' of git://dev.medozas.de/linux
netfilter: nf_conntrack: fix lifetime display for disabled connections
Merge branch 'master' of /repos/git/net-next-2.6
Merge branch 'connlimit' of git://dev.medozas.de/linux
Merge branch 'connlimit' of git://dev.medozas.de/linux
netfilter: nf_conntrack: fix linker error with NF_CONNTRACK_TIMESTAMP=n
rtnetlink: fix link attribute validation with IFLA_GROUP
Merge branch 'connlimit' of git://dev.medozas.de/linux
netfilter: ipset: use nla_parse_nested()
netfilter: ipset: remove unnecessary includes
netfilter: ctnetlink: fix ctnetlink_parse_tuple() warning
netfilter: ipset: install ipset related header files
netfilter: ipset: add missing break statemtns in ip_set_get_ip_port()
netfilter: ipset: fix linking with CONFIG_IPV6=n
netfilter: xtables: add device group match
netfilter: ipset: add dependency on CONFIG_NETFILTER_NETLINK
netlink: kill loginuid/sessionid/sid members from struct netlink_skb_parms
netlink: kill eff_cap from struct netlink_skb_parms
netfilter: x_tables: return -ENOENT for non-existant matches/targets
Patrick Schaaf (1):
ipvs: make "no destination available" message more informative
Paul Gortmaker (2):
tipc: cosmetic - function names are not to be full sentences
tipc: delete extra semicolon blocking node deletion
Peter Korsgaard (2):
dsa/mv88e6060: support nonzero mii base address
phylib: SIOCGMIIREG/SIOCSMIIREG: allow access to all mdio addresses
Phil Oester (3):
bonding: Incorrect TX queue offset
bonding: Call netif_carrier_off after register_netdevice
bonding: Improve syslog message at device creation time
Po-Yu Chuang (1):
net: add Faraday FTMAC100 10/100 Ethernet driver
RA-Jay Hung (5):
rt2x00: Fix radio off hang issue for PCIE interface
rt2x00: Fix and fine-tune rf registers for RT3070/RT3071/RT3090
rt2x00: Correct initial value of US_CYC_CNT register for pcie interface
rt2x00: Add antenna setting for RT3070/RT3090/RT3390 with RX antenna diversity support
rt2x00: Fix rt2800 txpower setting to correct value
RA-Shiang Tu (1):
rt2x00: Add support for RT5390 chip
Rafael J. Wysocki (3):
tg3: Avoid setting power.can_wakeup for devices that cannot wake up
atl1c: Do not call device_init_wakeup() in atl1c_probe()
atl1: Do not use legacy PCI power management
Rafał Miłecki (14):
ssb: extract boardflags2 for SPROMs rev 4 and 5
ssb: trivial: fix SPROM extract warning formatting
ssb: remove invalid define SSB_TMSLOW_PHYCLK
ssb: when needed, reject IM input while disabling device
ssb: reset device only if it was enabled
b43: N-PHY: fix 0x2055 radio workaround condition
b43: N-PHY: rev1: enable some gain ctl workarounds
b43: N-PHY: rev1: restore PHY state after RSSI operations
b43: fill PHY ctl word1 in TX header for N-PHY
b43: N-PHY: rev3+: add static tables
b43: N-PHY: rev3+: correct switching analog core
b43: N-PHY: rev3+: add tables with gain ctl workarounds
b43: N-PHY: rev3+: implement gain ctl workarounds
b43: trivial: update B43_PHY_N description (PHY support)
Rajesh Borundia (1):
qlcnic: Remove validation for max tx and max rx queues
Rajkumar Manoharan (13):
ath9k: preserve caldata history buffer across scanning
ath9k_htc: keep calibrated noise floor value for oper channel
ath9k_hw: fix carrier leakage calibration for AR9271
ath9k: use common API to avoid code duplication
mac80211: disable power save if an infra AP vif exists
ath9k_htc: cancel ani work in ath9k_htc_stop
ath9k: use common get current channel function
ath9k: move update tx power to common
ath9k_htc: make use common of function to update txpower
ath9k: do not access hw registers in FULL SLEEP
ath9k: reserve a beacon slot on beaconing vif addition
mac80211: do not restart ps timer during scan or offchannel
ath9k: disable beaconing before stopping beacon queue
Randy Dunlap (1):
wl12xx: fix sdio_test kconfig/build errors
Richard Weinberger (1):
netfilter: xt_connlimit: use hotdrop jump mark
Rogério Brito (1):
Bluetooth: ath3k: Avoid duplication of code
Roopa Prabhu (3):
enic: Bug Fix: Dont reset ENIC_SET_APPLIED flag on port profile disassociate
enic: Decouple mac address registration and deregistration from port profile set operation
enic: Flush driver cache of registered addr lists during port profile disassociate
Rémi Denis-Courmont (15):
Phonet: allow multiple listen() and fix small race condition
Phonet: implement per-socket destination/peer address
Phonet: use socket destination in pipe protocol
Phonet: remove redumdant pep->pipe_state
Phonet: don't bother with transaction IDs (especially for indications)
Phonet: fix flawed "SYN/ACK" logic
Phonet: fix NULL dereference on TX path with implicit source
Phonet: return an error when packet TX fails
Phonet: correct pipe backlog callback return values
Phonet: factor common code to send control messages
Phonet: allocate sock from accept syscall rather than soft IRQ
Phonet: provide pipe socket option to retrieve the pipe identifier
Phonet: support active connection without pipe controller on modem
Phonet: kill the ST-Ericsson pipe controller Kconfig
Phonet: fix aligned-mode pipe socket buffer header reserve
Sakari Ailus (3):
tlan: Code cleanup: checkpatch.pl is relatively happy now.
tlan: add suspend/resume support
tlan: Fix bugs introduced by the last tlan cleanup patch
Sangtae Ha (2):
tcp_cubic: make the delay threshold of HyStart less sensitive
tcp_cubic: fix low utilization of CUBIC with HyStart
Sathya Perla (1):
be2net: changes for BE3 native mode support
Scott James Remnant (1):
net/wireless: add COUNTRY to to regulatory device uevent
Sebastien Jan (1):
wl12xx: fix the path to the wl12xx firmwares
Senthil Balasubramanian (3):
ath9k_hw: Fix incorrect macversion and macrev checks
ath9k_hw: read and backup AR_WA register value even before chip reset on.
ath9k: Fix incorrect GPIO LED pin for AR9485
Sergei Shtylyov (2):
net: use pci_dev->revision, again
sis900: use pci_dev->revision
Seth Forshee (1):
rt2x00: Check for errors from skb_pad() calls
Shan Wei (10):
net: cleanup unused macros in net directory
dccp: clean up unused DCCP_STATE_MASK definition
tcp: Remove debug macro of TCP_CHECK_TIMER
sctp: fix compile warnings in sctp_tsnmap_num_gabs
mac80211: remove unused macros
wireless:ath: use resource_size() help function
s2io: fix uninitialized compile warning
netfilter: ipset: fix the compile warning in ip_set_create
mwl8k: use kcalloc instead of kmalloc & memset
netfilter:ipvs: use kmemdup
Shawn Lin (1):
r6040: fix multicast operations
Shiang Tu (2):
rt2x00: Add/Modify protection related register definitions
rt2x00: Add/Modify the GPIO register definition
Shmulik Ravid (3):
bnx2x: use dcb_setapp to manage negotiated application tlvs
dcbnl: add support for retrieving peer configuration - ieee
dcbnl: add support for retrieving peer configuration - cee
Simon Horman (28):
IPVS: Add persistence engine to connection entry
IPVS: Only match pe_data created by the same pe
IPVS: Make the cp argument to ip_vs_sync_conn() static
IPVS: Remove useless { } block from ip_vs_process_message()
IPVS: buffer argument to ip_vs_process_message() should not be const
ipvs: allow transmit of GRO aggregated skbs
Merge branch 'master' of git://git.kernel.org/.../davem/net-next-2.6 into HEAD
IPVS: Change sock_create_kernel() to __sock_create()
IPVS: use z modifier for sizeof() argument
IPVS: remove duplicate initialisation or rs_table
IPVS: Remove unused variables
IPVS: Allow compilation with CONFIG_SYSCTL disabled
IPVS: Remove ip_vs_sync_cleanup from section __exit
IPVS: Use correct lock in SCTP module
IPVS: Add ip_vs_route_me_harder()
IPVS: Add sysctl_snat_reroute()
IPVS: Add sysctl_nat_icmp_send()
IPVS: Add {sysctl_sync_threshold,period}()
IPVS: Add sysctl_sync_ver()
IPVS: Add sysctl_expire_nodest_conn()
IPVS: Add expire_quiescent_template()
IPVS: Conditinally use sysctl_lblc{r}_expiration
IPVS: ip_vs_todrop() becomes a noop when CONFIG_SYSCTL is undefined
IPVS: Conditional ip_vs_conntrack_enabled()
IPVS: Minimise ip_vs_leave when CONFIG_SYSCTL is undefined
IPVS: Conditionally define and use ip_vs_lblc{r}_table
IPVS: Add __ip_vs_control_{init,cleanup}_sysctl()
IPVS: Conditionally include sysctl members of struct netns_ipvs
Simon Wunderlich (2):
batman-adv: remove unused parameters
batman-adv: protect bonding with rcu locks
Sony Chacko (2):
netxen: Notify firmware of Flex-10 interface down
netxen: support for GbE port settings
Stanislaw Gruszka (22):
iwlwifi: do not set tx power when channel is changing
iwl3945: set STATUS_READY before commit_rxon
iwlwifi: remove unneeded __packed
iwlwifi: introduce iwl_advanced_bt_coexist()
iwlwifi: remove unneeded disable_hw_scan check
iwlwifi: introduce iwl_bt_statistics
iwl3945: do not use agn specific IWL_RATE_COUNT
iwlwifi: correct frequency settings
iwlwifi: cleanup iwl_recover_from_statistics
iwlwifi: cleanup iwl_good_ack_health
iwlwifi: fix ack health for WiFi/BT combo devices
iwlegacy: do not set tx power when channel is changing
mac80211: better fix for conn_mon_timer running after disassociate
iwlwifi: fix dma mappings and skbs leak
iwlegacy: fix dma mappings and skbs leak
iwlwifi: add {ack,plpc}_check module parameters
iwlwifi: move check health code into iwl-rx.c
iwlwifi: move remaining iwl-agn-rx.c code into iwl-rx.c
iwlwifi: move rx handlers code to iwl-rx.c
iwlwifi: cleanup iwl_good_plcp_health
iwlwifi: avoid too frequent recover from statistics
iwlwifi: fix iwl-rx.c compilation
Stefan Assmann (1):
igb: warn if max_vfs limit is exceeded
Stefan Berger (2):
netfilter: xt_connlimit: connlimit-above early loop termination
Revert "netfilter: xt_connlimit: connlimit-above early loop termination"
Steffen Klassert (10):
crypto: authencesn - Add algorithm to handle IPsec extended sequence numbers
xfrm: Add basic infrastructure to support IPsec extended sequence numbers
xfrm: Use separate low and high order bits of the sequence numbers in xfrm_skb_cb
esp4: Add support for IPsec extended sequence numbers
esp6: Add support for IPsec extended sequence numbers
xfrm: Move IPsec replay detection functions to a separate file
xfrm: Support anti-replay window size bigger than 32 packets
xfrm: Add support for IPsec extended sequence numbers
xfrm: Add user interface for esn and big anti-replay windows
xfrm: Refcount destination entry on xfrm_lookup
Stephen Hemminger (4):
pfkey: fix warning
netfilter: x_tables: misuse of try_then_request_module
tcp: mark tcp_congestion_ops read_mostly
netfilter: nf_conntrack: fix sysctl memory leak
Steve Brown (1):
ath9k: Remove redundant beacon_interval
Steve Hodgson (2):
sfc: Reduce size of efx_rx_buffer by unionising skb and page
sfc: Reduce size of efx_rx_buffer further by removing data member
Sujith Manoharan (28):
ath9k_htc: Add multiple register read API
ath9k_hw: Offload USB eeprom reading to target
ath9k_hw: Fix opmode initialization
ath9k_hw: Fix INI fixup
ath9k_hw: Add RX filters
ath9k_hw: Fix power on reset
ath9k_htc: Handle storage devices
ath9k_htc: Allow upto two simultaneous interfaces
ath9k_htc: Unify target capability updating
ath9k_htc: Fix error handling in add_interface
ath9k_htc: Remove OP_PREAMBLE_SHORT
ath9k_htc: Remove OP_PROTECT_ENABLE
ath9k_htc: Remove OP_ASSOCIATED variable
ath9k_htc: Set the BSSID mask for multiple interfaces
ath9k_htc: Make sequence number calculation per-VIF
ath9k_htc: Use VIF from the packet's control data
ath9k_htc: Protect ampdu_action with a mutex
ath9k_htc: Maintain individual counters for interfaces
ath9k_htc: Allow AP interface to be created
ath9k_htc: Calculate and set the HW opmode
ath9k_htc: Add ANI for AP mode
ath9k_htc: Configure beacon timers in AP mode
ath9k_htc: Fix TBTT calculation for IBSS mode
ath9k_htc: Fix host RX initialization
ath9k_htc: Fix RX filters
ath9k_htc: Add debug code to print endpoint mapping
ath9k_htc: Fix error path in URB allocation
ath9k_htc: Handle BSSID/AID for multiple interfaces
Sven Eckelmann (10):
batman-adv: Create roughly equal sized fragments
batman-adv: Calculate correct size for merged packets
batman-adv: Remove dangling declaration of hash_remove_element
batman-adv: Remove unused definitions
batman-adv: Remove declaration of batman_skb_recv
batman-adv: Remove unused variables
batman-adv: Update copyright years
batman-adv: Merge README of v2011.0.0 release
batman-adv: Use successive sequence numbers for fragments
batman-adv: Disallow regular interface as mesh device
Szymon Janc (13):
Bluetooth: Use #include <linux/uaccess.h> instead of <asm/uaccess.h>
Bluetooth: Clean up hci_sniff_subrate_evt function
Bluetooth: Fix some code style issues in hci_core.h
Bluetooth: Fix some code style issues in hci_core.c
Bluetooth: Fix some code style issues in hci_event.c
Bluetooth: Use proper command structure in remove_uuid
Bluetooth: Move index to common header in management interface
Bluetooth: Validate data size before accessing mgmt commands
Bluetooth: Fix possible NULL pointer dereference in cmd_complete
Bluetooth: Log all parameters in cmd_status for easier debugging
Bluetooth: Remove unused code from get_connections
Bluetooth: Use variable name instead of type in sizeof()
Bluetooth: Fix some small code style issues in mgmt.c
Thomas Chou (1):
smc91x: add devicetree support
Thomas Gleixner (1):
genirq: Fix affinity notifier fallout
Thomas Graf (3):
netfilter: audit target to record accepted/dropped packets
netfilter: create audit records for x_tables replaces
netfilter ebtables: fix xt_AUDIT to work with ebtables
Thomas Jacob (2):
netfilter: xt_iprange: typo in IPv4 match debug print code
netfilter: xt_iprange: add IPv6 match debug print code
Thomas Lange (1):
Davinci: Do not reset EMAC TX overruns counter on read
Tinggong Wang (1):
ipvs: fix timer in get_curr_sync_buff
Tom Herbert (1):
bnx2x: Support for managing RX indirection table
Ursula Braun (1):
qeth: remove needless IPA-commands in offline
Uwe Kleine-König (15):
net/fec: no need to cast arguments for memcpy
net/fec: release mem_region requested in probe in error path and remove
net/fec: don't free an irq that failed to be requested
net/fec: no need to check for validity of ndev in suspend and resume
net/fec: no need to memzero private data
net/fec: put the ioremap cookie immediately into a void __iomem pointer
net/fec: consolidate all i.MX options to CONFIG_ARM
net/fec: add phy_stop to fec_enet_close
net/fec: consistenly name struct net_device pointers "ndev"
net/fec: some whitespace cleanup
net/fec: reorder functions a bit allows removing forward declarations
net/fec: provide device for dma functions and matching sizes for map and unmap
net/fec: postpone unsetting driver data until the hardware is stopped
net/fec: enable flow control and length check on enet-mac
net/fec: remove unused driver data
Vasanthakumar Thiagarajan (3):
ath9k: Implement op_flush()
ath9k: Add a debugfs interface to dump chip registers
ath9k_hw: Read noise floor only for available chains for AR9003
Vasanthy Kolluri (9):
enic: Clean up: Organize devcmd wrapper routines
enic: Bug Fix: Fix return values of enic_add/del_station_addr routines
enic: Bug Fix: Reorder firmware devcmds - CMD_INIT and CMD_IG_VLAN_REWRITE_MODE
enic: Clean up: Remove support for an older version of hardware
enic: Update MAINTAINERS
enic: Bug fix: Reset driver count of registered unicast addresses to zero during device reset
enic: Clean up: Remove a not needed #ifdef
enic: Always use single transmit and single receive hardware queues per device
enic: Support newer version of firmware devcmd CMD_MCPU_FW_INFO
Vasiliy Kulikov (7):
Bluetooth: l2cap: fix 1 byte infoleak to userspace
Bluetooth: bnep: fix buffer overflow
Bluetooth: sco: fix information leak to userspace
bridge: netfilter: fix information leak
netfilter: arp_tables: fix infoleak to userspace
netfilter: ip_tables: fix infoleak to userspace
ipv6: netfilter: ip6_tables: fix infoleak to userspace
Vasily Khoruzhick (2):
libertas_spi: Use workqueue in hw_host_to_card
libertas: Prepare stuff for if_spi.c pm support
Ville Tervo (10):
Bluetooth: Add low energy commands and events
Bluetooth: Add LE connect support
Bluetooth: Use LE buffers for LE traffic
Bluetooth: Add LE connection support to L2CAP
Bluetooth: Add server socket support for LE connection
Bluetooth: Do not send disconn comand over LE links
Bluetooth: Treat LE and ACL links separately on timeout
Bluetooth: Add SMP command structures
Bluetooth: Use proper timer for hci command timout
Bluetooth: Use ERR_PTR as return error from hci_connect
Vinicius Costa Gomes (1):
Bluetooth: Fix initiated LE connections
Vivek Natarajan (15):
ath9k_hw: Add a function to read sqsum_dvc.
ath9k: Fix a PLL hang issue observed with AR9485.
ath9k_hw: DDR_PLL and BB_PLL need correct setting.
ath9k: Fix a locking related issue.
ath9k_hw: Update PMU setting to improve ripple issue for AR9485.
ath9k_htc: Fix a compilation warning.
ath9k_hw: Updates for AR9485 1.1 chipsets.
mac80211: Clear PS related flag on disabling power save.
mac80211: Fix a race on enabling power save.
ath9k_hw: Fix pcie_serdes setting for AR9485 1.1 version.
ath9k: Cancel pll_work while disabling radio.
ath9k: Fix compilation warning.
ath9k_hw: Improve idle power consumption for AR9485.
ath9k_hw: Fix PLL initialization for AR9485.
ath9k_hw: Increase the wait count for nf load.
Vlad Dogaru (4):
net_device: add support for network device groups
netlink: support setting devgroup parameters
net: add sysfs entry for device group
netdevice: make initial group visible to userspace
Vladislav Zolotarov (3):
bnx2x, cnic: Consolidate iSCSI/FCoE shared mem logic in bnx2x
bnx2x: MTU for FCoE L2 ring
bnx2x: Proper netdev->ndo_set_rx_mode() implementation.
Wey-Yi Guy (32):
mac80211: mesh only parameter mppath maybe unused
iwlwifi: use mac80211 throughput trigger
iwlagn: remove reference to gen2a and gen2b
iwlagn: add 2000 series EEPROM version
iwlagn: 2000 series devices support
iwlagn: add 2000 series pci id
iwlagn: add 2000 series to Kconfig
iwlagn: remove Gen2 from Kconfig
iwlwifi: remove g2 from csr hw rev
iwlwifi: add hw rev for 2000 series devices
iwlwifi: initial P2P support
iwlwifi: check ucode loading error and restart
iwlagn: adjust rate table
iwlagn: add IQ inversion support for 2000 series devices
iwlwifi: always support idle mode for agn devices
iwlagn: use 2030 macro for 2030 devices
iwlagn: remove unsupported BT SCO command
iiwlagn: remove unused parameter
iwlwifi: fix compiling error with different configuration
iwlagn: donot process bt update when bt coex disable
iwlagn: handle bt defer work in 2000 series
iwlwifi: Limit number of firmware reload
iwlwifi: Loading correct uCode again when fail to load
iwlwifi: enable 2-wire bt coex support for non-combo device
iwlwifi: split the drivers for agn and legacy devices 3945/4965
Revert "iwlwifi: split the drivers for agn and legacy devices 3945/4965"
iwlwifi: split the drivers for agn and legacy devices 3945/4965
iwlagn: name change for BT config command
iwlagn: add bt config structure support for 2000 series
iwlagn: add BT Session Activity 2 UART message (BT -> WiFi)
iwlagn: split BT page and inquiry UART msg
iwlagn: enable BT session 2 type UART for 2000 series
Willy Tarreau (4):
rtlwifi: Fix build when RTL8192CU is selected, but RTL8192CE is not
rtl8192cu: fix build error (vmalloc/vfree undefined)
rtlwifi: Let rtlwifi build when PCI is not enabled
rtlwifi: Eliminate udelay calls with too large values
Wojciech Dubowik (2):
ath5k: Fix return codes for eeprom read functions.
ath5k: Enable AR2315 chipset recognition
Xiaotian Feng (1):
net: rename group sysfs entry to netdev_group
Yaniv Rosner (10):
bnx2x: Fix line indentation
bnx2x: Rename CL45 macro
bnx2x: Set comments according to preferred Linux style
bnx2x: Fix compilation warning messages
bnx2x: Add and change some net_dev messages
bnx2x: Enhance SFP+ module control
bnx2x: Add support for new PHY BCM84833
bnx2x: Add CMS functionality for 848x3
bnx2x: Remove support for emulation/FPGA
bnx2x: Update bnx2x version to 1.62.11-0
Yi Zou (4):
net: add ndo_fcoe_ddp_target() to support FCoE DDP in target mode
vlan: add support to ndo_fcoe_ddp_target()
ixgbe: add support to FCoE DDP in target mode
net: add proper documentation for previously added net_device_ops for FCoE
Yoshihiro Shimoda (6):
net: sh_eth: modify the definitions of register
net: sh_eth: remove the SH_TSU_ADDR
net: sh_eth: remove almost #ifdef of SH7763
net: sh_eth: modify the PHY_INTERFACE_MODE
net: sh_eth: add support for SH7757's GETHER
net: sh_eth: add set_mdio_gate in bb_info
amit salecha (1):
qlcnic: fix checks for auto_fw_reset
françois romieu (3):
atl1c: remove private #define.
atl1e: remove private #define.
via-velocity: fix the WOL bug on 1000M full duplex forced mode.
hartleys (1):
phy: Remove unneeded depends on PHYLIB
roel kluin (1):
can: wrong index used in inner loop
stephen hemminger (23):
sfq: deadlock in error path
sched: CHOKe flow scheduler
cls_u32: fix sparse warnings
socket: suppress sparse warnings
atl1[ce]: fix sparse warnings
afkey: add sparse annotation about rcu
mqprio: cleanups
em_meta: fix sparse warning
netem: cleanup dump code
netem: use vmalloc for distribution table
netem: define NETEM_DIST_MAX
Revert "sch_netem: Remove classful functionality"
netem: revised correlated loss generator
netem: update version and cleanup
bonding: fix sparse warning
qla3xxx: add missing __iomem annotation
bridge: control carrier based on ports online
bridge: skip forwarding delay if not using STP
tcp: fix RTT for quick packets in congestion control
tcp_cubic: fix comparison of jiffies
tcp_cubic: make ack train delta value a parameter
tcp_cubic: fix clock dependency
tcp_cubic: enable high resolution ack time if needed
Documentation/feature-removal-schedule.txt | 27 +
Documentation/networking/batman-adv.txt | 16 +-
Documentation/networking/bonding.txt | 26 +-
Documentation/networking/ip-sysctl.txt | 11 +
Documentation/networking/phonet.txt | 67 +-
MAINTAINERS | 10 +-
arch/sh/include/asm/sh_eth.h | 10 +
crypto/Makefile | 2 +-
crypto/authencesn.c | 835 ++++
drivers/block/drbd/drbd_nl.c | 2 +-
drivers/bluetooth/ath3k.c | 287 ++-
drivers/bluetooth/btusb.c | 13 +-
drivers/bluetooth/hci_ldisc.c | 1 +
drivers/infiniband/core/addr.c | 31 +-
drivers/infiniband/hw/cxgb3/iwch_cm.c | 22 +-
drivers/infiniband/hw/cxgb4/cm.c | 22 +-
drivers/infiniband/hw/nes/nes.c | 3 +-
drivers/infiniband/hw/nes/nes_cm.c | 8 +-
drivers/md/dm-log-userspace-transfer.c | 2 +-
drivers/net/Kconfig | 90 +-
drivers/net/Makefile | 2 +
drivers/net/atl1c/atl1c_hw.c | 15 +-
drivers/net/atl1c/atl1c_hw.h | 43 +-
drivers/net/atl1c/atl1c_main.c | 5 +-
drivers/net/atl1e/atl1e_ethtool.c | 12 +-
drivers/net/atl1e/atl1e_hw.c | 34 +-
drivers/net/atl1e/atl1e_hw.h | 111 +-
drivers/net/atl1e/atl1e_main.c | 10 +-
drivers/net/atlx/atl1.c | 77 +-
drivers/net/atlx/atl2.c | 2 +-
drivers/net/ax88796.c | 810 ++--
drivers/net/benet/be.h | 55 +-
drivers/net/benet/be_cmds.c | 202 +-
drivers/net/benet/be_cmds.h | 96 +-
drivers/net/benet/be_ethtool.c | 87 +-
drivers/net/benet/be_hw.h | 110 +-
drivers/net/benet/be_main.c | 620 ++--
drivers/net/bna/bnad.c | 108 +-
drivers/net/bna/bnad.h | 2 +-
drivers/net/bnx2.c | 16 +-
drivers/net/bnx2.h | 6 +-
drivers/net/bnx2x/bnx2x.h | 35 +-
drivers/net/bnx2x/bnx2x_cmn.c | 70 +-
drivers/net/bnx2x/bnx2x_cmn.h | 6 +-
drivers/net/bnx2x/bnx2x_dcb.c | 137 +-
drivers/net/bnx2x/bnx2x_dcb.h | 5 +-
drivers/net/bnx2x/bnx2x_ethtool.c | 58 +-
drivers/net/bnx2x/bnx2x_hsi.h | 114 +-
drivers/net/bnx2x/bnx2x_link.c | 2527 ++++++-----
drivers/net/bnx2x/bnx2x_link.h | 34 +-
drivers/net/bnx2x/bnx2x_main.c | 600 ++-
drivers/net/bnx2x/bnx2x_reg.h | 1 +
drivers/net/bonding/Makefile | 3 +
drivers/net/bonding/bond_3ad.c | 2 +-
drivers/net/bonding/bond_alb.c | 2 +-
drivers/net/bonding/bond_main.c | 638 +--
drivers/net/bonding/bond_procfs.c | 275 ++
drivers/net/bonding/bond_sysfs.c | 23 +-
drivers/net/bonding/bonding.h | 111 +-
drivers/net/can/Kconfig | 2 +
drivers/net/can/Makefile | 1 +
drivers/net/can/c_can/Kconfig | 15 +
drivers/net/can/c_can/Makefile | 8 +
drivers/net/can/c_can/c_can.c | 1158 +++++
drivers/net/can/c_can/c_can.h | 86 +
drivers/net/can/c_can/c_can_platform.c | 215 +
drivers/net/can/usb/esd_usb2.c | 6 +-
drivers/net/cnic.c | 209 +-
drivers/net/cnic.h | 2 +-
drivers/net/cnic_if.h | 8 +-
drivers/net/cs89x0.c | 19 +-
drivers/net/cxgb3/cxgb3_offload.c | 5 +-
drivers/net/cxgb4/cxgb4_main.c | 1 -
drivers/net/davinci_emac.c | 2 +-
drivers/net/dm9000.c | 7 +-
drivers/net/e1000e/defines.h | 1 +
drivers/net/e1000e/e1000.h | 5 +-
drivers/net/e1000e/ethtool.c | 92 +-
drivers/net/e1000e/hw.h | 5 +-
drivers/net/e1000e/ich8lan.c | 48 +-
drivers/net/e1000e/lib.c | 4 +-
drivers/net/e1000e/netdev.c | 129 +-
drivers/net/e1000e/phy.c | 8 +-
drivers/net/enic/Makefile | 2 +-
drivers/net/enic/enic.h | 11 +-
drivers/net/enic/enic_dev.c | 221 +
drivers/net/enic/enic_dev.h | 41 +
drivers/net/enic/enic_main.c | 326 +--
drivers/net/enic/vnic_dev.c | 26 +-
drivers/net/enic/vnic_dev.h | 8 -
drivers/net/enic/vnic_devcmd.h | 38 +-
drivers/net/enic/vnic_rq.h | 5 -
drivers/net/eql.c | 10 +-
drivers/net/fec.c | 650 ++--
drivers/net/forcedeth.c | 8 +-
drivers/net/ftmac100.c | 1198 +++++
drivers/net/ftmac100.h | 180 +
drivers/net/hamradio/bpqether.c | 5 +-
drivers/net/igb/e1000_82575.c | 296 ++-
drivers/net/igb/e1000_82575.h | 1 +
drivers/net/igb/e1000_defines.h | 52 +-
drivers/net/igb/e1000_hw.h | 9 +-
drivers/net/igb/e1000_mbx.c | 38 +-
drivers/net/igb/e1000_nvm.c | 64 +-
drivers/net/igb/e1000_nvm.h | 1 +
drivers/net/igb/e1000_regs.h | 27 +
drivers/net/igb/igb.h | 8 +
drivers/net/igb/igb_ethtool.c | 30 +-
drivers/net/igb/igb_main.c | 232 +-
drivers/net/igbvf/ethtool.c | 6 +-
drivers/net/igbvf/igbvf.h | 3 -
drivers/net/igbvf/netdev.c | 63 +-
drivers/net/ipg.c | 4 +-
drivers/net/ixgb/ixgb.h | 2 +-
drivers/net/ixgb/ixgb_ethtool.c | 39 +
drivers/net/ixgb/ixgb_main.c | 54 +-
drivers/net/ixgbe/ixgbe.h | 16 +-
drivers/net/ixgbe/ixgbe_82598.c | 102 +-
drivers/net/ixgbe/ixgbe_82599.c | 228 +-
drivers/net/ixgbe/ixgbe_common.c | 947 ++--
drivers/net/ixgbe/ixgbe_common.h | 8 +-
drivers/net/ixgbe/ixgbe_dcb.c | 160 +-
drivers/net/ixgbe/ixgbe_dcb.h | 12 +-
drivers/net/ixgbe/ixgbe_dcb_82598.c | 138 +-
drivers/net/ixgbe/ixgbe_dcb_82598.h | 25 +-
drivers/net/ixgbe/ixgbe_dcb_82599.c | 176 +-
drivers/net/ixgbe/ixgbe_dcb_82599.h | 29 +-
drivers/net/ixgbe/ixgbe_dcb_nl.c | 429 ++-
drivers/net/ixgbe/ixgbe_ethtool.c | 57 +-
drivers/net/ixgbe/ixgbe_fcoe.c | 103 +-
drivers/net/ixgbe/ixgbe_fcoe.h | 6 +-
drivers/net/ixgbe/ixgbe_main.c | 481 ++-
drivers/net/ixgbe/ixgbe_mbx.c | 37 +-
drivers/net/ixgbe/ixgbe_mbx.h | 4 +-
drivers/net/ixgbe/ixgbe_phy.c | 594 ++-
drivers/net/ixgbe/ixgbe_phy.h | 7 +-
drivers/net/ixgbe/ixgbe_sriov.c | 116 +-
drivers/net/ixgbe/ixgbe_sriov.h | 3 +-
drivers/net/ixgbe/ixgbe_type.h | 65 +-
drivers/net/ixgbe/ixgbe_x540.c | 43 +-
drivers/net/ixgbevf/defines.h | 2 +
drivers/net/ixgbevf/ethtool.c | 4 +-
drivers/net/ixgbevf/ixgbevf.h | 1 -
drivers/net/ixgbevf/ixgbevf_main.c | 98 +-
drivers/net/ixgbevf/regs.h | 2 +-
drivers/net/jme.c | 306 +-
drivers/net/jme.h | 87 +-
drivers/net/loopback.c | 9 +-
drivers/net/macvlan.c | 14 +-
drivers/net/macvtap.c | 18 +-
drivers/net/mii.c | 14 +-
drivers/net/mv643xx_eth.c | 74 +-
drivers/net/myri10ge/myri10ge.c | 4 +-
drivers/net/netxen/netxen_nic.h | 6 +-
drivers/net/netxen/netxen_nic_ctx.c | 15 +
drivers/net/netxen/netxen_nic_ethtool.c | 62 +-
drivers/net/netxen/netxen_nic_main.c | 3 +
drivers/net/phy/Kconfig | 1 -
drivers/net/phy/micrel.c | 24 +-
drivers/net/phy/phy.c | 8 +-
drivers/net/ppp_generic.c | 148 +-
drivers/net/pptp.c | 45 +-
drivers/net/qla3xxx.c | 10 +-
drivers/net/qlcnic/qlcnic.h | 5 -
drivers/net/qlcnic/qlcnic_main.c | 15 +-
drivers/net/r8169.c | 272 +-
drivers/net/s2io.c | 2 +-
drivers/net/sfc/efx.c | 86 +-
drivers/net/sfc/efx.h | 19 +-
drivers/net/sfc/ethtool.c | 37 +-
drivers/net/sfc/falcon.c | 22 +-
drivers/net/sfc/falcon_boards.c | 2 +-
drivers/net/sfc/falcon_xmac.c | 2 +-
drivers/net/sfc/filter.c | 117 +-
drivers/net/sfc/io.h | 15 +-
drivers/net/sfc/mcdi.c | 32 +-
drivers/net/sfc/mcdi.h | 4 +-
drivers/net/sfc/mcdi_mac.c | 2 +-
drivers/net/sfc/mcdi_pcol.h | 2 +-
drivers/net/sfc/mcdi_phy.c | 2 +-
drivers/net/sfc/mdio_10g.c | 34 +-
drivers/net/sfc/mdio_10g.h | 5 +-
drivers/net/sfc/mtd.c | 2 +-
drivers/net/sfc/net_driver.h | 83 +-
drivers/net/sfc/nic.c | 73 +-
drivers/net/sfc/nic.h | 9 +-
drivers/net/sfc/phy.h | 2 +-
drivers/net/sfc/qt202x_phy.c | 2 +-
drivers/net/sfc/regs.h | 8 +-
drivers/net/sfc/rx.c | 144 +-
drivers/net/sfc/selftest.c | 4 +-
drivers/net/sfc/selftest.h | 2 +-
drivers/net/sfc/siena.c | 24 +-
drivers/net/sfc/spi.h | 2 +-
drivers/net/sfc/tenxpress.c | 4 +-
drivers/net/sfc/tx.c | 92 +-
drivers/net/sfc/txc43128_phy.c | 4 +-
drivers/net/sfc/workarounds.h | 2 +-
drivers/net/sh_eth.c | 737 +++-
drivers/net/sh_eth.h | 654 ++--
drivers/net/sis900.c | 4 +-
drivers/net/sky2.c | 2 +-
drivers/net/smc91x.c | 13 +
drivers/net/smsc911x.c | 4 +-
drivers/net/sungem.c | 58 +-
drivers/net/sungem.h | 1 -
drivers/net/tg3.c | 335 +-
drivers/net/tg3.h | 13 +-
drivers/net/tlan.c | 3840 ++++++++--------
drivers/net/tlan.h | 192 +-
drivers/net/tun.c | 85 +-
drivers/net/typhoon.c | 3 +-
drivers/net/usb/cdc-phonet.c | 10 +-
drivers/net/veth.c | 12 -
drivers/net/via-velocity.c | 9 +
drivers/net/via-velocity.h | 8 +-
drivers/net/vxge/vxge-config.c | 32 +-
drivers/net/vxge/vxge-config.h | 10 +
drivers/net/vxge/vxge-main.c | 234 +-
drivers/net/vxge/vxge-main.h | 23 +-
drivers/net/vxge/vxge-traffic.c | 116 +-
drivers/net/vxge/vxge-traffic.h | 14 +-
drivers/net/vxge/vxge-version.h | 4 +-
drivers/net/wireless/Kconfig | 1 +
drivers/net/wireless/Makefile | 5 +-
drivers/net/wireless/adm8211.c | 4 +-
drivers/net/wireless/at76c50x-usb.c | 10 +-
drivers/net/wireless/at76c50x-usb.h | 2 +-
drivers/net/wireless/ath/ar9170/Kconfig | 4 +-
drivers/net/wireless/ath/ar9170/ar9170.h | 2 +-
drivers/net/wireless/ath/ar9170/main.c | 8 +-
drivers/net/wireless/ath/ath.h | 2 +
drivers/net/wireless/ath/ath5k/Kconfig | 11 +
drivers/net/wireless/ath/ath5k/ahb.c | 9 +-
drivers/net/wireless/ath/ath5k/ath5k.h | 40 +-
drivers/net/wireless/ath/ath5k/attach.c | 7 +-
drivers/net/wireless/ath/ath5k/base.c | 176 +-
drivers/net/wireless/ath/ath5k/base.h | 17 +-
drivers/net/wireless/ath/ath5k/caps.c | 48 +-
drivers/net/wireless/ath/ath5k/debug.c | 20 -
drivers/net/wireless/ath/ath5k/debug.h | 10 -
drivers/net/wireless/ath/ath5k/eeprom.c | 24 +-
drivers/net/wireless/ath/ath5k/eeprom.h | 28 +-
drivers/net/wireless/ath/ath5k/mac80211-ops.c | 94 +-
drivers/net/wireless/ath/ath5k/pci.c | 9 +-
drivers/net/wireless/ath/ath5k/qcu.c | 46 +-
drivers/net/wireless/ath/ath5k/reg.h | 15 +-
drivers/net/wireless/ath/ath5k/trace.h | 107 +
drivers/net/wireless/ath/ath9k/Makefile | 1 -
drivers/net/wireless/ath/ath9k/ahb.c | 15 +-
drivers/net/wireless/ath/ath9k/ar9002_calib.c | 5 +-
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 26 +-
drivers/net/wireless/ath/ath9k/ar9003_hw.c | 112 +-
drivers/net/wireless/ath/ath9k/ar9003_mac.c | 8 +-
drivers/net/wireless/ath/ath9k/ar9003_phy.c | 37 +-
drivers/net/wireless/ath/ath9k/ar9003_phy.h | 2 +
drivers/net/wireless/ath/ath9k/ar9485_initvals.h | 1143 +++++
drivers/net/wireless/ath/ath9k/ath9k.h | 157 +-
drivers/net/wireless/ath/ath9k/beacon.c | 93 +-
drivers/net/wireless/ath/ath9k/calib.c | 9 +-
drivers/net/wireless/ath/ath9k/common.c | 11 +
drivers/net/wireless/ath/ath9k/common.h | 4 +-
drivers/net/wireless/ath/ath9k/debug.c | 494 ++-
drivers/net/wireless/ath/ath9k/debug.h | 17 +-
drivers/net/wireless/ath/ath9k/eeprom.c | 32 +
drivers/net/wireless/ath/ath9k/eeprom.h | 2 +
drivers/net/wireless/ath/ath9k/eeprom_4k.c | 41 +-
drivers/net/wireless/ath/ath9k/eeprom_9287.c | 45 +-
drivers/net/wireless/ath/ath9k/eeprom_def.c | 38 +-
drivers/net/wireless/ath/ath9k/gpio.c | 169 +-
drivers/net/wireless/ath/ath9k/hif_usb.c | 78 +-
drivers/net/wireless/ath/ath9k/htc.h | 80 +-
drivers/net/wireless/ath/ath9k/htc_drv_beacon.c | 170 +-
drivers/net/wireless/ath/ath9k/htc_drv_gpio.c | 3 +-
drivers/net/wireless/ath/ath9k/htc_drv_init.c | 48 +-
drivers/net/wireless/ath/ath9k/htc_drv_main.c | 485 ++-
drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 84 +-
drivers/net/wireless/ath/ath9k/hw.c | 65 +-
drivers/net/wireless/ath/ath9k/hw.h | 8 +-
drivers/net/wireless/ath/ath9k/init.c | 57 +-
drivers/net/wireless/ath/ath9k/mac.c | 103 +-
drivers/net/wireless/ath/ath9k/mac.h | 5 +-
drivers/net/wireless/ath/ath9k/main.c | 754 ++--
drivers/net/wireless/ath/ath9k/pci.c | 20 +-
drivers/net/wireless/ath/ath9k/rc.c | 3 +-
drivers/net/wireless/ath/ath9k/recv.c | 177 +-
drivers/net/wireless/ath/ath9k/reg.h | 22 +
drivers/net/wireless/ath/ath9k/virtual.c | 717 ---
drivers/net/wireless/ath/ath9k/wmi.c | 4 -
drivers/net/wireless/ath/ath9k/xmit.c | 308 +-
drivers/net/wireless/ath/carl9170/carl9170.h | 3 +-
drivers/net/wireless/ath/carl9170/fw.c | 15 +
drivers/net/wireless/ath/carl9170/fwcmd.h | 1 +
drivers/net/wireless/ath/carl9170/fwdesc.h | 28 +-
drivers/net/wireless/ath/carl9170/hw.h | 25 +
drivers/net/wireless/ath/carl9170/main.c | 9 +-
drivers/net/wireless/ath/carl9170/tx.c | 8 +-
drivers/net/wireless/ath/carl9170/version.h | 8 +-
drivers/net/wireless/ath/carl9170/wlan.h | 20 +-
drivers/net/wireless/ath/key.c | 5 +-
drivers/net/wireless/ath/regd.c | 7 +
drivers/net/wireless/ath/regd.h | 1 +
drivers/net/wireless/b43/Kconfig | 2 +-
drivers/net/wireless/b43/main.c | 6 +-
drivers/net/wireless/b43/phy_n.c | 207 +-
drivers/net/wireless/b43/tables_nphy.c | 1209 +++++-
drivers/net/wireless/b43/tables_nphy.h | 52 +
drivers/net/wireless/b43/xmit.c | 75 +-
drivers/net/wireless/b43/xmit.h | 6 +
drivers/net/wireless/b43legacy/main.c | 5 +-
drivers/net/wireless/b43legacy/xmit.c | 2 +-
drivers/net/wireless/ipw2x00/ipw2100.c | 2 +-
drivers/net/wireless/ipw2x00/ipw2200.h | 2 +-
drivers/net/wireless/iwlegacy/Kconfig | 116 +
drivers/net/wireless/iwlegacy/Makefile | 25 +
.../{iwlwifi => iwlegacy}/iwl-3945-debugfs.c | 11 +-
.../{iwlwifi => iwlegacy}/iwl-3945-debugfs.h | 4 +-
.../wireless/{iwlwifi => iwlegacy}/iwl-3945-fh.h | 5 +-
.../wireless/{iwlwifi => iwlegacy}/iwl-3945-hw.h | 9 +-
.../wireless/{iwlwifi => iwlegacy}/iwl-3945-led.c | 31 +-
.../wireless/{iwlwifi => iwlegacy}/iwl-3945-led.h | 2 +-
.../wireless/{iwlwifi => iwlegacy}/iwl-3945-rs.c | 41 +-
.../net/wireless/{iwlwifi => iwlegacy}/iwl-3945.c | 267 +-
.../net/wireless/{iwlwifi => iwlegacy}/iwl-3945.h | 12 +-
drivers/net/wireless/iwlegacy/iwl-4965-calib.c | 967 ++++
.../iwl-legacy.h => iwlegacy/iwl-4965-calib.h} | 30 +-
drivers/net/wireless/iwlegacy/iwl-4965-debugfs.c | 774 +++
.../iwl-4965-debugfs.h} | 35 +-
.../iwl-legacy.h => iwlegacy/iwl-4965-eeprom.c} | 107 +-
.../wireless/{iwlwifi => iwlegacy}/iwl-4965-hw.h | 26 +-
.../iwl-3945-led.c => iwlegacy/iwl-4965-led.c} | 49 +-
.../iwl-3945-led.h => iwlegacy/iwl-4965-led.h} | 11 +-
drivers/net/wireless/iwlegacy/iwl-4965-lib.c | 1260 +++++
drivers/net/wireless/iwlegacy/iwl-4965-rs.c | 2870 +++++++++++
.../iwl-agn-rx.c => iwlegacy/iwl-4965-rx.c} | 177 +-
drivers/net/wireless/iwlegacy/iwl-4965-sta.c | 721 +++
drivers/net/wireless/iwlegacy/iwl-4965-tx.c | 1369 ++++++
drivers/net/wireless/iwlegacy/iwl-4965-ucode.c | 166 +
.../net/wireless/{iwlwifi => iwlegacy}/iwl-4965.c | 815 +---
drivers/net/wireless/iwlegacy/iwl-4965.h | 282 ++
drivers/net/wireless/iwlegacy/iwl-commands.h | 3405 +++++++++++++
drivers/net/wireless/iwlegacy/iwl-core.c | 2674 +++++++++++
drivers/net/wireless/iwlegacy/iwl-core.h | 646 +++
drivers/net/wireless/iwlegacy/iwl-csr.h | 422 ++
drivers/net/wireless/iwlegacy/iwl-debug.h | 198 +
drivers/net/wireless/iwlegacy/iwl-debugfs.c | 1467 ++++++
drivers/net/wireless/iwlegacy/iwl-dev.h | 1426 ++++++
.../iwl-3945-led.h => iwlegacy/iwl-devtrace.c} | 23 +-
drivers/net/wireless/iwlegacy/iwl-devtrace.h | 270 ++
drivers/net/wireless/iwlegacy/iwl-eeprom.c | 561 +++
drivers/net/wireless/iwlegacy/iwl-eeprom.h | 344 ++
drivers/net/wireless/iwlegacy/iwl-fh.h | 513 ++
drivers/net/wireless/iwlegacy/iwl-hcmd.c | 271 ++
drivers/net/wireless/iwlegacy/iwl-helpers.h | 181 +
drivers/net/wireless/iwlegacy/iwl-io.h | 545 +++
drivers/net/wireless/iwlegacy/iwl-led.c | 188 +
.../{iwlwifi/iwl-3945-led.h => iwlegacy/iwl-led.h} | 34 +-
drivers/net/wireless/iwlegacy/iwl-legacy-rs.h | 456 ++
drivers/net/wireless/iwlegacy/iwl-power.c | 165 +
drivers/net/wireless/iwlegacy/iwl-power.h | 55 +
drivers/net/wireless/iwlegacy/iwl-prph.h | 523 ++
drivers/net/wireless/iwlegacy/iwl-rx.c | 302 ++
drivers/net/wireless/iwlegacy/iwl-scan.c | 625 +++
drivers/net/wireless/iwlegacy/iwl-spectrum.h | 92 +
drivers/net/wireless/iwlegacy/iwl-sta.c | 816 ++++
drivers/net/wireless/iwlegacy/iwl-sta.h | 148 +
drivers/net/wireless/iwlegacy/iwl-tx.c | 660 +++
.../wireless/{iwlwifi => iwlegacy}/iwl3945-base.c | 566 ++--
drivers/net/wireless/iwlegacy/iwl4965-base.c | 3632 ++++++++++++++
drivers/net/wireless/iwlwifi/Kconfig | 132 +-
drivers/net/wireless/iwlwifi/Makefile | 40 +-
drivers/net/wireless/iwlwifi/iwl-1000.c | 4 +-
drivers/net/wireless/iwlwifi/iwl-2000.c | 560 +++
drivers/net/wireless/iwlwifi/iwl-5000.c | 4 -
drivers/net/wireless/iwlwifi/iwl-6000.c | 59 +-
drivers/net/wireless/iwlwifi/iwl-agn-calib.c | 9 +-
drivers/net/wireless/iwlwifi/iwl-agn-debugfs.c | 12 +-
drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c | 18 +-
drivers/net/wireless/iwlwifi/iwl-agn-led.c | 14 +-
drivers/net/wireless/iwlwifi/iwl-agn-led.h | 1 +
drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 539 +--
drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 29 +-
drivers/net/wireless/iwlwifi/iwl-agn-rs.h | 1 +
drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | 101 +-
drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 21 +-
drivers/net/wireless/iwlwifi/iwl-agn-ucode.c | 8 -
drivers/net/wireless/iwlwifi/iwl-agn.c | 582 ++--
drivers/net/wireless/iwlwifi/iwl-agn.h | 49 +-
drivers/net/wireless/iwlwifi/iwl-commands.h | 130 +-
drivers/net/wireless/iwlwifi/iwl-core.c | 166 +-
drivers/net/wireless/iwlwifi/iwl-core.h | 66 +-
drivers/net/wireless/iwlwifi/iwl-csr.h | 16 +-
drivers/net/wireless/iwlwifi/iwl-debugfs.c | 119 +-
drivers/net/wireless/iwlwifi/iwl-dev.h | 90 +-
drivers/net/wireless/iwlwifi/iwl-eeprom.c | 8 -
drivers/net/wireless/iwlwifi/iwl-eeprom.h | 26 +-
drivers/net/wireless/iwlwifi/iwl-hcmd.c | 6 +-
drivers/net/wireless/iwlwifi/iwl-led.c | 199 +-
drivers/net/wireless/iwlwifi/iwl-led.h | 16 +-
drivers/net/wireless/iwlwifi/iwl-legacy.c | 662 ---
drivers/net/wireless/iwlwifi/iwl-power.c | 12 +-
drivers/net/wireless/iwlwifi/iwl-rx.c | 880 ++++-
drivers/net/wireless/iwlwifi/iwl-scan.c | 54 +-
drivers/net/wireless/iwlwifi/iwl-sta.c | 11 -
drivers/net/wireless/iwlwifi/iwl-tx.c | 78 +-
drivers/net/wireless/iwmc3200wifi/cfg80211.c | 3 +-
drivers/net/wireless/iwmc3200wifi/rx.c | 7 +-
drivers/net/wireless/libertas/cfg.c | 6 +-
drivers/net/wireless/libertas/cmd.c | 10 +-
drivers/net/wireless/libertas/dev.h | 2 +
drivers/net/wireless/libertas/host.h | 2 +-
drivers/net/wireless/libertas/if_spi.c | 368 +-
drivers/net/wireless/libertas/main.c | 77 +-
drivers/net/wireless/libertas/mesh.c | 11 +-
drivers/net/wireless/libertas_tf/main.c | 3 +-
drivers/net/wireless/mac80211_hwsim.c | 8 +-
drivers/net/wireless/mwl8k.c | 516 ++-
drivers/net/wireless/orinoco/scan.c | 5 +
drivers/net/wireless/p54/Kconfig | 5 +-
drivers/net/wireless/p54/eeprom.c | 211 +-
drivers/net/wireless/p54/eeprom.h | 7 +
drivers/net/wireless/p54/fwio.c | 21 +-
drivers/net/wireless/p54/lmac.h | 3 +-
drivers/net/wireless/p54/main.c | 61 +-
drivers/net/wireless/p54/p54.h | 7 +-
drivers/net/wireless/p54/p54spi_eeprom.h | 9 +-
drivers/net/wireless/p54/txrx.c | 19 +-
drivers/net/wireless/rt2x00/Kconfig | 12 +
drivers/net/wireless/rt2x00/rt2400pci.c | 183 +-
drivers/net/wireless/rt2x00/rt2500pci.c | 179 +-
drivers/net/wireless/rt2x00/rt2500usb.c | 17 +-
drivers/net/wireless/rt2x00/rt2800.h | 139 +-
drivers/net/wireless/rt2x00/rt2800lib.c | 917 +++-
drivers/net/wireless/rt2x00/rt2800lib.h | 4 +-
drivers/net/wireless/rt2x00/rt2800pci.c | 239 +-
drivers/net/wireless/rt2x00/rt2800usb.c | 4 +-
drivers/net/wireless/rt2x00/rt2x00.h | 67 +-
drivers/net/wireless/rt2x00/rt2x00dev.c | 74 +-
drivers/net/wireless/rt2x00/rt2x00ht.c | 29 +-
drivers/net/wireless/rt2x00/rt2x00lib.h | 24 +-
drivers/net/wireless/rt2x00/rt2x00link.c | 7 +-
drivers/net/wireless/rt2x00/rt2x00mac.c | 75 +-
drivers/net/wireless/rt2x00/rt2x00pci.c | 7 +-
drivers/net/wireless/rt2x00/rt2x00queue.c | 178 +-
drivers/net/wireless/rt2x00/rt2x00queue.h | 29 +-
drivers/net/wireless/rt2x00/rt2x00reg.h | 2 -
drivers/net/wireless/rt2x00/rt2x00usb.c | 8 +-
drivers/net/wireless/rt2x00/rt61pci.c | 251 +-
drivers/net/wireless/rt2x00/rt73usb.c | 75 +-
drivers/net/wireless/rtl818x/rtl8180/dev.c | 10 +-
drivers/net/wireless/rtl818x/rtl8187/dev.c | 33 +-
drivers/net/wireless/rtl818x/rtl8187/rtl8187.h | 2 +
drivers/net/wireless/rtlwifi/Kconfig | 24 +-
drivers/net/wireless/rtlwifi/Makefile | 15 +-
drivers/net/wireless/rtlwifi/base.c | 91 +-
drivers/net/wireless/rtlwifi/base.h | 39 +-
drivers/net/wireless/rtlwifi/core.c | 26 +-
drivers/net/wireless/rtlwifi/debug.h | 1 +
drivers/net/wireless/rtlwifi/efuse.c | 18 -
drivers/net/wireless/rtlwifi/efuse.h | 3 -
drivers/net/wireless/rtlwifi/pci.c | 152 +-
drivers/net/wireless/rtlwifi/pci.h | 12 +-
drivers/net/wireless/rtlwifi/ps.c | 58 +-
drivers/net/wireless/rtlwifi/rtl8192c/Makefile | 9 +
drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c | 1398 ++++++
drivers/net/wireless/rtlwifi/rtl8192c/dm_common.h | 204 +
.../{rtl8192ce/fw.c => rtl8192c/fw_common.c} | 72 +-
.../{rtl8192ce/fw.h => rtl8192c/fw_common.h} | 0
.../iwl-3945-led.h => rtlwifi/rtl8192c/main.c} | 21 +-
drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c | 2042 ++++++++
drivers/net/wireless/rtlwifi/rtl8192c/phy_common.h | 246 +
drivers/net/wireless/rtlwifi/rtl8192ce/Makefile | 3 +-
drivers/net/wireless/rtlwifi/rtl8192ce/def.h | 144 +
drivers/net/wireless/rtlwifi/rtl8192ce/dm.c | 1364 +------
drivers/net/wireless/rtlwifi/rtl8192ce/dm.h | 1 +
drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | 158 +-
drivers/net/wireless/rtlwifi/rtl8192ce/hw.h | 11 +
drivers/net/wireless/rtlwifi/rtl8192ce/led.c | 6 +-
drivers/net/wireless/rtlwifi/rtl8192ce/phy.c | 2095 +--------
drivers/net/wireless/rtlwifi/rtl8192ce/phy.h | 35 +-
drivers/net/wireless/rtlwifi/rtl8192ce/reg.h | 73 +-
drivers/net/wireless/rtlwifi/rtl8192ce/rf.c | 10 +-
drivers/net/wireless/rtlwifi/rtl8192ce/rf.h | 5 +-
drivers/net/wireless/rtlwifi/rtl8192ce/sw.c | 22 +-
drivers/net/wireless/rtlwifi/rtl8192ce/sw.h | 14 +
drivers/net/wireless/rtlwifi/rtl8192ce/trx.c | 183 +-
drivers/net/wireless/rtlwifi/rtl8192ce/trx.h | 464 +-
drivers/net/wireless/rtlwifi/rtl8192cu/Makefile | 14 +
drivers/net/wireless/rtlwifi/rtl8192cu/def.h | 62 +
drivers/net/wireless/rtlwifi/rtl8192cu/dm.c | 113 +
.../iwl-3945-led.h => rtlwifi/rtl8192cu/dm.h} | 16 +-
drivers/net/wireless/rtlwifi/rtl8192cu/hw.c | 2504 ++++++++++
drivers/net/wireless/rtlwifi/rtl8192cu/hw.h | 116 +
drivers/net/wireless/rtlwifi/rtl8192cu/led.c | 142 +
.../iwl-3945-led.h => rtlwifi/rtl8192cu/led.h} | 19 +-
drivers/net/wireless/rtlwifi/rtl8192cu/mac.c | 1144 +++++
drivers/net/wireless/rtlwifi/rtl8192cu/mac.h | 180 +
drivers/net/wireless/rtlwifi/rtl8192cu/phy.c | 607 +++
.../iwl-3945-led.h => rtlwifi/rtl8192cu/phy.h} | 20 +-
.../iwl-3945-led.h => rtlwifi/rtl8192cu/reg.h} | 16 +-
drivers/net/wireless/rtlwifi/rtl8192cu/rf.c | 493 ++
.../iwl-3945-led.h => rtlwifi/rtl8192cu/rf.h} | 29 +-
drivers/net/wireless/rtlwifi/rtl8192cu/sw.c | 336 ++
drivers/net/wireless/rtlwifi/rtl8192cu/sw.h | 53 +
drivers/net/wireless/rtlwifi/rtl8192cu/table.c | 1888 ++++++++
drivers/net/wireless/rtlwifi/rtl8192cu/table.h | 71 +
drivers/net/wireless/rtlwifi/rtl8192cu/trx.c | 687 +++
drivers/net/wireless/rtlwifi/rtl8192cu/trx.h | 430 ++
drivers/net/wireless/rtlwifi/usb.c | 1035 ++++
drivers/net/wireless/rtlwifi/usb.h | 164 +
drivers/net/wireless/rtlwifi/wifi.h | 680 ++-
drivers/net/wireless/wl1251/acx.c | 53 +
drivers/net/wireless/wl1251/acx.h | 72 +
drivers/net/wireless/wl1251/event.c | 18 +
drivers/net/wireless/wl1251/main.c | 22 +-
drivers/net/wireless/wl1251/ps.c | 52 +-
drivers/net/wireless/wl1251/rx.c | 51 +-
drivers/net/wireless/wl1251/tx.c | 74 +-
drivers/net/wireless/wl1251/wl1251.h | 7 +
drivers/net/wireless/wl1251/wl12xx_80211.h | 3 +-
drivers/net/wireless/wl12xx/Kconfig | 2 +-
drivers/net/wireless/wl12xx/acx.c | 277 +-
drivers/net/wireless/wl12xx/acx.h | 141 +-
drivers/net/wireless/wl12xx/boot.c | 38 +-
drivers/net/wireless/wl12xx/boot.h | 5 +
drivers/net/wireless/wl12xx/cmd.c | 319 ++-
drivers/net/wireless/wl12xx/cmd.h | 161 +-
drivers/net/wireless/wl12xx/conf.h | 125 +-
drivers/net/wireless/wl12xx/debugfs.c | 51 +-
drivers/net/wireless/wl12xx/event.c | 21 +-
drivers/net/wireless/wl12xx/event.h | 10 +-
drivers/net/wireless/wl12xx/init.c | 400 ++-
drivers/net/wireless/wl12xx/init.h | 2 +-
drivers/net/wireless/wl12xx/io.h | 1 +
drivers/net/wireless/wl12xx/main.c | 1462 +++++--
drivers/net/wireless/wl12xx/ps.c | 90 +-
drivers/net/wireless/wl12xx/ps.h | 4 +-
drivers/net/wireless/wl12xx/rx.c | 37 +-
drivers/net/wireless/wl12xx/rx.h | 17 +-
drivers/net/wireless/wl12xx/scan.c | 20 +-
drivers/net/wireless/wl12xx/sdio.c | 43 +-
drivers/net/wireless/wl12xx/spi.c | 21 +-
drivers/net/wireless/wl12xx/tx.c | 365 ++-
drivers/net/wireless/wl12xx/tx.h | 15 +-
drivers/net/wireless/wl12xx/wl12xx.h | 211 +-
drivers/net/wireless/wl12xx/wl12xx_80211.h | 14 +-
drivers/net/wireless/zd1211rw/zd_chip.c | 169 +-
drivers/net/wireless/zd1211rw/zd_chip.h | 5 +-
drivers/net/wireless/zd1211rw/zd_def.h | 2 +-
drivers/net/wireless/zd1211rw/zd_mac.c | 453 ++-
drivers/net/wireless/zd1211rw/zd_mac.h | 24 +-
drivers/net/wireless/zd1211rw/zd_usb.c | 597 ++-
drivers/net/wireless/zd1211rw/zd_usb.h | 37 +-
drivers/net/xen-netback/Makefile | 3 +
drivers/net/xen-netback/common.h | 161 +
drivers/net/xen-netback/interface.c | 424 ++
drivers/net/xen-netback/netback.c | 1745 +++++++
drivers/net/xen-netback/xenbus.c | 490 ++
drivers/net/xen-netfront.c | 24 +-
drivers/s390/net/qeth_core.h | 4 +-
drivers/s390/net/qeth_core_main.c | 57 +-
drivers/s390/net/qeth_l2_main.c | 45 +-
drivers/s390/net/qeth_l3_main.c | 60 +-
drivers/scsi/cxgbi/cxgb3i/Kconfig | 4 +-
drivers/scsi/cxgbi/cxgb4i/Kconfig | 4 +-
drivers/scsi/cxgbi/libcxgbi.c | 21 +-
drivers/scsi/fcoe/fcoe.c | 4 +-
drivers/ssb/main.c | 44 +-
drivers/ssb/pci.c | 6 +-
drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c | 4 +-
drivers/staging/brcm80211/sys/wl_mac80211.c | 28 +-
drivers/staging/brcm80211/sys/wlc_mac80211.c | 5 +-
drivers/staging/pohmelfs/config.c | 2 +-
drivers/staging/winbond/wbusb.c | 7 +-
drivers/video/uvesafb.c | 2 +-
drivers/xen/events.c | 38 +
firmware/Makefile | 2 +-
firmware/WHENCE | 2 +-
...9-6.2.1.fw.ihex => bnx2-mips-09-6.2.1a.fw.ihex} | 5006 ++++++++++----------
include/linux/audit.h | 2 +
include/linux/cpu_rmap.h | 73 +
include/linux/dcbnl.h | 113 +-
include/linux/dccp.h | 2 -
include/linux/ethtool.h | 91 +-
include/linux/icmpv6.h | 4 +-
include/linux/ieee80211.h | 3 +
include/linux/if.h | 9 +-
include/linux/if_link.h | 1 +
include/linux/igmp.h | 2 +-
include/linux/inetdevice.h | 1 +
include/linux/interrupt.h | 33 +-
include/linux/ip_vs.h | 8 +
include/linux/irqdesc.h | 3 +
include/linux/micrel_phy.h | 16 +
include/linux/net.h | 3 +-
include/linux/netdevice.h | 305 ++-
include/linux/netfilter.h | 27 +-
include/linux/netfilter/Kbuild | 7 +
include/linux/netfilter/ipset/Kbuild | 4 +
include/linux/netfilter/ipset/ip_set.h | 452 ++
include/linux/netfilter/ipset/ip_set_ahash.h | 1074 +++++
include/linux/netfilter/ipset/ip_set_bitmap.h | 31 +
include/linux/netfilter/ipset/ip_set_getport.h | 21 +
include/linux/netfilter/ipset/ip_set_hash.h | 26 +
include/linux/netfilter/ipset/ip_set_list.h | 27 +
include/linux/netfilter/ipset/ip_set_timeout.h | 127 +
include/linux/netfilter/ipset/pfxlen.h | 35 +
include/linux/netfilter/nf_conntrack_snmp.h | 9 +
include/linux/netfilter/nfnetlink.h | 3 +-
include/linux/netfilter/nfnetlink_conntrack.h | 9 +
include/linux/netfilter/x_tables.h | 3 +-
include/linux/netfilter/xt_AUDIT.h | 30 +
include/linux/netfilter/xt_CT.h | 12 +-
include/linux/netfilter/xt_NFQUEUE.h | 6 +
include/linux/netfilter/xt_TCPOPTSTRIP.h | 4 +-
include/linux/netfilter/xt_TPROXY.h | 10 +-
include/linux/netfilter/xt_addrtype.h | 44 +
include/linux/netfilter/xt_cluster.h | 10 +-
include/linux/netfilter/xt_comment.h | 2 +-
include/linux/netfilter/xt_connlimit.h | 16 +-
include/linux/netfilter/xt_conntrack.h | 15 +
include/linux/netfilter/xt_devgroup.h | 21 +
include/linux/netfilter/xt_quota.h | 8 +-
include/linux/netfilter/xt_set.h | 56 +
include/linux/netfilter/xt_socket.h | 2 +
include/linux/netfilter/xt_time.h | 16 +-
include/linux/netfilter/xt_u32.h | 18 +-
include/linux/netfilter_bridge/ebt_802_3.h | 26 +-
include/linux/netfilter_bridge/ebt_among.h | 4 +-
include/linux/netfilter_bridge/ebt_arp.h | 6 +-
include/linux/netfilter_bridge/ebt_ip.h | 14 +-
include/linux/netfilter_bridge/ebt_ip6.h | 25 +-
include/linux/netfilter_bridge/ebt_limit.h | 10 +-
include/linux/netfilter_bridge/ebt_log.h | 8 +-
include/linux/netfilter_bridge/ebt_mark_m.h | 6 +-
include/linux/netfilter_bridge/ebt_nflog.h | 12 +-
include/linux/netfilter_bridge/ebt_pkttype.h | 6 +-
include/linux/netfilter_bridge/ebt_stp.h | 26 +-
include/linux/netfilter_bridge/ebt_ulog.h | 4 +-
include/linux/netfilter_bridge/ebt_vlan.h | 10 +-
include/linux/netfilter_ipv4/ipt_CLUSTERIP.h | 16 +-
include/linux/netfilter_ipv4/ipt_ECN.h | 8 +-
include/linux/netfilter_ipv4/ipt_SAME.h | 8 +-
include/linux/netfilter_ipv4/ipt_TTL.h | 6 +-
include/linux/netfilter_ipv4/ipt_addrtype.h | 16 +-
include/linux/netfilter_ipv4/ipt_ah.h | 6 +-
include/linux/netfilter_ipv4/ipt_ecn.h | 10 +-
include/linux/netfilter_ipv4/ipt_ttl.h | 6 +-
include/linux/netfilter_ipv6/ip6t_HL.h | 6 +-
include/linux/netfilter_ipv6/ip6t_REJECT.h | 4 +-
include/linux/netfilter_ipv6/ip6t_ah.h | 10 +-
include/linux/netfilter_ipv6/ip6t_frag.h | 10 +-
include/linux/netfilter_ipv6/ip6t_hl.h | 6 +-
include/linux/netfilter_ipv6/ip6t_ipv6header.h | 8 +-
include/linux/netfilter_ipv6/ip6t_mh.h | 6 +-
include/linux/netfilter_ipv6/ip6t_opts.h | 12 +-
include/linux/netfilter_ipv6/ip6t_rt.h | 13 +-
include/linux/netlink.h | 4 -
include/linux/nl80211.h | 3 +
include/linux/pci.h | 1 +
include/linux/phonet.h | 4 +-
include/linux/pkt_sched.h | 107 +
include/linux/security.h | 7 +-
include/linux/skbuff.h | 16 +-
include/linux/sockios.h | 4 +-
include/linux/ssb/ssb_regs.h | 7 +-
include/linux/tipc.h | 8 +-
include/linux/tipc_config.h | 38 +-
include/linux/xfrm.h | 13 +
include/net/bluetooth/bluetooth.h | 33 +
include/net/bluetooth/hci.h | 139 +
include/net/bluetooth/hci_core.h | 173 +-
include/net/bluetooth/l2cap.h | 53 +-
include/net/bluetooth/mgmt.h | 171 +-
include/net/bluetooth/smp.h | 76 +
include/net/cfg80211.h | 16 +-
include/net/dcbnl.h | 9 +
include/net/dn.h | 6 +-
include/net/dn_fib.h | 8 +-
include/net/dn_route.h | 8 +-
include/net/dst.h | 142 +-
include/net/dst_ops.h | 1 +
include/net/flow.h | 204 +-
include/net/icmp.h | 3 -
include/net/ieee80211_radiotap.h | 25 +
include/net/inet_sock.h | 31 +-
include/net/inetpeer.h | 44 +-
include/net/ip.h | 16 +
include/net/ip6_fib.h | 5 +-
include/net/ip6_route.h | 2 +-
include/net/ip_fib.h | 43 +-
include/net/ip_vs.h | 477 ++-
include/net/ipv6.h | 28 +-
include/net/mac80211.h | 106 +-
include/net/net_namespace.h | 2 +
include/net/netevent.h | 1 -
include/net/netfilter/nf_conntrack.h | 23 +-
include/net/netfilter/nf_conntrack_ecache.h | 12 +-
include/net/netfilter/nf_conntrack_extend.h | 10 +
include/net/netfilter/nf_conntrack_helper.h | 6 +
include/net/netfilter/nf_conntrack_l3proto.h | 2 +-
include/net/netfilter/nf_conntrack_timestamp.h | 65 +
include/net/netfilter/nf_nat.h | 6 +
include/net/netfilter/nf_nat_core.h | 4 +-
include/net/netlink.h | 9 +
include/net/netns/conntrack.h | 4 +-
include/net/netns/ipv4.h | 1 -
include/net/phonet/pep.h | 23 +-
include/net/phonet/phonet.h | 1 +
include/net/protocol.h | 4 +-
include/net/route.h | 164 +-
include/net/sch_generic.h | 60 +-
include/net/sock.h | 9 +-
include/net/tcp.h | 16 +-
include/net/transp_v6.h | 4 +-
include/net/udp.h | 13 +-
include/net/udplite.h | 12 +
include/net/xfrm.h | 213 +-
include/xen/events.h | 6 +
include/xen/interface/io/netif.h | 80 +-
kernel/audit.c | 8 +-
kernel/auditfilter.c | 10 +-
kernel/irq/manage.c | 82 +
lib/Kconfig | 13 +-
lib/Makefile | 2 +
lib/cpu_rmap.c | 269 ++
net/8021q/vlan.c | 2 +-
net/8021q/vlan_dev.c | 14 +
net/9p/trans_rdma.c | 1 -
net/Kconfig | 6 +
net/atm/clip.c | 8 +-
net/batman-adv/Makefile | 2 +-
net/batman-adv/aggregation.c | 10 +-
net/batman-adv/aggregation.h | 6 +-
net/batman-adv/bat_debugfs.c | 6 +-
net/batman-adv/bat_debugfs.h | 2 +-
net/batman-adv/bat_sysfs.c | 53 +-
net/batman-adv/bat_sysfs.h | 2 +-
net/batman-adv/bitarray.c | 2 +-
net/batman-adv/bitarray.h | 2 +-
net/batman-adv/gateway_client.c | 142 +-
net/batman-adv/gateway_client.h | 2 +-
net/batman-adv/gateway_common.c | 2 +-
net/batman-adv/gateway_common.h | 2 +-
net/batman-adv/hard-interface.c | 420 +-
net/batman-adv/hard-interface.h | 21 +-
net/batman-adv/hash.c | 28 +-
net/batman-adv/hash.h | 119 +-
net/batman-adv/icmp_socket.c | 43 +-
net/batman-adv/icmp_socket.h | 4 +-
net/batman-adv/main.c | 16 +-
net/batman-adv/main.h | 29 +-
net/batman-adv/originator.c | 254 +-
net/batman-adv/originator.h | 52 +-
net/batman-adv/packet.h | 3 +-
net/batman-adv/ring_buffer.c | 2 +-
net/batman-adv/ring_buffer.h | 2 +-
net/batman-adv/routing.c | 1000 +++--
net/batman-adv/routing.h | 30 +-
net/batman-adv/send.c | 110 +-
net/batman-adv/send.h | 12 +-
net/batman-adv/soft-interface.c | 77 +-
net/batman-adv/soft-interface.h | 5 +-
net/batman-adv/translation-table.c | 208 +-
net/batman-adv/translation-table.h | 4 +-
net/batman-adv/types.h | 50 +-
net/batman-adv/unicast.c | 121 +-
net/batman-adv/unicast.h | 27 +-
net/batman-adv/vis.c | 194 +-
net/batman-adv/vis.h | 2 +-
net/bluetooth/Kconfig | 20 +-
net/bluetooth/Makefile | 4 +-
net/bluetooth/af_bluetooth.c | 51 +-
net/bluetooth/bnep/core.c | 2 -
net/bluetooth/bnep/sock.c | 1 +
net/bluetooth/cmtp/capi.c | 3 +-
net/bluetooth/cmtp/core.c | 11 +-
net/bluetooth/hci_conn.c | 80 +-
net/bluetooth/hci_core.c | 345 ++-
net/bluetooth/hci_event.c | 691 +++-
net/bluetooth/hci_sock.c | 8 +-
net/bluetooth/hci_sysfs.c | 58 +-
net/bluetooth/hidp/core.c | 11 +-
net/bluetooth/{l2cap.c => l2cap_core.c} | 1723 ++-----
net/bluetooth/l2cap_sock.c | 1156 +++++
net/bluetooth/mgmt.c | 1585 ++++++-
net/bluetooth/rfcomm/core.c | 2 -
net/bluetooth/sco.c | 24 +-
net/bridge/br_device.c | 21 +
net/bridge/br_if.c | 15 +-
net/bridge/br_input.c | 25 +-
net/bridge/br_netfilter.c | 14 +-
net/bridge/br_private.h | 4 +-
net/bridge/br_stp.c | 39 +-
net/bridge/br_stp_timer.c | 1 +
net/bridge/netfilter/ebt_ip6.c | 46 +-
net/bridge/netfilter/ebtables.c | 3 +
net/caif/cfcnfg.c | 2 -
net/caif/cfdgml.c | 1 -
net/caif/cfserl.c | 1 -
net/caif/cfutill.c | 2 +-
net/caif/cfveil.c | 2 +-
net/core/dev.c | 463 ++-
net/core/dst.c | 43 +-
net/core/ethtool.c | 604 ++-
net/core/fib_rules.c | 6 +-
net/core/filter.c | 6 +-
net/core/flow.c | 14 +-
net/core/neighbour.c | 13 +-
net/core/net-sysfs.c | 17 +-
net/core/netpoll.c | 13 +-
net/core/pktgen.c | 233 +-
net/core/rtnetlink.c | 86 +-
net/core/skbuff.c | 8 +-
net/dcb/dcbnl.c | 148 +-
net/dccp/ccids/ccid2.c | 9 +
net/dccp/ipv4.c | 50 +-
net/dccp/ipv6.c | 188 +-
net/decnet/af_decnet.c | 16 +-
net/decnet/dn_fib.c | 23 +-
net/decnet/dn_nsp_out.c | 16 +-
net/decnet/dn_route.c | 300 +-
net/decnet/dn_rules.c | 17 +-
net/decnet/dn_table.c | 7 +-
net/dsa/mv88e6060.c | 7 +-
net/ipv4/Kconfig | 42 +-
net/ipv4/Makefile | 4 +-
net/ipv4/af_inet.c | 46 +-
net/ipv4/ah4.c | 27 +-
net/ipv4/arp.c | 25 +-
net/ipv4/datagram.c | 11 +-
net/ipv4/devinet.c | 78 +
net/ipv4/esp4.c | 104 +-
net/ipv4/fib_frontend.c | 105 +-
net/ipv4/fib_hash.c | 1133 -----
net/ipv4/fib_lookup.h | 10 +-
net/ipv4/fib_rules.c | 25 +-
net/ipv4/fib_semantics.c | 257 +-
net/ipv4/fib_trie.c | 272 +-
net/ipv4/icmp.c | 240 +-
net/ipv4/igmp.c | 45 +-
net/ipv4/inet_connection_sock.c | 27 +-
net/ipv4/inetpeer.c | 148 +-
net/ipv4/ip_gre.c | 56 +-
net/ipv4/ip_input.c | 2 +-
net/ipv4/ip_output.c | 345 +-
net/ipv4/ipip.c | 39 +-
net/ipv4/ipmr.c | 79 +-
net/ipv4/netfilter.c | 36 +-
net/ipv4/netfilter/Kconfig | 13 +-
net/ipv4/netfilter/Makefile | 1 -
net/ipv4/netfilter/arp_tables.c | 5 +
net/ipv4/netfilter/ip_tables.c | 5 +
net/ipv4/netfilter/ipt_CLUSTERIP.c | 7 +-
net/ipv4/netfilter/ipt_LOG.c | 3 +-
net/ipv4/netfilter/ipt_addrtype.c | 134 -
net/ipv4/netfilter/iptable_mangle.c | 2 +-
.../netfilter/nf_conntrack_l3proto_ipv4_compat.c | 17 +-
net/ipv4/netfilter/nf_nat_amanda.c | 8 +-
net/ipv4/netfilter/nf_nat_core.c | 33 +-
net/ipv4/netfilter/nf_nat_snmp_basic.c | 9 +-
net/ipv4/netfilter/nf_nat_standalone.c | 9 +-
net/ipv4/raw.c | 39 +-
net/ipv4/route.c | 1181 +++---
net/ipv4/syncookies.c | 25 +-
net/ipv4/tcp.c | 20 +-
net/ipv4/tcp_bic.c | 2 +-
net/ipv4/tcp_cubic.c | 47 +-
net/ipv4/tcp_highspeed.c | 2 +-
net/ipv4/tcp_htcp.c | 2 +-
net/ipv4/tcp_hybla.c | 2 +-
net/ipv4/tcp_illinois.c | 2 +-
net/ipv4/tcp_input.c | 4 +-
net/ipv4/tcp_ipv4.c | 37 +-
net/ipv4/tcp_lp.c | 2 +-
net/ipv4/tcp_scalable.c | 2 +-
net/ipv4/tcp_timer.c | 3 -
net/ipv4/tcp_vegas.c | 2 +-
net/ipv4/tcp_veno.c | 2 +-
net/ipv4/tcp_westwood.c | 2 +-
net/ipv4/tcp_yeah.c | 2 +-
net/ipv4/udp.c | 139 +-
net/ipv4/xfrm4_policy.c | 74 +-
net/ipv4/xfrm4_state.c | 20 +-
net/ipv6/addrconf.c | 3 -
net/ipv6/af_inet6.c | 49 +-
net/ipv6/ah6.c | 2 +-
net/ipv6/datagram.c | 88 +-
net/ipv6/esp6.c | 109 +-
net/ipv6/exthdrs.c | 12 +-
net/ipv6/fib6_rules.c | 19 +-
net/ipv6/icmp.c | 226 +-
net/ipv6/inet6_connection_sock.c | 81 +-
net/ipv6/ip6_fib.c | 4 +-
net/ipv6/ip6_flowlabel.c | 6 +-
net/ipv6/ip6_output.c | 156 +-
net/ipv6/ip6_tunnel.c | 82 +-
net/ipv6/ip6mr.c | 56 +-
net/ipv6/ipv6_sockglue.c | 10 +-
net/ipv6/mcast.c | 27 +-
net/ipv6/mip6.c | 16 +-
net/ipv6/ndisc.c | 22 +-
net/ipv6/netfilter.c | 19 +-
net/ipv6/netfilter/ip6_tables.c | 5 +
net/ipv6/netfilter/ip6t_LOG.c | 3 +-
net/ipv6/netfilter/ip6t_REJECT.c | 21 +-
net/ipv6/netfilter/nf_conntrack_reasm.c | 3 +-
net/ipv6/raw.c | 106 +-
net/ipv6/route.c | 186 +-
net/ipv6/sit.c | 56 +-
net/ipv6/syncookies.c | 31 +-
net/ipv6/tcp_ipv6.c | 169 +-
net/ipv6/udp.c | 91 +-
net/ipv6/xfrm6_policy.c | 49 +-
net/ipv6/xfrm6_state.c | 20 +-
net/key/af_key.c | 243 +-
net/l2tp/l2tp_ip.c | 36 +-
net/llc/llc_input.c | 25 +-
net/mac80211/Kconfig | 4 +-
net/mac80211/agg-rx.c | 7 +-
net/mac80211/agg-tx.c | 23 +-
net/mac80211/cfg.c | 116 +-
net/mac80211/chan.c | 3 +
net/mac80211/debugfs.c | 6 +
net/mac80211/debugfs_netdev.c | 122 +-
net/mac80211/driver-ops.h | 67 +-
net/mac80211/driver-trace.h | 274 +-
net/mac80211/ht.c | 5 +-
net/mac80211/ibss.c | 21 +-
net/mac80211/ieee80211_i.h | 17 +-
net/mac80211/iface.c | 9 +-
net/mac80211/key.h | 1 -
net/mac80211/main.c | 88 +-
net/mac80211/mesh.c | 4 +-
net/mac80211/mlme.c | 144 +-
net/mac80211/offchannel.c | 68 +-
net/mac80211/rc80211_minstrel_ht.c | 60 +-
net/mac80211/rc80211_pid.h | 3 -
net/mac80211/rx.c | 130 +-
net/mac80211/scan.c | 138 +-
net/mac80211/sta_info.c | 3 +-
net/mac80211/sta_info.h | 6 +
net/mac80211/status.c | 10 +-
net/mac80211/tx.c | 194 +-
net/mac80211/util.c | 6 -
net/mac80211/work.c | 122 +-
net/mac80211/wpa.c | 39 +-
net/netfilter/Kconfig | 77 +-
net/netfilter/Makefile | 10 +
net/netfilter/core.c | 20 +-
net/netfilter/ipset/Kconfig | 122 +
net/netfilter/ipset/Makefile | 24 +
net/netfilter/ipset/ip_set_bitmap_ip.c | 587 +++
net/netfilter/ipset/ip_set_bitmap_ipmac.c | 652 +++
net/netfilter/ipset/ip_set_bitmap_port.c | 515 ++
net/netfilter/ipset/ip_set_core.c | 1671 +++++++
net/netfilter/ipset/ip_set_getport.c | 141 +
net/netfilter/ipset/ip_set_hash_ip.c | 464 ++
net/netfilter/ipset/ip_set_hash_ipport.c | 544 +++
net/netfilter/ipset/ip_set_hash_ipportip.c | 562 +++
net/netfilter/ipset/ip_set_hash_ipportnet.c | 628 +++
net/netfilter/ipset/ip_set_hash_net.c | 458 ++
net/netfilter/ipset/ip_set_hash_netport.c | 578 +++
net/netfilter/ipset/ip_set_list_set.c | 584 +++
net/netfilter/ipset/pfxlen.c | 291 ++
net/netfilter/ipvs/ip_vs_app.c | 98 +-
net/netfilter/ipvs/ip_vs_conn.c | 248 +-
net/netfilter/ipvs/ip_vs_core.c | 456 ++-
net/netfilter/ipvs/ip_vs_ctl.c | 1002 +++--
net/netfilter/ipvs/ip_vs_est.c | 171 +-
net/netfilter/ipvs/ip_vs_ftp.c | 61 +-
net/netfilter/ipvs/ip_vs_lblc.c | 99 +-
net/netfilter/ipvs/ip_vs_lblcr.c | 114 +-
net/netfilter/ipvs/ip_vs_lc.c | 20 +-
net/netfilter/ipvs/ip_vs_nfct.c | 6 +-
net/netfilter/ipvs/ip_vs_nq.c | 2 +-
net/netfilter/ipvs/ip_vs_pe.c | 17 +-
net/netfilter/ipvs/ip_vs_pe_sip.c | 12 +-
net/netfilter/ipvs/ip_vs_proto.c | 129 +-
net/netfilter/ipvs/ip_vs_proto_ah_esp.c | 45 +-
net/netfilter/ipvs/ip_vs_proto_sctp.c | 153 +-
net/netfilter/ipvs/ip_vs_proto_tcp.c | 142 +-
net/netfilter/ipvs/ip_vs_proto_udp.c | 110 +-
net/netfilter/ipvs/ip_vs_rr.c | 2 +-
net/netfilter/ipvs/ip_vs_sched.c | 25 +
net/netfilter/ipvs/ip_vs_sed.c | 2 +-
net/netfilter/ipvs/ip_vs_sh.c | 2 +-
net/netfilter/ipvs/ip_vs_sync.c | 1238 ++++-
net/netfilter/ipvs/ip_vs_wlc.c | 22 +-
net/netfilter/ipvs/ip_vs_wrr.c | 14 +-
net/netfilter/ipvs/ip_vs_xmit.c | 117 +-
net/netfilter/nf_conntrack_broadcast.c | 82 +
net/netfilter/nf_conntrack_core.c | 58 +-
net/netfilter/nf_conntrack_expect.c | 34 +-
net/netfilter/nf_conntrack_extend.c | 11 +-
net/netfilter/nf_conntrack_h323_main.c | 32 +-
net/netfilter/nf_conntrack_helper.c | 20 +-
net/netfilter/nf_conntrack_netbios_ns.c | 74 +-
net/netfilter/nf_conntrack_netlink.c | 49 +-
net/netfilter/nf_conntrack_proto.c | 24 +-
net/netfilter/nf_conntrack_proto_dccp.c | 3 +
net/netfilter/nf_conntrack_proto_sctp.c | 1 +
net/netfilter/nf_conntrack_proto_tcp.c | 18 +-
net/netfilter/nf_conntrack_snmp.c | 77 +
net/netfilter/nf_conntrack_standalone.c | 45 +-
net/netfilter/nf_conntrack_timestamp.c | 120 +
net/netfilter/nf_log.c | 6 +-
net/netfilter/nf_queue.c | 82 +-
net/netfilter/nfnetlink_log.c | 9 +-
net/netfilter/nfnetlink_queue.c | 22 +-
net/netfilter/x_tables.c | 124 +-
net/netfilter/xt_AUDIT.c | 222 +
net/netfilter/xt_CLASSIFY.c | 36 +-
net/netfilter/xt_IDLETIMER.c | 2 +
net/netfilter/xt_LED.c | 2 +
net/netfilter/xt_NFQUEUE.c | 34 +-
net/netfilter/xt_TCPMSS.c | 15 +-
net/netfilter/xt_TEE.c | 27 +-
net/netfilter/xt_addrtype.c | 229 +
net/netfilter/xt_connlimit.c | 99 +-
net/netfilter/xt_conntrack.c | 80 +-
net/netfilter/xt_cpu.c | 2 +
net/netfilter/xt_devgroup.c | 82 +
net/netfilter/xt_iprange.c | 18 +-
net/netfilter/xt_ipvs.c | 2 +-
net/netfilter/xt_set.c | 359 ++
net/netlabel/netlabel_user.h | 6 +-
net/netlink/af_netlink.c | 9 -
net/packet/af_packet.c | 41 +-
net/phonet/Kconfig | 12 -
net/phonet/af_phonet.c | 32 +-
net/phonet/pep.c | 834 ++--
net/phonet/socket.c | 126 +-
net/rds/rds.h | 1 -
net/rose/af_rose.c | 7 -
net/rose/rose_route.c | 28 +-
net/rxrpc/ar-peer.c | 28 +-
net/sched/Kconfig | 39 +-
net/sched/Makefile | 4 +
net/sched/act_api.c | 46 +-
net/sched/act_csum.c | 2 +-
net/sched/act_gact.c | 8 +-
net/sched/act_ipt.c | 16 +-
net/sched/act_mirred.c | 4 +-
net/sched/act_nat.c | 2 +-
net/sched/act_pedit.c | 10 +-
net/sched/act_police.c | 9 +-
net/sched/act_simple.c | 10 +-
net/sched/act_skbedit.c | 8 +-
net/sched/cls_api.c | 33 +-
net/sched/cls_basic.c | 17 +-
net/sched/cls_cgroup.c | 8 +-
net/sched/cls_flow.c | 6 +-
net/sched/cls_fw.c | 38 +-
net/sched/cls_route.c | 126 +-
net/sched/cls_rsvp.h | 95 +-
net/sched/cls_tcindex.c | 2 +-
net/sched/cls_u32.c | 89 +-
net/sched/em_cmp.c | 47 +-
net/sched/em_meta.c | 48 +-
net/sched/em_nbyte.c | 3 +-
net/sched/em_text.c | 3 +-
net/sched/em_u32.c | 2 +-
net/sched/ematch.c | 37 +-
net/sched/sch_api.c | 173 +-
net/sched/sch_atm.c | 16 +-
net/sched/sch_cbq.c | 362 +-
net/sched/sch_choke.c | 688 +++
net/sched/sch_dsmark.c | 21 +-
net/sched/sch_fifo.c | 50 +-
net/sched/sch_generic.c | 58 +-
net/sched/sch_gred.c | 85 +-
net/sched/sch_hfsc.c | 37 +-
net/sched/sch_htb.c | 106 +-
net/sched/sch_mq.c | 1 -
net/sched/sch_mqprio.c | 418 ++
net/sched/sch_multiq.c | 8 +-
net/sched/sch_netem.c | 411 ++-
net/sched/sch_prio.c | 34 +-
net/sched/sch_red.c | 61 +-
net/sched/sch_sfb.c | 709 +++
net/sched/sch_sfq.c | 67 +-
net/sched/sch_tbf.c | 39 +-
net/sched/sch_teql.c | 36 +-
net/sctp/associola.c | 2 -
net/sctp/input.c | 3 -
net/sctp/ipv6.c | 42 +-
net/sctp/outqueue.c | 2 -
net/sctp/protocol.c | 33 +-
net/sctp/sm_make_chunk.c | 3 -
net/sctp/socket.c | 11 +-
net/sctp/tsnmap.c | 2 +-
net/sctp/ulpqueue.c | 7 +-
net/socket.c | 31 +-
net/sunrpc/svcsock.c | 32 +-
net/tipc/Kconfig | 12 -
net/tipc/addr.c | 15 +-
net/tipc/addr.h | 17 +-
net/tipc/bcast.c | 47 +-
net/tipc/bcast.h | 3 +-
net/tipc/bearer.c | 116 +-
net/tipc/bearer.h | 73 +-
net/tipc/config.c | 31 +-
net/tipc/core.c | 9 +-
net/tipc/core.h | 4 +-
net/tipc/discover.c | 140 +-
net/tipc/discover.h | 9 +-
net/tipc/link.c | 130 +-
net/tipc/link.h | 29 +-
net/tipc/msg.c | 41 +-
net/tipc/msg.h | 64 +-
net/tipc/name_distr.c | 18 +-
net/tipc/net.c | 32 +-
net/tipc/net.h | 19 +-
net/tipc/node.c | 125 +-
net/tipc/node.h | 36 +-
net/tipc/node_subscr.c | 21 +-
net/tipc/node_subscr.h | 3 +-
net/tipc/port.c | 306 +-
net/tipc/port.h | 73 +-
net/tipc/socket.c | 76 +-
net/tipc/subscr.c | 13 +-
net/unix/af_unix.c | 72 +-
net/wanrouter/wanmain.c | 2 -
net/wireless/core.c | 20 +-
net/wireless/ethtool.c | 33 +
net/wireless/nl80211.c | 62 +-
net/wireless/reg.c | 45 +-
net/wireless/reg.h | 1 +
net/wireless/util.c | 47 +-
net/wireless/wext-compat.c | 5 +-
net/xfrm/Makefile | 2 +-
net/xfrm/xfrm_algo.c | 8 +-
net/xfrm/xfrm_hash.h | 32 +-
net/xfrm/xfrm_input.c | 13 +-
net/xfrm/xfrm_output.c | 15 +-
net/xfrm/xfrm_policy.c | 218 +-
net/xfrm/xfrm_replay.c | 534 +++
net/xfrm/xfrm_state.c | 175 +-
net/xfrm/xfrm_user.c | 209 +-
security/capability.c | 2 +-
security/commoncap.c | 3 +-
security/security.c | 7 +-
security/selinux/hooks.c | 8 +-
security/selinux/include/xfrm.h | 2 +-
security/selinux/xfrm.c | 6 +-
1146 files changed, 118995 insertions(+), 38180 deletions(-)
create mode 100644 crypto/authencesn.c
create mode 100644 drivers/net/bonding/bond_procfs.c
create mode 100644 drivers/net/can/c_can/Kconfig
create mode 100644 drivers/net/can/c_can/Makefile
create mode 100644 drivers/net/can/c_can/c_can.c
create mode 100644 drivers/net/can/c_can/c_can.h
create mode 100644 drivers/net/can/c_can/c_can_platform.c
create mode 100644 drivers/net/enic/enic_dev.c
create mode 100644 drivers/net/enic/enic_dev.h
create mode 100644 drivers/net/ftmac100.c
create mode 100644 drivers/net/ftmac100.h
create mode 100644 drivers/net/wireless/ath/ath5k/trace.h
delete mode 100644 drivers/net/wireless/ath/ath9k/virtual.c
create mode 100644 drivers/net/wireless/iwlegacy/Kconfig
create mode 100644 drivers/net/wireless/iwlegacy/Makefile
rename drivers/net/wireless/{iwlwifi => iwlegacy}/iwl-3945-debugfs.c (99%)
copy drivers/net/wireless/{iwlwifi => iwlegacy}/iwl-3945-debugfs.h (95%)
rename drivers/net/wireless/{iwlwifi => iwlegacy}/iwl-3945-fh.h (98%)
rename drivers/net/wireless/{iwlwifi => iwlegacy}/iwl-3945-hw.h (96%)
copy drivers/net/wireless/{iwlwifi => iwlegacy}/iwl-3945-led.c (73%)
copy drivers/net/wireless/{iwlwifi => iwlegacy}/iwl-3945-led.h (95%)
rename drivers/net/wireless/{iwlwifi => iwlegacy}/iwl-3945-rs.c (96%)
rename drivers/net/wireless/{iwlwifi => iwlegacy}/iwl-3945.c (92%)
rename drivers/net/wireless/{iwlwifi => iwlegacy}/iwl-3945.h (97%)
create mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-calib.c
copy drivers/net/wireless/{iwlwifi/iwl-legacy.h => iwlegacy/iwl-4965-calib.h} (80%)
create mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-debugfs.c
rename drivers/net/wireless/{iwlwifi/iwl-3945-debugfs.h => iwlegacy/iwl-4965-debugfs.h} (61%)
rename drivers/net/wireless/{iwlwifi/iwl-legacy.h => iwlegacy/iwl-4965-eeprom.c} (53%)
rename drivers/net/wireless/{iwlwifi => iwlegacy}/iwl-4965-hw.h (97%)
rename drivers/net/wireless/{iwlwifi/iwl-3945-led.c => iwlegacy/iwl-4965-led.c} (65%)
copy drivers/net/wireless/{iwlwifi/iwl-3945-led.h => iwlegacy/iwl-4965-led.h} (81%)
create mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-lib.c
create mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-rs.c
rename drivers/net/wireless/{iwlwifi/iwl-agn-rx.c => iwlegacy/iwl-4965-rx.c} (59%)
create mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-sta.c
create mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-tx.c
create mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-ucode.c
rename drivers/net/wireless/{iwlwifi => iwlegacy}/iwl-4965.c (71%)
create mode 100644 drivers/net/wireless/iwlegacy/iwl-4965.h
create mode 100644 drivers/net/wireless/iwlegacy/iwl-commands.h
create mode 100644 drivers/net/wireless/iwlegacy/iwl-core.c
create mode 100644 drivers/net/wireless/iwlegacy/iwl-core.h
create mode 100644 drivers/net/wireless/iwlegacy/iwl-csr.h
create mode 100644 drivers/net/wireless/iwlegacy/iwl-debug.h
create mode 100644 drivers/net/wireless/iwlegacy/iwl-debugfs.c
create mode 100644 drivers/net/wireless/iwlegacy/iwl-dev.h
copy drivers/net/wireless/{iwlwifi/iwl-3945-led.h => iwlegacy/iwl-devtrace.c} (59%)
create mode 100644 drivers/net/wireless/iwlegacy/iwl-devtrace.h
create mode 100644 drivers/net/wireless/iwlegacy/iwl-eeprom.c
create mode 100644 drivers/net/wireless/iwlegacy/iwl-eeprom.h
create mode 100644 drivers/net/wireless/iwlegacy/iwl-fh.h
create mode 100644 drivers/net/wireless/iwlegacy/iwl-hcmd.c
create mode 100644 drivers/net/wireless/iwlegacy/iwl-helpers.h
create mode 100644 drivers/net/wireless/iwlegacy/iwl-io.h
create mode 100644 drivers/net/wireless/iwlegacy/iwl-led.c
copy drivers/net/wireless/{iwlwifi/iwl-3945-led.h => iwlegacy/iwl-led.h} (59%)
create mode 100644 drivers/net/wireless/iwlegacy/iwl-legacy-rs.h
create mode 100644 drivers/net/wireless/iwlegacy/iwl-power.c
create mode 100644 drivers/net/wireless/iwlegacy/iwl-power.h
create mode 100644 drivers/net/wireless/iwlegacy/iwl-prph.h
create mode 100644 drivers/net/wireless/iwlegacy/iwl-rx.c
create mode 100644 drivers/net/wireless/iwlegacy/iwl-scan.c
create mode 100644 drivers/net/wireless/iwlegacy/iwl-spectrum.h
create mode 100644 drivers/net/wireless/iwlegacy/iwl-sta.c
create mode 100644 drivers/net/wireless/iwlegacy/iwl-sta.h
create mode 100644 drivers/net/wireless/iwlegacy/iwl-tx.c
rename drivers/net/wireless/{iwlwifi => iwlegacy}/iwl3945-base.c (89%)
create mode 100644 drivers/net/wireless/iwlegacy/iwl4965-base.c
create mode 100644 drivers/net/wireless/iwlwifi/iwl-2000.c
delete mode 100644 drivers/net/wireless/iwlwifi/iwl-legacy.c
create mode 100644 drivers/net/wireless/rtlwifi/rtl8192c/Makefile
create mode 100644 drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
create mode 100644 drivers/net/wireless/rtlwifi/rtl8192c/dm_common.h
rename drivers/net/wireless/rtlwifi/{rtl8192ce/fw.c => rtl8192c/fw_common.c} (94%)
rename drivers/net/wireless/rtlwifi/{rtl8192ce/fw.h => rtl8192c/fw_common.h} (100%)
copy drivers/net/wireless/{iwlwifi/iwl-3945-led.h => rtlwifi/rtl8192c/main.c} (61%)
create mode 100644 drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c
create mode 100644 drivers/net/wireless/rtlwifi/rtl8192c/phy_common.h
create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/Makefile
create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/def.h
create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/dm.c
copy drivers/net/wireless/{iwlwifi/iwl-3945-led.h => rtlwifi/rtl8192cu/dm.h} (74%)
create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/hw.h
create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/led.c
copy drivers/net/wireless/{iwlwifi/iwl-3945-led.h => rtlwifi/rtl8192cu/led.h} (61%)
create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/mac.c
create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/mac.h
create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/phy.c
copy drivers/net/wireless/{iwlwifi/iwl-3945-led.h => rtlwifi/rtl8192cu/phy.h} (63%)
copy drivers/net/wireless/{iwlwifi/iwl-3945-led.h => rtlwifi/rtl8192cu/reg.h} (74%)
create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/rf.c
rename drivers/net/wireless/{iwlwifi/iwl-3945-led.h => rtlwifi/rtl8192cu/rf.h} (53%)
create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/sw.h
create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/table.c
create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/table.h
create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/trx.c
create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/trx.h
create mode 100644 drivers/net/wireless/rtlwifi/usb.c
create mode 100644 drivers/net/wireless/rtlwifi/usb.h
create mode 100644 drivers/net/xen-netback/Makefile
create mode 100644 drivers/net/xen-netback/common.h
create mode 100644 drivers/net/xen-netback/interface.c
create mode 100644 drivers/net/xen-netback/netback.c
create mode 100644 drivers/net/xen-netback/xenbus.c
rename firmware/bnx2/{bnx2-mips-09-6.2.1.fw.ihex => bnx2-mips-09-6.2.1a.fw.ihex} (62%)
create mode 100644 include/linux/cpu_rmap.h
create mode 100644 include/linux/micrel_phy.h
create mode 100644 include/linux/netfilter/ipset/Kbuild
create mode 100644 include/linux/netfilter/ipset/ip_set.h
create mode 100644 include/linux/netfilter/ipset/ip_set_ahash.h
create mode 100644 include/linux/netfilter/ipset/ip_set_bitmap.h
create mode 100644 include/linux/netfilter/ipset/ip_set_getport.h
create mode 100644 include/linux/netfilter/ipset/ip_set_hash.h
create mode 100644 include/linux/netfilter/ipset/ip_set_list.h
create mode 100644 include/linux/netfilter/ipset/ip_set_timeout.h
create mode 100644 include/linux/netfilter/ipset/pfxlen.h
create mode 100644 include/linux/netfilter/nf_conntrack_snmp.h
create mode 100644 include/linux/netfilter/xt_AUDIT.h
create mode 100644 include/linux/netfilter/xt_addrtype.h
create mode 100644 include/linux/netfilter/xt_devgroup.h
create mode 100644 include/linux/netfilter/xt_set.h
create mode 100644 include/net/bluetooth/smp.h
create mode 100644 include/net/netfilter/nf_conntrack_timestamp.h
create mode 100644 lib/cpu_rmap.c
rename net/bluetooth/{l2cap.c => l2cap_core.c} (76%)
create mode 100644 net/bluetooth/l2cap_sock.c
delete mode 100644 net/ipv4/fib_hash.c
delete mode 100644 net/ipv4/netfilter/ipt_addrtype.c
create mode 100644 net/netfilter/ipset/Kconfig
create mode 100644 net/netfilter/ipset/Makefile
create mode 100644 net/netfilter/ipset/ip_set_bitmap_ip.c
create mode 100644 net/netfilter/ipset/ip_set_bitmap_ipmac.c
create mode 100644 net/netfilter/ipset/ip_set_bitmap_port.c
create mode 100644 net/netfilter/ipset/ip_set_core.c
create mode 100644 net/netfilter/ipset/ip_set_getport.c
create mode 100644 net/netfilter/ipset/ip_set_hash_ip.c
create mode 100644 net/netfilter/ipset/ip_set_hash_ipport.c
create mode 100644 net/netfilter/ipset/ip_set_hash_ipportip.c
create mode 100644 net/netfilter/ipset/ip_set_hash_ipportnet.c
create mode 100644 net/netfilter/ipset/ip_set_hash_net.c
create mode 100644 net/netfilter/ipset/ip_set_hash_netport.c
create mode 100644 net/netfilter/ipset/ip_set_list_set.c
create mode 100644 net/netfilter/ipset/pfxlen.c
create mode 100644 net/netfilter/nf_conntrack_broadcast.c
create mode 100644 net/netfilter/nf_conntrack_snmp.c
create mode 100644 net/netfilter/nf_conntrack_timestamp.c
create mode 100644 net/netfilter/xt_AUDIT.c
create mode 100644 net/netfilter/xt_addrtype.c
create mode 100644 net/netfilter/xt_devgroup.c
create mode 100644 net/netfilter/xt_set.c
create mode 100644 net/sched/sch_choke.c
create mode 100644 net/sched/sch_mqprio.c
create mode 100644 net/sched/sch_sfb.c
create mode 100644 net/xfrm/xfrm_replay.c
^ permalink raw reply [flat|nested] 12+ messages in thread
* [GIT] Networking
@ 2013-11-11 20:47 David Miller
0 siblings, 0 replies; 12+ messages in thread
From: David Miller @ 2013-11-11 20:47 UTC (permalink / raw)
To: torvalds; +Cc: akpm, netdev, linux-wireless, netfilter-devel
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@eitzenberger.org (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
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [GIT] Networking
[not found] <20161005.014437.1946431553783736769.davem@davemloft.net>
@ 2016-10-05 22:29 ` Stephen Rothwell
2016-10-05 22:37 ` Linus Torvalds
0 siblings, 1 reply; 12+ messages in thread
From: Stephen Rothwell @ 2016-10-05 22:29 UTC (permalink / raw)
To: David Miller, torvalds
Cc: NetFilter, netdev, linux-kernel, Pablo Neira Ayuso, Liping Zhang
Hi Linus, Dave,
On Wed, 05 Oct 2016 01:44:37 -0400 (EDT) David Miller <davem@davemloft.net> wrote:
>
I have been carrying the following merge fix patch (for the merge of
the net-next tree with Linus' tree) for a while now which seems to have
got missed:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 13 Sep 2016 10:08:58 +1000
Subject: [PATCH] netfilter: merge fixup for "nf_tables_netdev: remove redundant ip_hdr assignment"
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
include/net/netfilter/nf_tables_ipv4.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/include/net/netfilter/nf_tables_ipv4.h b/include/net/netfilter/nf_tables_ipv4.h
index 968f00b82fb5..25e33aee91e7 100644
--- a/include/net/netfilter/nf_tables_ipv4.h
+++ b/include/net/netfilter/nf_tables_ipv4.h
@@ -33,7 +33,6 @@ __nft_set_pktinfo_ipv4_validate(struct nft_pktinfo *pkt,
if (!iph)
return -1;
- iph = ip_hdr(skb);
if (iph->ihl < 5 || iph->version != 4)
return -1;
--
2.8.1
--
Cheers,
Stephen Rothwell
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [GIT] Networking
2016-10-05 22:29 ` Stephen Rothwell
@ 2016-10-05 22:37 ` Linus Torvalds
2016-10-06 0:09 ` Pablo Neira Ayuso
2016-10-06 0:52 ` Stephen Rothwell
0 siblings, 2 replies; 12+ messages in thread
From: Linus Torvalds @ 2016-10-05 22:37 UTC (permalink / raw)
To: Stephen Rothwell
Cc: David Miller, NetFilter, Network Development,
Linux Kernel Mailing List, Pablo Neira Ayuso, Liping Zhang
On Wed, Oct 5, 2016 at 3:29 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> I have been carrying the following merge fix patch (for the merge of
> the net-next tree with Linus' tree) for a while now which seems to have
> got missed:
Ugh. It doesn't seem to be a merge error, because that double iph
assignment came from the original patch that introduced this function:
commit ddc8b6027ad0 ("netfilter: introduce nft_set_pktinfo_{ipv4,
ipv6}_validate()").
So I wouldn't call it a merge error - it just looks like a bug in the
network layer. So I'm not going to apply your patch even though it
looks plausible to me, simply because it's outside my area of
expertise.
David? Pablo?
Linus
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [GIT] Networking
2016-10-05 22:37 ` Linus Torvalds
@ 2016-10-06 0:09 ` Pablo Neira Ayuso
2016-10-06 0:26 ` David Miller
2016-10-06 0:52 ` Stephen Rothwell
1 sibling, 1 reply; 12+ messages in thread
From: Pablo Neira Ayuso @ 2016-10-06 0:09 UTC (permalink / raw)
To: Linus Torvalds
Cc: Stephen Rothwell, David Miller, NetFilter, Network Development,
Linux Kernel Mailing List, Liping Zhang
On Wed, Oct 05, 2016 at 03:37:17PM -0700, Linus Torvalds wrote:
> On Wed, Oct 5, 2016 at 3:29 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > I have been carrying the following merge fix patch (for the merge of
> > the net-next tree with Linus' tree) for a while now which seems to have
> > got missed:
>
> Ugh. It doesn't seem to be a merge error, because that double iph
> assignment came from the original patch that introduced this function:
> commit ddc8b6027ad0 ("netfilter: introduce nft_set_pktinfo_{ipv4,
> ipv6}_validate()").
>
> So I wouldn't call it a merge error - it just looks like a bug in the
> network layer. So I'm not going to apply your patch even though it
> looks plausible to me, simply because it's outside my area of
> expertise.
>
> David? Pablo?
This looks good, please take it so we speed up things.
Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>
Thanks!
P.S: Sorry for not addressing this any sooner, traveling overhead,
conferente and unstable wifi connection has been a problem here.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [GIT] Networking
2016-10-06 0:09 ` Pablo Neira Ayuso
@ 2016-10-06 0:26 ` David Miller
0 siblings, 0 replies; 12+ messages in thread
From: David Miller @ 2016-10-06 0:26 UTC (permalink / raw)
To: pablo; +Cc: torvalds, sfr, netfilter-devel, netdev, linux-kernel,
liping.zhang
From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Thu, 6 Oct 2016 02:09:45 +0200
> On Wed, Oct 05, 2016 at 03:37:17PM -0700, Linus Torvalds wrote:
>> On Wed, Oct 5, 2016 at 3:29 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>> >
>> > I have been carrying the following merge fix patch (for the merge of
>> > the net-next tree with Linus' tree) for a while now which seems to have
>> > got missed:
>>
>> Ugh. It doesn't seem to be a merge error, because that double iph
>> assignment came from the original patch that introduced this function:
>> commit ddc8b6027ad0 ("netfilter: introduce nft_set_pktinfo_{ipv4,
>> ipv6}_validate()").
>>
>> So I wouldn't call it a merge error - it just looks like a bug in the
>> network layer. So I'm not going to apply your patch even though it
>> looks plausible to me, simply because it's outside my area of
>> expertise.
>>
>> David? Pablo?
>
> This looks good, please take it so we speed up things.
>
> Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>
Applied.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [GIT] Networking
2016-10-05 22:37 ` Linus Torvalds
2016-10-06 0:09 ` Pablo Neira Ayuso
@ 2016-10-06 0:52 ` Stephen Rothwell
2016-10-06 2:14 ` Linus Torvalds
1 sibling, 1 reply; 12+ messages in thread
From: Stephen Rothwell @ 2016-10-06 0:52 UTC (permalink / raw)
To: Linus Torvalds
Cc: David Miller, NetFilter, Network Development,
Linux Kernel Mailing List, Pablo Neira Ayuso, Liping Zhang
Hi Linus,
On Wed, 5 Oct 2016 15:37:17 -0700 Linus Torvalds <torvalds@linux-foundation.org> wrote:
>
> On Wed, Oct 5, 2016 at 3:29 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > I have been carrying the following merge fix patch (for the merge of
> > the net-next tree with Linus' tree) for a while now which seems to have
> > got missed:
>
> Ugh. It doesn't seem to be a merge error, because that double iph
> assignment came from the original patch that introduced this function:
> commit ddc8b6027ad0 ("netfilter: introduce nft_set_pktinfo_{ipv4,
> ipv6}_validate()").
Except that commit effectively moved that function from
net/netfilter/nf_tables_netdev.c to
include/net/netfilter/nf_tables_ipv4.h while commit c73c24849011
("netfilter: nf_tables_netdev: remove redundant ip_hdr assignment")
removed the assignment in the original file (and has been in your tree
since v4.8-rc7) and that is where I originally actually got a conflict.
> So I wouldn't call it a merge error - it just looks like a bug in the
> network layer. So I'm not going to apply your patch even though it
> looks plausible to me, simply because it's outside my area of
> expertise.
no worries.
--
Cheers,
Stephen Rothwell
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [GIT] Networking
2016-10-06 0:52 ` Stephen Rothwell
@ 2016-10-06 2:14 ` Linus Torvalds
2016-10-06 2:51 ` Stephen Rothwell
0 siblings, 1 reply; 12+ messages in thread
From: Linus Torvalds @ 2016-10-06 2:14 UTC (permalink / raw)
To: Stephen Rothwell
Cc: David Miller, NetFilter, Network Development,
Linux Kernel Mailing List, Pablo Neira Ayuso, Liping Zhang
On Wed, Oct 5, 2016 at 5:52 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Except that commit effectively moved that function from
> net/netfilter/nf_tables_netdev.c to
> include/net/netfilter/nf_tables_ipv4.h while commit c73c24849011
> ("netfilter: nf_tables_netdev: remove redundant ip_hdr assignment")
> removed the assignment in the original file (and has been in your tree
> since v4.8-rc7) and that is where I originally actually got a conflict.
Oh, interesting. Why didn't I get the conflict there then?
I'm guessing (but too lazy to actually look up the history), that
David ended up doing that merge and that ends up being why I never saw
a conflict.
Linus
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [GIT] Networking
2016-10-06 2:14 ` Linus Torvalds
@ 2016-10-06 2:51 ` Stephen Rothwell
2016-10-06 2:56 ` David Miller
0 siblings, 1 reply; 12+ messages in thread
From: Stephen Rothwell @ 2016-10-06 2:51 UTC (permalink / raw)
To: Linus Torvalds
Cc: David Miller, NetFilter, Network Development,
Linux Kernel Mailing List, Pablo Neira Ayuso, Liping Zhang
Hi Linus,
On Wed, 5 Oct 2016 19:14:21 -0700 Linus Torvalds <torvalds@linux-foundation.org> wrote:
>
> On Wed, Oct 5, 2016 at 5:52 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Except that commit effectively moved that function from
> > net/netfilter/nf_tables_netdev.c to
> > include/net/netfilter/nf_tables_ipv4.h while commit c73c24849011
> > ("netfilter: nf_tables_netdev: remove redundant ip_hdr assignment")
> > removed the assignment in the original file (and has been in your tree
> > since v4.8-rc7) and that is where I originally actually got a conflict.
>
> Oh, interesting. Why didn't I get the conflict there then?
>
> I'm guessing (but too lazy to actually look up the history), that
> David ended up doing that merge and that ends up being why I never saw
> a conflict.
Yeah, commit b50afd203a5e ("Merge
git://git.kernel.org/pub/scm/linux/kernel/git/davem/net") actually
merges v4.8 into the net-next tree.
--
Cheers,
Stephen Rothwell
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [GIT] Networking
2016-10-06 2:51 ` Stephen Rothwell
@ 2016-10-06 2:56 ` David Miller
2016-10-06 5:07 ` Stephen Rothwell
0 siblings, 1 reply; 12+ messages in thread
From: David Miller @ 2016-10-06 2:56 UTC (permalink / raw)
To: sfr; +Cc: torvalds, netfilter-devel, netdev, linux-kernel, pablo,
liping.zhang
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 6 Oct 2016 13:51:52 +1100
> On Wed, 5 Oct 2016 19:14:21 -0700 Linus Torvalds <torvalds@linux-foundation.org> wrote:
>>
>> On Wed, Oct 5, 2016 at 5:52 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>> >
>> > Except that commit effectively moved that function from
>> > net/netfilter/nf_tables_netdev.c to
>> > include/net/netfilter/nf_tables_ipv4.h while commit c73c24849011
>> > ("netfilter: nf_tables_netdev: remove redundant ip_hdr assignment")
>> > removed the assignment in the original file (and has been in your tree
>> > since v4.8-rc7) and that is where I originally actually got a conflict.
>>
>> Oh, interesting. Why didn't I get the conflict there then?
>>
>> I'm guessing (but too lazy to actually look up the history), that
>> David ended up doing that merge and that ends up being why I never saw
>> a conflict.
>
> Yeah, commit b50afd203a5e ("Merge
> git://git.kernel.org/pub/scm/linux/kernel/git/davem/net") actually
> merges v4.8 into the net-next tree.
Yes, this is where the change got lost.
I have all of the fixups queued up in my net tree and will send in a pull
request later.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [GIT] Networking
2016-10-06 2:56 ` David Miller
@ 2016-10-06 5:07 ` Stephen Rothwell
0 siblings, 0 replies; 12+ messages in thread
From: Stephen Rothwell @ 2016-10-06 5:07 UTC (permalink / raw)
To: David Miller
Cc: torvalds, netfilter-devel, netdev, linux-kernel, pablo,
liping.zhang
Hi Dave,
On Wed, 05 Oct 2016 22:56:12 -0400 (EDT) David Miller <davem@davemloft.net> wrote:
>
> Yes, this is where the change got lost.
No worries.
> I have all of the fixups queued up in my net tree and will send in a pull
> request later.
Thanks.
--
Cheers,
Stephen Rothwell
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2016-10-06 5:07 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-16 21:21 [GIT] Networking David Miller
[not found] <20161005.014437.1946431553783736769.davem@davemloft.net>
2016-10-05 22:29 ` Stephen Rothwell
2016-10-05 22:37 ` Linus Torvalds
2016-10-06 0:09 ` Pablo Neira Ayuso
2016-10-06 0:26 ` David Miller
2016-10-06 0:52 ` Stephen Rothwell
2016-10-06 2:14 ` Linus Torvalds
2016-10-06 2:51 ` Stephen Rothwell
2016-10-06 2:56 ` David Miller
2016-10-06 5:07 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2013-11-11 20:47 David Miller
2011-01-12 0:24 David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).