Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Pull networking updates from David Miller: "Here is a pile of bug fixes that accumulated while I was in Europe" 1) In fixing kernel leaks to userspace during copying of socket addresses, we broke a case that used to work, namely the user providing a buffer larger than the in-kernel generic socket address structure. This broke Ruby amongst other things. Fix from Dan Carpenter. 2) Fix regression added by byte queue limit support in 8139cp driver, from Yang Yingliang. 3) The addition of MSG_SENDPAGE_NOTLAST buggered up a few sendpage implementations, they should just treat it the same as MSG_MORE. Fix from Richard Weinberger and Shawn Landden. 4) Handle icmpv4 errors received on ipv6 SIT tunnels correctly, from Oussama Ghorbel. In particular we should send an ICMPv6 unreachable in such situations. 5) Fix some regressions in the recent genetlink fixes, in particular get the pmcraid driver to use the new safer interfaces correctly. From Johannes Berg. 6) macvtap was converted to use a per-cpu set of statistics, but some code was still bumping tx_dropped elsewhere. From Jason Wang. 7) Fix build failure of xen-netback due to missing include on some architectures, from Andy Whitecroft. 8) macvtap double counts received packets in statistics, fix from Vlad Yasevich. 9) Fix various cases of using *_STATS_BH() when *_STATS() is more appropriate. From Eric Dumazet and Hannes Frederic Sowa. 10) Pktgen ipsec mode doesn't update the ipv4 header length and checksum properly after encapsulation. Fix from Fan Du. * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (61 commits) net/mlx4_en: Remove selftest TX queues empty condition {pktgen, xfrm} Update IPv4 header total len and checksum after tranformation virtio_net: make all RX paths handle erors consistently virtio_net: fix error handling for mergeable buffers virtio_net: Fixed a trivial typo (fitler --> filter) netem: fix gemodel loss generator netem: fix loss 4 state model netem: missing break in ge loss generator net/hsr: Support iproute print_opt ('ip -details ...') net/hsr: Very small fix of comment style. MAINTAINERS: Added net/hsr/ maintainer ipv6: fix possible seqlock deadlock in ip6_finish_output2 ixgbe: Make ixgbe_identify_qsfp_module_generic static ixgbe: turn NETIF_F_HW_L2FW_DOFFLOAD off by default ixgbe: ixgbe_fwd_ring_down needs to be static e1000: fix possible reset_task running after adapter down e1000: fix lockdep warning in e1000_reset_task e1000: prevent oops when adapter is being closed and reset simultaneously igb: Fixed Wake On LAN support inet: fix possible seqlock deadlocks ...

Linus Torvalds committed 12 years ago

Commit 5fc92de2 parents b0d8d22 833846e70 files · +491 −344Browse files

Showing the changes to include/uapi/linux (5 of 70 files). Show all

Unified · Split

5 files

include/uapi/linux/genetlink.h +1 −0
include/uapi/linux/if_link.h +3 −1
include/uapi/linux/netlink_diag.h +1 −0
include/uapi/linux/packet_diag.h +1 −0
include/uapi/linux/unix_diag.h +1 −0

include/uapi/linux/genetlink.h+1−0

@@ -28,6 +28,7 @@ struct genlmsghdr { · 27 unmodified lines
28	#define GENL_ID_GENERATE 0	28	#define GENL_ID_GENERATE 0
29	#define GENL_ID_CTRL NLMSG_MIN_TYPE	29	#define GENL_ID_CTRL NLMSG_MIN_TYPE
30	#define GENL_ID_VFS_DQUOT (NLMSG_MIN_TYPE + 1)	30	#define GENL_ID_VFS_DQUOT (NLMSG_MIN_TYPE + 1)
		31	#define GENL_ID_PMCRAID (NLMSG_MIN_TYPE + 2)
31		32
32	/**************************************************************************	33	/**************************************************************************
33	* Controller	34	* Controller

include/uapi/linux/if_link.h+3−1

 	IFLA_HSR_UNSPEC,
 	IFLA_HSR_SLAVE1,
 	IFLA_HSR_SLAVE2,
-	IFLA_HSR_MULTICAST_SPEC,
+	IFLA_HSR_MULTICAST_SPEC,	/* Last byte of supervision addr */
+	IFLA_HSR_SUPERVISION_ADDR,	/* Supervision frame multicast addr */
+	IFLA_HSR_SEQ_NR,
 	__IFLA_HSR_MAX,
 };

include/uapi/linux/netlink_diag.h+1−0

@@ -33,6 +33,7 @@ struct netlink_diag_ring { · 32 unmodified lines
33	};	33	};
34		34
35	enum {	35	enum {
		36	/* NETLINK_DIAG_NONE, standard nl API requires this attribute! */
36	NETLINK_DIAG_MEMINFO,	37	NETLINK_DIAG_MEMINFO,
37	NETLINK_DIAG_GROUPS,	38	NETLINK_DIAG_GROUPS,
38	NETLINK_DIAG_RX_RING,	39	NETLINK_DIAG_RX_RING,

include/uapi/linux/packet_diag.h+1−0

@@ -29,6 +29,7 @@ struct packet_diag_msg { · 28 unmodified lines
29	};	29	};
30		30
31	enum {	31	enum {
		32	/* PACKET_DIAG_NONE, standard nl API requires this attribute! */
32	PACKET_DIAG_INFO,	33	PACKET_DIAG_INFO,
33	PACKET_DIAG_MCLIST,	34	PACKET_DIAG_MCLIST,
34	PACKET_DIAG_RX_RING,	35	PACKET_DIAG_RX_RING,

include/uapi/linux/unix_diag.h+1−0

@@ -31,6 +31,7 @@ struct unix_diag_msg { · 30 unmodified lines
31	};	31	};
32		32
33	enum {	33	enum {
		34	/* UNIX_DIAG_NONE, standard nl API requires this attribute! */
34	UNIX_DIAG_NAME,	35	UNIX_DIAG_NAME,
35	UNIX_DIAG_VFS,	36	UNIX_DIAG_VFS,
36	UNIX_DIAG_PEER,	37	UNIX_DIAG_PEER,