Linus Torvalds
8aaa51b63c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
Pull networking fixes from David Miller:
"Just a few fixes trickling in at this point.
1) If we see an attached socket on an skb in the ipv4 forwarding path,
bail. This can happen due to races with FIB rule addition, and
deletion, and we should just drop such frames. From Sebastian
Pöhn.
2) pppoe receive should only accept packets destined for this hosts's
MAC address. From Joakim Tjernlund.
3) Handle checksum unwrapping properly in ppp receive properly when
it's encapsulated in UDP in some way, fix from Tom Herbert.
4) Fix some bugs in mv88e6xxx DSA driver resulting from the conversion
from register offset constants to mnenomic macros. From Vivien
Didelot.
5) Fix handling of HCA max message size in mlx4 adapters, from Eran
Ben ELisha"
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
net/mlx4_core: Fix reading HCA max message size in mlx4_QUERY_DEV_CAP
tcp: add memory barriers to write space paths
altera tse: Error-Bit on tx-avalon-stream always set.
net: dsa: mv88e6xxx: use PORT_DEFAULT_VLAN
net: dsa: mv88e6xxx: fix setup of port control 1
ppp: call skb_checksum_complete_unset in ppp_receive_frame
net: add skb_checksum_complete_unset
pppoe: Lacks DST MAC address check
ip_forward: Drop frames with attached skb->sk
2015-04-21 22:37:27 -07:00
6lowpan: nhc: add other known rfc6282 compressions
2015-02-14 23:08:44 +01:00
9p: patches for 4.1 merge window
2015-04-18 17:45:30 -04:00
net: Kill dev_rebuild_header
2015-03-02 16:43:41 -05:00
vlan: implement ndo_get_iflink
2015-04-02 14:05:00 -04:00
appletalk: Use eth_<foo>_addr instead of memset
2015-03-03 17:01:37 -05:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2015-04-15 09:00:47 -07:00
ax25: Fix the build when CONFIG_INET is disabled
2015-03-05 13:17:39 -05:00
dev: introduce dev_get_iflink()
2015-04-02 14:04:59 -04:00
Bluetooth: hidp: Fix regression with older userspace and flags validation
2015-04-18 11:01:08 -04:00
netfilter: nf_tables: switch registers to 32 bit addressing
2015-04-13 17:17:29 +02:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-03-20 18:51:09 -04:00
can: introduce new raw socket option to join the given CAN filters
2015-04-01 11:28:22 +02:00
Revert "libceph: use memalloc flags for net IO"
2015-04-07 19:08:35 +03:00
net: remove unused 'dev' argument from netif_needs_gso()
2015-04-17 13:29:41 -04:00
net/dcb: Add IEEE QCN attribute
2015-03-06 21:50:02 -05:00
tcp/dccp: get rid of central timewait timer
2015-04-13 16:40:05 -04:00
netfilter: Pass socket pointer down through okfn().
2015-04-07 15:25:55 -04:00
Merge commit 'v3.16' into next
2014-10-01 00:44:04 +10:00
net: dsa: use DEVICE_ATTR_RW to declare temp1_max
2015-04-17 15:58:37 -04:00
ethernet: Use eth_<foo>_addr instead of memset
2015-03-03 17:01:38 -05:00
net/hsr: Fix NULL pointer dereference and refcnt bugs when deleting a HSR interface.
2015-03-01 13:40:23 -05:00
ieee802154: don't export static symbol
2015-03-14 17:11:31 +01:00
tcp: add memory barriers to write space paths
2015-04-21 15:57:34 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
2015-04-14 18:51:19 -04:00
net: Remove iocb argument from sendmsg and recvmsg
2015-03-02 13:06:31 -05:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-03-09 23:38:02 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-04-02 16:16:53 -04:00
xfrm: simplify xfrm_address_t use
2015-03-31 13:58:35 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-04-06 22:34:15 -04:00
lapb: move EXPORT_SYMBOL after functions.
2014-10-24 15:51:42 -04:00
net: Remove iocb argument from sendmsg and recvmsg
2015-03-02 13:06:31 -05:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2015-04-15 09:00:47 -07:00
mac802154: cleanup concurrent check
2015-03-27 19:18:50 +01:00
mpls: In mpls_egress verify the packet length.
2015-03-12 23:05:04 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
2015-04-14 18:51:19 -04:00
netlink: implement nla_put_in_addr and nla_put_in6_addr
2015-03-31 13:58:35 -04:00
rhashtable: provide len to obj_hashfn
2015-03-25 17:18:33 +01:00
net: Kill dev_rebuild_header
2015-03-02 16:43:41 -05:00
nfc: Fix portid type in urelease_work
2015-04-13 16:35:16 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2015-04-15 09:00:47 -07:00
af_packet: pass checksum validation status to the user
2015-03-23 22:01:28 -04:00
net: Remove iocb argument from sendmsg and recvmsg
2015-03-02 13:06:31 -05:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-04-14 15:44:14 -04:00
Last round of updates for net-next:
2015-02-04 14:57:45 -08:00
net: Kill dev_rebuild_header
2015-03-02 16:43:41 -05:00
new helper: msg_data_left()
2015-04-11 15:53:35 -04:00
act_mirred: Fix bogus header when redirecting from VLAN
2015-04-17 13:29:28 -04:00
sctp: avoid to repeatedly declare external variables
2015-03-25 11:40:16 -04:00
lib/string_helpers.c: change semantics of string_escape_mem
2015-04-15 16:35:24 -07:00
switchdev: fix stp update API to work with layered netdevices
2015-03-23 16:44:56 -04:00
udp_tunnel: Pass UDP socket down through udp_tunnel{, 6}_xmit_skb().
2015-04-07 15:29:08 -04:00
net: Remove iocb argument from sendmsg and recvmsg
2015-03-02 13:06:31 -05:00
net: Remove iocb argument from sendmsg and recvmsg
2015-03-02 13:06:31 -05:00
wimax: convert printk to pr_foo()
2014-10-07 20:28:44 -04:00
cfg80211: don't allow disabling WEXT if it's required
2015-04-08 09:19:29 +02:00
net: Remove iocb argument from sendmsg and recvmsg
2015-03-02 13:06:31 -05:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-04-14 15:44:14 -04:00
net: switch importing msghdr from userland to {compat_,}import_iovec()
2015-04-09 00:02:26 -04:00
kconfig: use bool instead of boolean for type definition attributes
2015-01-07 13:08:04 +01:00
mpls: Refactor how the mpls module is built
2015-03-04 00:26:06 -05:00
make new_sync_{read,write}() static
2015-04-11 22:29:40 -04:00
8aaa51b63c