Linus Torvalds
388f997620
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
Pull networking fixes from David Miller:
1) Fix verifier memory corruption and other bugs in BPF layer, from
Alexei Starovoitov.
2) Add a conservative fix for doing BPF properly in the BPF classifier
of the packet scheduler on ingress. Also from Alexei.
3) The SKB scrubber should not clear out the packet MARK and security
label, from Herbert Xu.
4) Fix oops on rmmod in stmmac driver, from Bryan O'Donoghue.
5) Pause handling is not correct in the stmmac driver because it
doesn't take into consideration the RX and TX fifo sizes. From
Vince Bridgers.
6) Failure path missing unlock in FOU driver, from Wang Cong.
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (44 commits)
net: dsa: use DEVICE_ATTR_RW to declare temp1_max
netns: remove BUG_ONs from net_generic()
IB/ipoib: Fix ndo_get_iflink
sfc: Fix memcpy() with const destination compiler warning.
altera tse: Fix network-delays and -retransmissions after high throughput.
net: remove unused 'dev' argument from netif_needs_gso()
act_mirred: Fix bogus header when redirecting from VLAN
inet_diag: fix access to tcp cc information
tcp: tcp_get_info() should fetch socket fields once
net: dsa: mv88e6xxx: Add missing initialization in mv88e6xxx_set_port_state()
skbuff: Do not scrub skb mark within the same name space
Revert "net: Reset secmark when scrubbing packet"
bpf: fix two bugs in verification logic when accessing 'ctx' pointer
bpf: fix bpf helpers to use skb->mac_header relative offsets
stmmac: Configure Flow Control to work correctly based on rxfifo size
stmmac: Enable unicast pause frame detect in GMAC Register 6
stmmac: Read tx-fifo-depth and rx-fifo-depth from the devicetree
stmmac: Add defines and documentation for enabling flow control
stmmac: Add properties for transmit and receive fifo sizes
stmmac: fix oops on rmmod after assigning ip addr
...
2015-04-17 16:31:08 -04:00
9p: switch p9_client_read() to passing struct iov_iter *
2015-04-11 22:28:27 -04:00
Bluetooth: Read LE remote features during connection establishment
2015-04-09 08:36:54 +03: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
netfilter: nf_tables: mark stateful expressions
2015-04-13 20:12:31 +02:00
netns: remove BUG_ONs from net_generic()
2015-04-17 15:21:48 -04:00
nfc: nci: Add comment to explain NCI_HCI_MAX_PIPES
2015-04-06 00:19:05 +02:00
sctp: avoid to repeatedly declare external variables
2015-03-25 11:40:16 -04:00
act_bpf: add initial eBPF support for actions
2015-03-20 19:10:44 -04:00
ieee802154: 6lowpan: rename process_data and lowpan_process_data
2014-10-27 15:51:16 +01:00
net: ipv6: allow explicitly choosing optimistic addresses
2015-02-05 15:37:41 -08:00
ieee802154: mac802154: remove FSF address
2014-10-25 08:07:30 +02:00
net: Remove iocb argument from sendmsg and recvmsg
2015-03-02 13:06:31 -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 magic neighbour cache operations.
2015-03-03 14:44:41 -05:00
bonding: Implement port churn-machine (AD standard 43.4.17).
2015-02-24 16:05:48 -05:00
net: Move bonding headers under include/net
2014-11-10 13:27:49 -05:00
net: Move bonding headers under include/net
2014-11-10 13:27:49 -05:00
net/bonding: Fix potential bad memory access during bonding events
2015-02-09 14:03:53 -08:00
cfg80211: move IE split utilities here from mac80211
2015-04-07 13:56:41 +02:00
nl802154: introduce support for cca settings
2014-12-19 00:19:23 +01:00
net: Fix remcsum in GRO path to not change packet
2015-02-11 15:12:09 -08:00
cipso: don't use IPCB() to locate the CIPSO IP option
2015-02-11 14:46:37 -05:00
net: use ktime_get_ns() and ktime_get_real_ns() helpers
2014-08-22 19:57:23 -07: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 socket pointer down through okfn().
2015-04-07 15:25:55 -04:00
net: dsa: Add basic framework to support ndo_fdb functions
2015-03-29 13:23:54 -07:00
xfrm: release dst_orig in case of error in xfrm_lookup()
2015-02-12 07:10:56 +01:00
net: Remove protocol from struct dst_ops
2015-03-09 16:06:10 -04:00
net: Kill hold_net release_net
2015-03-12 14:39:40 -04:00
flow_keys: n_proto type should be __be16
2015-02-05 00:40:22 -08: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
net: Introduce possible_net_t
2015-03-12 14:39:40 -04:00
openvswitch: Add support for checksums on UDP tunnels.
2015-01-28 23:04:15 -08:00
ip_tunnel: Create percpu gro_cell
2015-01-18 01:56:32 -05:00
gue: Protocol constants for remote checksum offload
2014-11-05 16:30:03 -05:00
ieee802154: rework cca setting
2014-12-19 00:19:23 +01:00
ipv6: do retries on stable privacy addresses
2015-03-23 22:12:09 -04:00
inet: get rid of central tcp/dccp listener timer
2015-03-20 12:40:25 -04:00
ipv6: get rid of __inet6_hash()
2015-03-18 22:00:35 -04:00
net: Remove iocb argument from sendmsg and recvmsg
2015-03-02 13:06:31 -05:00
inet: get rid of central tcp/dccp listener timer
2015-03-20 12:40:25 -04:00
percpu_counter: add @gfp to percpu_counter_init()
2014-09-08 09:51:29 +09:00
inet: get rid of last __inet_hash_connect() argument
2015-03-18 22:00:35 -04:00
inet: fix request sock refcounting
2015-03-17 22:02:29 -04:00
tcp/dccp: get rid of central timewait timer
2015-04-13 16:40:05 -04:00
tcp: simplify inetpeer_addr_base use
2015-03-31 13:58:35 -04:00
netfilter: Pass socket pointer down through okfn().
2015-04-07 15:25:55 -04:00
net: add gro_compute_pseudo functions
2014-08-24 18:09:23 -07:00
net: fib6: convert cfg metric to u32 outside of table write lock
2015-01-05 22:55:24 -05:00
netfilter: Pass socket pointer down through okfn().
2015-04-07 15:25:55 -04:00
udp_tunnel: Pass UDP socket down through udp_tunnel{, 6}_xmit_skb().
2015-04-07 15:29:08 -04:00
ipv4: FIB Local/MAIN table collapse
2015-03-11 16:22:14 -04:00
ipip,gre,vti,sit: implement ndo_get_iflink
2015-04-02 14:05:00 -04:00
net: Introduce possible_net_t
2015-03-12 14:39:40 -04:00
net: remove extra newlines
2015-04-07 22:24:37 -04: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
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
llc: Make llc_sap_action_t function pointer arrays const
2014-12-10 15:21:24 -05:00
cfg80211: move IE split utilities here from mac80211
2015-04-07 13:56:41 +02:00
mac802154: fix transmission power datatype
2015-04-09 19:56:15 +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
neigh: Factor out ___neigh_lookup_noref
2015-03-04 00:23:23 -05:00
net: neighbour: Add mcast_resolicit to configure the number of multicast resolicitations in PROBE state.
2015-03-20 21:47:40 -04:00
net: Introduce possible_net_t
2015-03-12 14:39:40 -04:00
netlabel: fix the netlbl_catmap_setlong() dummy function
2014-08-07 20:55:21 -04:00
netlink: implement nla_get_in_addr and nla_get_in6_addr
2015-03-31 13:58:35 -04:00
nl802154: introduce support for cca settings
2014-12-19 00:19:23 +01: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: rename vlan_tx_* helpers since "tx" is misleading there
2015-01-13 17:51:08 -05:00
cfg80211: allow wiphy specific regdomain management
2014-12-17 11:49:55 +01:00
net: convert syn_wait_lock to a spinlock
2015-03-23 16:52:26 -04:00
ipv4: per cpu uncached list
2015-01-15 18:26:16 -05:00
rtnetlink: Mark name argument of rtnl_create_link() const
2015-04-10 12:42:40 -07:00
net_sched: destroy proto tp when all filters are gone
2015-03-09 15:35:55 -04: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
Merge branch 'iocb' into for-davem
2015-04-09 00:01:38 -04:00
switchdev: kernel-doc cleanup on swithdev ops
2015-03-20 21:36:53 -04:00
inet_diag: fix access to tcp cc information
2015-04-17 13:28:31 -04:00
inet: add TCP_NEW_SYN_RECV state
2015-03-12 22:58:12 -04:00
net: Remove iocb argument from sendmsg and recvmsg
2015-03-02 13:06:31 -05:00
udp_tunnel: Pass UDP socket down through udp_tunnel{, 6}_xmit_skb().
2015-04-07 15:29:08 -04:00
net: switch memcpy_fromiovec()/memcpy_fromiovecend() users to copy_from_iter()
2015-02-04 01:34:15 -05:00
udp_tunnel: Pass UDP socket down through udp_tunnel{, 6}_xmit_skb().
2015-04-07 15:29:08 -04:00
net: treewide: Fix typo found in DocBook/networking.xml
2014-09-05 17:35:28 -07:00
netfilter: Pass socket pointer down through okfn().
2015-04-07 15:25:55 -04:00
388f997620