Linus Torvalds
34229b2774
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
Pull networking fixes from David Miller:
"This looks like a lot but it's a mixture of regression fixes as well
as fixes for longer standing issues.
1) Fix on-channel cancellation in mac80211, from Johannes Berg.
2) Handle CHECKSUM_COMPLETE properly in xt_TCPMSS netfilter xtables
module, from Eric Dumazet.
3) Avoid infinite loop in UDP SO_REUSEPORT logic, also from Eric
Dumazet.
4) Avoid a NULL deref if we try to set SO_REUSEPORT after a socket is
bound, from Craig Gallek.
5) GRO key comparisons don't take lightweight tunnels into account,
from Jesse Gross.
6) Fix struct pid leak via SCM credentials in AF_UNIX, from Eric
Dumazet.
7) We need to set the rtnl_link_ops of ipv6 SIT tunnels before we
register them, otherwise the NEWLINK netlink message is missing
the proper attributes. From Thadeu Lima de Souza Cascardo.
8) Several Spectrum chip bug fixes for mlxsw switch driver, from Ido
Schimmel
9) Handle fragments properly in ipv4 easly socket demux, from Eric
Dumazet.
10) Don't ignore the ifindex key specifier on ipv6 output route
lookups, from Paolo Abeni"
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (128 commits)
tcp: avoid cwnd undo after receiving ECN
irda: fix a potential use-after-free in ircomm_param_request
net: tg3: avoid uninitialized variable warning
net: nb8800: avoid uninitialized variable warning
net: vxge: avoid unused function warnings
net: bgmac: clarify CONFIG_BCMA dependency
net: hp100: remove unnecessary #ifdefs
net: davinci_cpdma: use dma_addr_t for DMA address
ipv6/udp: use sticky pktinfo egress ifindex on connect()
ipv6: enforce flowi6_oif usage in ip6_dst_lookup_tail()
netlink: not trim skb for mmaped socket when dump
vxlan: fix a out of bounds access in __vxlan_find_mac
net: dsa: mv88e6xxx: fix port VLAN maps
fib_trie: Fix shift by 32 in fib_table_lookup
net: moxart: use correct accessors for DMA memory
ipv4: ipconfig: avoid unused ic_proto_used symbol
bnxt_en: Fix crash in bnxt_free_tx_skbs() during tx timeout.
bnxt_en: Exclude rx_drop_pkts hw counter from the stack's rx_dropped counter.
bnxt_en: Ring free response from close path should use completion ring
net_sched: drr: check for NULL pointer in drr_dequeue
...
2016-02-01 15:56:08 -08:00
9p: switch p9_client_read() to passing struct iov_iter *
2015-04-11 22:28:27 -04:00
Bluetooth: L2CAP: Introduce proper defines for PSM ranges
2016-01-29 11:47:24 +01:00
caif: fix a signedness bug in cfpkt_iterate()
2015-02-20 17:35:14 -05:00
irda: Convert function pointer arrays and uses to const
2014-12-10 15:33:16 -05:00
s390/iucv: do not use arrays as argument
2015-09-21 16:03:04 -07:00
netfilter: nf_conntrack: use safer way to lock all buckets
2016-01-20 14:15:31 +01:00
ipv4: Namespecify the tcp_keepalive_intvl sysctl knob
2016-01-10 17:32:09 -05:00
nfc: netlink: HCI event connectivity implementation
2015-12-29 19:06:20 +01:00
sctp: remove the dead field of sctp_transport
2016-01-28 15:59:32 -08:00
act_connmark: Remember the struct net instead of guessing it.
2015-09-18 21:59:31 +02:00
6lowpan: add debugfs support
2015-12-10 01:25:25 +01:00
net_sched: make tcf_hash_destroy() static
2015-08-26 11:01:44 -07:00
soreuseport: fast reuseport UDP socket selection
2016-01-04 22:49:58 -05:00
ieee802154: af_ieee802154: fix typo in comment.
2015-09-17 13:20:05 +02:00
unix: avoid use-after-free in ep_remove_wait_queue
2015-11-23 12:29:58 -05:00
Revert "Merge branch 'vsock-virtio'"
2015-12-08 21:55:49 -05:00
ipsec: Remove obsolete MAX_AH_AUTH_LEN
2014-09-18 10:54:36 +02:00
neigh: Factor out ___neigh_lookup_noref
2015-03-04 00:23:23 -05:00
ax25: Stop using sock->sk_protinfo.
2015-06-28 16:55:44 -07:00
bonding: simplify / unify event handling code for 3ad mode.
2015-11-02 22:52:24 -05:00
net: Move bonding headers under include/net
2014-11-10 13:27:49 -05:00
bonding: convert num_grat_arp to the new bonding option API
2015-07-27 01:05:24 -07:00
bonding: implement lower state change propagation
2015-12-03 11:49:27 -05:00
net: un-inline sk_busy_loop()
2015-11-18 16:17:38 -05:00
cfg80211: Add support for aborting an ongoing scan
2015-12-04 14:43:32 +01:00
nl802154: add support for security layer
2015-09-30 13:16:44 +02:00
rco: Clean up casting errors
2015-12-13 23:57:45 -05:00
cipso: don't use IPCB() to locate the CIPSO IP option
2015-02-11 14:46:37 -05:00
net: wrap sock->sk_cgrp_prioidx and ->sk_classid inside a struct
2015-12-08 22:02:33 -05:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-05-13 14:31:43 -04:00
net: switch importing msghdr from userland to {compat_,}import_iovec()
2015-04-09 00:02:26 -04:00
net/dcb: Add IEEE QCN attribute
2015-03-06 21:50:02 -05:00
netfilter: Pass net into okfn
2015-09-17 17:18:37 -07:00
net: dsa: remove DSA link polling
2015-12-07 16:35:49 -05:00
net: fix IP early demux races
2015-12-14 23:52:00 -05:00
gro: Make GRO aware of lightweight tunnels.
2016-01-20 18:48:38 -08:00
ipv4, ipv6: Pass net into __ip_local_out and __ip6_local_out
2015-10-08 04:27:02 -07:00
net/ethoc: support big-endian register layout
2015-09-23 15:33:15 -07:00
net: ipv6: use common fib_default_rule_pref
2015-09-09 14:19:50 -07:00
net: Rename FLOWI_FLAG_VRFSRC to FLOWI_FLAG_L3MDEV_SRC
2015-10-07 04:27:42 -07:00
flow_dissector: Don't use bit fields.
2015-09-01 16:46:08 -07:00
ip_tunnel: Ops registration for secondary encap (fou, gue)
2014-11-12 15:01:35 -05:00
net: sched: enable per cpu qstats
2014-09-30 01:02:26 -04:00
netlink: add a start callback for starting a netlink dump
2015-12-15 23:25:20 -05:00
geneve: Add geneve_get_rx_port support
2015-12-16 10:58:56 -05:00
gre: Remove support for sharing GRE protocol hook.
2015-08-10 14:03:54 -07:00
gro_cells: remove spinlock protecting receive queues
2015-08-31 15:17:17 -07:00
gue: Protocol constants for remote checksum offload
2014-11-05 16:30:03 -05:00
mac802154: constify ieee802154_llsec_ops structure
2016-01-04 20:40:41 +01:00
ipv6: do retries on stable privacy addresses
2015-03-23 22:12:09 -04:00
ila: Add generic ILA translation facility
2015-12-15 23:25:20 -05:00
ipv6: remove obsolete inet6 functions
2015-10-03 04:32:42 -07:00
ipv6: get rid of __inet6_hash()
2015-03-18 22:00:35 -04:00
net: avoid NULL deref in inet_ctl_sock_destroy()
2015-11-02 22:46:09 -05:00
tcp/dccp: fix hashdance race for passive sessions
2015-10-23 05:42:21 -07:00
ipv6: update skb->csum when CE mark is propagated
2016-01-15 15:07:23 -05:00
inet: kill unused skb_free op
2016-01-05 22:25:57 -05:00
tcp/dccp: fix hashdance race for passive sessions
2015-10-23 05:42:21 -07:00
net: Allow accepted sockets to be bound to l3mdev domain
2015-12-18 14:43:38 -05:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-10-20 06:08:27 -07:00
inet: tcp: fix inetpeer_set_addr_v4()
2015-12-16 00:14:12 -05:00
ipv4: Pass struct net into ip_defrag and ip_check_defrag
2015-10-12 19:44:16 -07:00
net: add gro_compute_pseudo functions
2014-08-24 18:09:23 -07:00
ipv6: Check rt->dst.from for the DST_NOCACHE route
2015-11-15 17:12:37 -05:00
ipv6: enforce flowi6_oif usage in ip6_dst_lookup_tail()
2016-01-29 20:31:26 -08:00
net: make ip6tunnel_xmit definition conditional
2016-01-04 21:50:51 -05:00
ipv4: eliminate endianness warnings in ip_fib.h
2016-01-08 21:30:43 -05:00
ip_tunnel: Move stats update to iptunnel_xmit()
2015-12-25 23:32:23 -05:00
ipvs: Remove skb_sknet
2015-09-24 09:34:43 +09:00
ipv6: add ipv6_addr_prefix_copy
2015-12-10 12:55:28 +01:00
switch ipxrtr_route_packet() from iovec to msghdr
2014-11-24 04:28:49 -05:00
wext: add checked wrappers for adding events/points to streams
2015-02-28 21:31:12 +01:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-01-06 22:54:18 -05:00
lib80211: remove unused print_ssid()
2014-10-14 02:18:27 +02:00
llc: Make llc_conn_ev_qfyr_t function pointer arrays const
2014-12-10 15:21:24 -05:00
net: Pass kern from net_proto_family.create to sk_alloc
2015-05-11 10:50:17 -04:00
llc: Make llc_sap_action_t function pointer arrays const
2014-12-10 15:21:24 -05:00
dst: Pass net into dst->output
2015-10-08 04:27:03 -07:00
mac80211: add new IEEE80211_VIF_GET_NOA_UPDATE flag
2015-12-04 14:43:32 +01:00
6lowpan: cleanup lowpan_header_decompress
2015-10-21 00:49:24 +02:00
ipv6: mld: answer mldv2 queries with mldv1 reports in mldv1 fallback
2014-09-22 16:23:15 -04:00
openvswitch: Add basic MPLS support to kernel
2014-11-05 23:52:33 -08:00
mpls: multipath route support
2015-10-23 06:26:42 -07:00
Revert "ipv6: ndisc: inherit metadata dst when creating ndisc requests"
2015-12-01 15:07:59 -05:00
net: add explicit logging and stat for neighbour table overflow
2015-08-10 13:46:21 -07:00
netfilter: cttimeout: add netns support
2015-12-14 12:48:58 +01:00
netlabel: fix the netlbl_catmap_setlong() dummy function
2014-08-07 20:55:21 -04:00
netlink: add nla_get for le32 and le64
2015-09-30 13:16:44 +02:00
net: wrap sock->sk_cgrp_prioidx and ->sk_classid inside a struct
2015-12-08 22:02:33 -05:00
nl802154: add support for security layer
2015-09-30 13:16:44 +02:00
net: Remove iocb argument from sendmsg and recvmsg
2015-03-02 13:06:31 -05:00
net: sched: remove tcf_proto from ematch calls
2014-10-06 18:02:32 -04:00
net: sched: consolidate tc_classify{,_compat}
2015-08-27 14:18:48 -07:00
udp: restrict offloads to one namespace
2016-01-10 17:28:24 -05:00
cfg80211: allow wiphy specific regdomain management
2014-12-17 11:49:55 +01:00
net: add inet_sk_transparent() helper
2015-12-22 17:03:05 -05:00
net: Propagate lookup failure in l3mdev_get_saddr to caller
2016-01-04 22:58:30 -05:00
netlink: Rightsize IFLA_AF_SPEC size calculation
2015-10-21 19:15:20 -07:00
net, sched: add skb_at_tc_ingress helper
2016-01-10 17:54:28 -05:00
Merge branch 'for-3.18-consistent-ops' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
2014-10-15 07:48:18 +02:00
net: sock: remove dead cgroup methods from struct proto
2016-01-21 14:16:51 -08:00
soreuseport: fix NULL ptr dereference SO_REUSEPORT after bind
2016-01-19 14:44:23 -05:00
switchdev: Adding MDB entry offload
2016-01-10 16:50:20 -05:00
tcp: Change reference to experimental CWND RFC.
2016-01-29 12:23:58 -08:00
inet: add TCP_NEW_SYN_RECV state
2015-03-12 22:58:12 -04:00
inet: remove BUG_ON() in twsk_destructor()
2015-07-09 15:12:20 -07:00
net: tso: add support for IPv6
2015-10-26 22:24:22 -07:00
soreuseport: setsockopt SO_ATTACH_REUSEPORT_[CE]BPF
2016-01-04 22:49:59 -05:00
ip_tunnel: Move stats update to iptunnel_xmit()
2015-12-25 23:32:23 -05:00
net: switch memcpy_fromiovec()/memcpy_fromiovecend() users to copy_from_iter()
2015-02-04 01:34:15 -05:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-12-17 22:08:28 -05:00
net: treewide: Fix typo found in DocBook/networking.xml
2014-09-05 17:35:28 -07:00
xfrm: add rcu protection to sk->sk_policy[]
2015-12-11 19:22:06 -05:00
34229b2774