Linus Torvalds
4ac4d58488
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
Pull networking fixes from David Miller:
1) The wireless rate info fix from Johannes Berg.
2) When a RAW socket is in hdrincl mode, we need to make sure that the
user provided at least a minimally sized ipv4/ipv6 header. Fix from
Alexander Potapenko.
3) We must emit IFLA_PHYS_PORT_NAME netlink attributes using
nla_put_string() so that it is NULL terminated.
4) Fix a bug in TCP fastopen handling, wherein child sockets
erroneously inherit the fastopen_req from the parent, and later can
end up derefencing freed memory or doing a double free. From Eric
Dumazet.
5) Don't clear out netdev stats at close time in tg3 driver, from
YueHaibing.
6) Fix refcount leak in xt_CT, from Gao Feng.
7) In nft_set_bitmap() don't leak dummy elements, from Liping Zhang.
8) Fix deadlock due to taking the expectation lock twice, also from
Liping Zhang.
9) Make xt_socket work again with ipv6, from Peter Tirsek.
10) Don't allow IPV6 to be used with IPVS if ipv6.disable=1, from Paolo
Abeni.
11) Make the BPF loader more flexible wrt. changes to the bpf MAP entry
layout. From Jesper Dangaard Brouer.
12) Fix ethtool reported device name in aquantia driver, from Pavel
Belous.
13) Fix build failures due to the compile time size test not working in
netfilter conntrack. From Geert Uytterhoeven.
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (52 commits)
cfg80211: make RATE_INFO_BW_20 the default
ipv6: initialize route null entry in addrconf_init()
qede: Fix possible misconfiguration of advertised autoneg value.
qed: Fix overriding of supported autoneg value.
qed*: Fix possible overflow for status block id field.
rtnetlink: NUL-terminate IFLA_PHYS_PORT_NAME string
netvsc: make sure napi enabled before vmbus_open
aquantia: Fix driver name reported by ethtool
ipv4, ipv6: ensure raw socket message is big enough to hold an IP header
net/sched: remove redundant null check on head
tcp: do not inherit fastopen_req from parent
forcedeth: remove unnecessary carrier status check
ibmvnic: Move queue restarting in ibmvnic_tx_complete
ibmvnic: Record SKB RX queue during poll
ibmvnic: Continue skb processing after skb completion error
ibmvnic: Check for driver reset first in ibmvnic_xmit
ibmvnic: Wait for any pending scrqs entries at driver close
ibmvnic: Clean up tx pools when closing
ibmvnic: Whitespace correction in release_rx_pools
ibmvnic: Delete napi's when releasing driver resources
...
2017-05-04 12:26:43 -07:00
9p: constify ->d_name handling
2017-01-12 04:01:17 -05:00
Bluetooth: L2CAP: Fix L2CAP_CR_SCID_IN_USE value
2017-04-12 22:02:37 +02:00
scripts/spelling.txt: add "overide" pattern and fix typo instances
2017-03-09 17:01:09 -08:00
netfilter: nf_ct_ext: invoke destroy even when ext is not attached
2017-05-01 11:48:49 +02:00
can: network namespace support for CAN gateway
2017-04-25 09:04:30 +02:00
NFC: Add nfc_dbg() macro
2017-04-05 10:15:20 +02:00
sctp: process duplicated strreset out and addstrm out requests correctly
2017-04-18 13:39:50 -04:00
net/sched: Removed unused vlan actions definition
2017-04-06 13:28:35 -07:00
6lowpan: Fix IID format for Bluetooth
2017-04-12 22:02:36 +02:00
net sched actions: Add support for user cookies
2017-01-25 12:37:04 -05:00
{net,IB}/{rxe,usnic}: Utilize generic mac to eui32 function
2017-04-25 14:21:34 -04:00
rxrpc: Note a successfully aborted kernel operation
2017-04-06 10:11:59 +01:00
af_unix: split 'u->readlock' into two: 'iolock' and 'bindlock'
2016-09-04 13:29:29 -07:00
VSOCK: Add vsockmon tap functions
2017-04-24 12:35:56 -04:00
net: add confirm_neigh method to dst_ops
2017-02-07 13:07:46 -05:00
bonding: fix wq initialization for links created via netlink
2017-04-21 15:28:37 -04:00
net: Commonize busy polling code to focus on napi_id instead of socket
2017-03-24 20:49:31 -07:00
calipso: Add a label cache.
2016-06-27 15:06:17 -04:00
cfg80211: make RATE_INFO_BW_20 the default
2017-05-04 13:15:28 -04:00
ieee802154: add netns support
2016-07-08 12:20:57 +02:00
csum: eliminate sparse warning in remcsum_unadjust()
2017-01-20 12:12:13 -05:00
netlabel: out of bound access in cipso_v4_validate()
2017-02-04 19:44:22 -05:00
cls_cgroup: get sk_classid only from full sockets
2016-04-19 20:09:25 -04:00
codel: split into multiple files
2016-04-25 16:44:27 -04:00
codel: split into multiple files
2016-04-25 16:44:27 -04:00
net_sched: fq_codel: cache skb->truesize into skb->cb
2016-06-25 12:19:35 -04:00
packet: compat support for sock_fprog
2016-06-09 23:41:03 -07:00
net/devlink: Add E-Switch encapsulation control
2017-04-22 20:26:37 +03:00
net: dsa: add support for the SMSC-LAN9303 tagging format
2017-04-20 13:48:54 -04:00
net: rename dst_neigh_output back to neigh_output
2017-02-11 21:25:18 -05:00
net/dst: Add dst port to dst_metadata utility functions
2016-11-09 13:41:54 -05:00
net: add confirm_neigh method to dst_ops
2017-02-07 13:07:46 -05:00
esp6: Reorganize esp_output
2017-04-14 10:06:42 +02:00
net: rtnetlink: plumb extended ack to doit function
2017-04-17 15:35:38 -04:00
flowcache: make flow_key_size() return "unsigned int"
2017-04-03 19:04:48 -07:00
flow_dissector: add mpls support (v2)
2017-04-24 14:30:46 -04:00
flowcache: more "unsigned int"
2017-04-03 19:04:48 -07:00
fou: Add encap ops for IPv6 tunnels
2016-05-20 18:03:16 -04:00
fq.h: Port memory limit mechanism from fq_codel
2016-09-30 13:29:21 +02:00
fq.h: Port memory limit mechanism from fq_codel
2016-09-30 13:29:21 +02:00
net_sched: gen_estimator: complete rewrite of rate estimators
2016-12-05 15:21:59 -05:00
netlink: pass extended ACK struct to parsing functions
2017-04-13 13:58:22 -04:00
net: Remove deprecated tunnel specific UDP offload functions
2016-06-17 20:23:32 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-08-18 01:17:32 -04:00
gro_cells: move to net/core/gro_cells.c
2017-02-08 14:38:18 -05:00
gtp: #define #define _GTP_H_ and not #define _GTP_H
2016-07-25 17:55:43 -07:00
net: add a hardware buffer management helper API
2016-03-14 12:19:46 -04:00
net: snmp: kill STATS_BH macros
2016-04-27 22:48:25 -04:00
wireless: radiotap: rewrite the radiotap header file
2017-01-25 16:00:33 +01:00
net/ipv6: allow sysctl to change link-local address generation mode
2017-01-27 10:25:34 -05:00
net: Introduce ife encapsulation module
2017-02-03 15:16:45 -05:00
inet: drop ->bind_conflict
2017-01-18 13:04:28 -05:00
tcp/dccp: do not touch listener sk_refcnt under synflood
2016-04-04 22:11:20 -04:00
net: Work around lockdep limitation in sockets that use sockets
2017-03-09 18:23:27 -08:00
net: Work around lockdep limitation in sockets that use sockets
2017-03-09 18:23:27 -08:00
ipv6: suppress sparse warnings in IP6_ECN_set_ce()
2016-08-13 15:08:00 -07:00
net: remove bh disabling around percpu_counter accesses
2017-01-20 11:27:22 -05:00
inet: reset tb->fastreuseport when adding a reuseport sk
2017-01-18 13:04:29 -05:00
net/tcp-fastopen: Add new API support
2017-01-25 14:04:38 -05:00
ipv4: Namespaceify tcp_tw_recycle and tcp_max_tw_buckets knob
2016-12-29 11:38:31 -05:00
net: ipv4: Refine the ipv4_default_advmss
2017-04-13 13:19:48 -04:00
ipv6: Pass proto to csum_ipv6_magic as __u8 instead of unsigned short
2016-03-13 23:55:13 -04:00
net: ipv6: Allow shorthand delete of all nexthops in multipath route
2017-02-04 19:58:14 -05:00
ipv6: initialize route null entry in addrconf_init()
2017-05-04 12:51:24 -04:00
ip6_tunnel: Allow policy-based routing through tunnels
2017-04-21 13:21:30 -04:00
net: ipv4: add support for ECMP hash policy choice
2017-03-21 15:27:19 -07:00
ip_tunnel: Allow policy-based routing through tunnels
2017-04-21 13:21:31 -04:00
ipvs: remove unused function ip_vs_set_state_timeout
2017-04-28 12:00:10 +02:00
ipv6: fix flow labels when the traffic class is non-0
2017-01-31 13:16:59 -05:00
wext: uninline stream addition functions
2017-01-13 09:38:42 +01:00
kcm: Use stream parser
2016-08-17 19:36:23 -04:00
net: ipv4: Do not drop to make_route if oif is l3mdev
2016-10-13 12:05:26 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-02-11 02:31:11 -05:00
mac80211: Add support for BSS max idle period element
2017-04-28 12:28:45 +02:00
ieee802154: cleanup WARN_ON for fc fetch
2016-07-08 13:23:12 +02:00
openvswitch: use mpls_hdr
2016-10-03 02:00:22 -04:00
net: mpls: Increase max number of labels for lwt encap
2017-04-01 20:21:44 -07:00
net/ncsi: Introduce ncsi_stop_dev()
2016-10-04 02:11:51 -04:00
ipv6: add support for NETDEV_RESEND_IGMP event
2017-03-28 22:02:21 -07:00
net: neigh: make ->hh_len 32-bit
2017-04-12 13:59:21 -04:00
can: initial support for network namespaces
2017-04-04 17:35:58 +02:00
neigh: Send a notification when DELAY_PROBE_TIME changes
2016-07-05 09:06:29 -07:00
netlabel: Implement CALIPSO config functions for SMACK.
2016-06-27 15:06:18 -04:00
netlink: pass extended ACK struct to parsing functions
2017-04-13 13:58:22 -04:00
ieee802154: add netns support
2016-07-08 12:20:57 +02:00
net: ping: make ping_v6_sendmsg static
2016-03-23 22:09:58 -04:00
net/sched: Reflect HW offload status
2017-02-17 12:08:05 -05:00
net: sched: make default fifo qdiscs appear in the dump
2017-03-12 22:53:02 -07:00
pptp: Refactor the struct and macros of PPTP codes
2016-08-15 10:55:53 -07:00
net: Add sysctl to toggle early demux for tcp and udp
2017-03-24 13:17:07 -07:00
net: Introduce psample, a new genetlink channel for packet sampling
2017-01-24 13:44:28 -05:00
net: ip, diag -- Add diag interface for raw sockets
2016-10-23 19:35:24 -04:00
net: ip, diag -- Add diag interface for raw sockets
2016-10-23 19:35:24 -04:00
ktime: Get rid of the union
2016-12-25 17:21:22 +01:00
ipv4: Namespaceify tcp_max_syn_backlog knob
2016-12-29 11:38:31 -05:00
net: ipv4: add support for ECMP hash policy choice
2017-03-21 15:27:19 -07:00
net: rtnetlink: plumb extended ack to doit function
2017-04-17 15:35:38 -04:00
net_sched: move the empty tp check from ->destroy() to ->delete()
2017-04-21 13:58:15 -04:00
sched/headers: Prepare to remove <linux/cred.h> inclusion from <linux/sched.h>
2017-03-02 08:42:31 +01:00
tcp: rename *_sequence_number() to *_seq_and_tsoff()
2017-03-09 18:25:34 -08:00
ipv6: sr: add core files for SR HMAC support
2016-11-09 20:40:06 -05:00
ipv6: sr: add core files for SR HMAC support
2016-11-09 20:40:06 -05:00
smc: netlink interface for SMC sockets
2017-01-09 16:07:41 -05:00
net: snmp: fix 64bit stats on 32bit arches
2016-04-28 11:49:45 -04:00
sock: correctly test SOCK_TIMESTAMP in sock_recv_ts_and_drops()
2017-04-02 19:34:55 -07:00
kcm: Remove TCP specific references from kcm and strparser
2016-08-28 23:32:41 -04:00
switchdev: bridge: Offload mc router ports
2017-02-10 11:46:39 -05:00
tcp: do not pass timestamp to tcp_rack_advance()
2017-04-26 14:44:38 -04:00
ipv6: add new struct ipcm6_cookie
2016-05-03 16:08:14 -04:00
net: Add sysctl to toggle early demux for tcp and udp
2017-03-24 13:17:07 -07:00
vxlan: Add new UDP encapsulation offload type for VXLAN-GPE
2016-06-17 20:23:32 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2016-12-16 10:24:44 -08:00
vxlan: remove unsed vxlan_dev_dst_port()
2016-11-15 12:16:13 -05:00
net: Add a xfrm validate function to validate_xmit_skb
2017-04-14 10:07:28 +02:00
4ac4d58488