Linus Torvalds
bbda1baeeb
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
Pull networking fixes from David Miller:
1) Brown paper bag fix in HTB scheduler, class options set incorrectly
due to a typoe. Fix from Vimalkumar.
2) It's possible for the ipv6 FIB garbage collector to run before all
the necessary datastructure are setup during init, defer the
notifier registry to avoid this problem. Fix from Michal Kubecek.
3) New i40e ethernet driver from the Intel folks.
4) Add new qmi wwan device IDs, from Bjørn Mork.
5) Doorbell lock in bnx2x driver is not initialized properly in some
configurations, fix from Ariel Elior.
6) Revert an ipv6 packet option padding change that broke standardized
ipv6 implementation test suites. From Jiri Pirko.
7) Fix synchronization of ARP information in bonding layer, from
Nikolay Aleksandrov.
8) Fix missing error return resulting in illegal memory accesses in
openvswitch, from Daniel Borkmann.
9) SCTP doesn't signal poll events properly due to mistaken operator
precedence, fix also from Daniel Borkmann.
10) __netdev_pick_tx() passes wrong index to sk_tx_queue_set() which
essentially disables caching of TX queue in sockets :-/ Fix from
Eric Dumazet.
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (29 commits)
net_sched: htb: fix a typo in htb_change_class()
net: qmi_wwan: add new Qualcomm devices
ipv6: don't call fib6_run_gc() until routing is ready
net: tilegx driver: avoid compiler warning
fib6_rules: fix indentation
irda: vlsi_ir: Remove casting the return value which is a void pointer
irda: donauboe: Remove casting the return value which is a void pointer
net: fix multiqueue selection
net: sctp: fix smatch warning in sctp_send_asconf_del_ip
net: sctp: fix bug in sctp_poll for SOCK_SELECT_ERR_QUEUE
net: fib: fib6_add: fix potential NULL pointer dereference
net: ovs: flow: fix potential illegal memory access in __parse_flow_nlattrs
bcm63xx_enet: remove deprecated IRQF_DISABLED
net: korina: remove deprecated IRQF_DISABLED
macvlan: Move skb_clone check closer to call
qlcnic: Fix warning reported by kbuild test robot.
bonding: fix bond_arp_rcv setting and arp validate desync state
bonding: fix store_arp_validate race with mode change
ipv6/exthdrs: accept tlv which includes only padding
bnx2x: avoid atomic allocations during initialization
...
2013-09-11 14:33:16 -07:00
for-linus-3.12-merge minor 9p fixes and tweaks for 3.12 merge window
2013-09-11 12:34:13 -07:00
Bluetooth: Add SCO connection fallback
2013-08-21 16:47:13 +02:00
caif: Remove my bouncing email address.
2013-04-23 13:25:51 -04:00
include: Convert ethernet mac address declarations to use ETH_ALEN
2013-08-02 12:33:54 -07:00
af_iucv: fix recvmsg by replacing skb_pull() function
2013-04-08 17:16:57 -04:00
netfilter: add SYNPROXY core/target
2013-08-28 00:27:54 +02:00
Revert "net: sctp: convert sctp_checksum_disable module param into sctp sysctl"
2013-08-09 13:09:41 -07:00
NFC: netlink: Add result of firmware operation to completion event
2013-08-14 01:12:58 +02:00
net: sctp: reorder sctp_globals to reduce cacheline usage
2013-08-29 14:55:54 -04:00
net: Remove extern from include/net/ scheduling prototypes
2013-07-31 17:24:22 -07:00
vxlan: add ipv6 proxy support
2013-08-31 22:30:01 -04:00
af_rxrpc.h: Remove extern from function prototypes
2013-07-31 17:50:01 -07:00
af_unix: improve STREAM behavior with fragmented memory
2013-08-10 01:16:44 -07:00
VSOCK: Move af_vsock.h and vsock_addr.h to include/net
2013-07-27 22:14:06 -07:00
arp/neighbour.h: Remove extern from function prototypes
2013-07-31 17:50:02 -07:00
ax25.h: Remove extern from function prototypes
2013-07-31 17:50:02 -07:00
net: add cpu_relax to busy poll loop
2013-08-28 17:45:48 -04:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
2013-08-29 14:08:24 -04:00
checksum: Remove extern from function prototypes
2013-07-31 17:50:02 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2013-09-05 14:54:29 -07:00
codel: refine one condition to avoid a nul rec_inv_sqrt
2012-08-10 16:52:54 -07:00
decnet: Parse netlink attributes on our own
2013-03-22 10:31:16 -04:00
decnet: use correct RCU API to deref sk_dst_cache field
2013-01-28 00:15:27 -05:00
ipv6: Optimize ipv6_change_dsfield().
2013-01-09 23:59:53 -08:00
tunnels: harmonize cleanup done on skb on rx path
2013-09-04 00:27:26 -04:00
net: Fix warnings in dst_ops.h
2012-07-19 10:43:03 -07:00
fib_rules: reorder struct fib_rules fields
2013-08-03 11:53:54 -07:00
firewire net, ipv4 arp: Extend hardware address and remove driver-level packet inspection.
2013-03-26 12:32:13 -04:00
ipv4: Add FLOWI_FLAG_KNOWN_NH
2012-10-08 17:42:36 -04:00
flow_keys: include thoff into flow_keys for later usage
2013-03-20 12:14:36 -04:00
net_sched: add 64bit rate estimators
2013-06-11 02:51:03 -07:00
genl: Hold reference on correct module while netlink-dump.
2013-08-28 17:19:17 -04:00
net: gre: move GSO functions to gre_offload
2013-07-03 14:37:39 -07:00
gro: Fix kcalloc argument order
2013-01-27 22:46:33 -05:00
ipv4: fix error handling in icmp_protocol.
2013-02-22 15:10:18 -05:00
mac80211: add radiotap flag and handling for 5/10 MHz
2013-07-16 09:58:05 +03:00
ieee802154/nl-mac.c: make some MLME operations optional
2013-04-08 12:00:16 -04:00
net: ipv6: mld: fix v1/v2 switchback timeout to rfc3810, 9.12.
2013-09-04 14:53:20 -04:00
ipv6: Add helper inet6_csk_update_pmtu().
2012-07-16 03:44:56 -07:00
ipv6: use a stronger hash for tcp
2013-02-21 18:15:58 -05:00
net-tcp: Fast Open client - sendmsg(MSG_FASTOPEN)
2012-07-19 11:02:03 -07:00
tcp: Tail loss probe (TLP)
2013-03-12 08:30:34 -04:00
net: Correct comparisons and calculations using skb->tail and skb-transport_header
2013-05-28 23:49:07 -07:00
net: frag, fix race conditions in LRU list maintenance
2013-05-06 11:06:51 -04:00
hlist: drop the node parameter from iterators
2013-02-27 19:10:24 -08:00
ipv4: remove is_data also from ip_options documentation.
2013-06-12 03:13:50 -07:00
hlist: drop the node parameter from iterators
2013-02-27 19:10:24 -08:00
ipv4: Maintain redirect and PMTU info in struct rtable again.
2012-07-10 22:40:14 -07:00
net: make snmp_mib_free static inline
2013-09-02 21:00:50 -07:00
ipv6: move csum_ipv6_magic() and udp6_csum_init() into static library
2013-01-08 17:56:10 -08:00
ipv6: prevent fib6_run_gc() contention
2013-08-01 14:16:20 -07:00
ipv6: move ip6_dst_hoplimit() into core kernel
2013-08-31 22:29:59 -04:00
tunnels: harmonize cleanup done on skb on xmit path
2013-09-04 00:27:25 -04:00
ipv4: remove fib_update_nh_saddrs() declaration.
2013-07-02 00:33:52 -07:00
tunnels: harmonize cleanup done on skb on xmit path
2013-09-04 00:27:25 -04:00
ipvs: add sync_persist_mode flag
2013-06-26 18:01:46 +09:00
ipv6: move ip6_dst_hoplimit() into core kernel
2013-08-31 22:29:59 -04:00
hostap: Don't use create_proc_read_entry()
2013-04-29 15:41:56 -04:00
llc: Remove stray reference to sysctl_llc_station_ack_timeout.
2012-09-17 13:13:24 -04:00
llc: Use normal etherdevice.h tests
2013-09-03 22:34:47 -04:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
2013-08-29 14:08:24 -04:00
net: ipv6: mld: get rid of MLDV2_MRC and simplify calculation
2013-09-04 14:53:20 -04:00
net/802: Implement Multiple Registration Protocol (MRP)
2013-02-10 20:37:22 -05:00
ipv6: don't call fib6_run_gc() until routing is ready
2013-09-11 17:04:09 -04:00
arp/neighbour.h: Remove extern from function prototypes
2013-07-31 17:50:02 -07:00
net: split rt_genid for ipv4 and ipv6
2013-07-31 14:56:36 -07:00
ipv6 netevent: Remove old_neigh from netevent_redirect.
2013-01-14 15:04:59 -05:00
userns: Convert the audit loginuid to be a kuid
2012-09-17 18:08:54 -07:00
netlink: Rename pid to portid to avoid confusion
2012-09-10 15:30:41 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2013-09-05 14:54:29 -07:00
hlist: drop the node parameter from iterators
2013-02-27 19:10:24 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2013-06-05 16:37:30 -07:00
net: Remove extern from include/net/ scheduling prototypes
2013-07-31 17:24:22 -07:00
qdisc: allow setting default queuing discipline
2013-08-31 00:32:32 -04:00
net: Remove code duplication between offload structures
2012-11-15 17:39:51 -05:00
regulatory: use RCU to protect last_request
2013-01-03 13:01:30 +01:00
net: remove a stale comment for dl_next
2013-04-22 15:55:48 -04:00
xfrm: introduce helper for safe determination of mtu
2013-08-14 13:09:07 +02:00
rtnetlink: Remove passing of attributes into rtnl_doit functions
2013-03-22 10:31:16 -04:00
qdisc: make args to qdisc_create_default const
2013-08-31 18:09:45 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2013-04-22 20:32:51 -04:00
net: defer net_secret[] initialization
2013-04-29 15:14:02 -04:00
net: avoid reloads in SNMP_UPD_PO_STATS
2012-08-06 13:40:47 -07:00
tcp: TSO packets automatic sizing
2013-08-29 15:50:06 -04:00
tcp: Change return value of tcp_rcv_established()
2013-09-04 00:27:28 -04:00
transp_v6.h: style neatening
2013-06-04 16:43:42 -07:00
pktgen: Add UDPCSUM flag to support UDP checksums
2013-07-27 22:16:36 -07:00
VSOCK: Move af_vsock.h and vsock_addr.h to include/net
2013-07-27 22:14:06 -07:00
vxlan: Notify drivers for listening UDP port changes
2013-09-05 12:44:30 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2013-09-05 14:58:52 -04:00
bbda1baeeb