Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (3d1f337b) · Commits · 戴 / test

Documentation/connector/connector.txt

+3 −2

Original line number	Diff line number	Diff line
		@@ -69,10 +69,11 @@ Unregisters new callback with connector core.

		struct cb_id *id - unique connector's user identifier.

		void cn_netlink_send(struct cn_msg *msg, u32 __groups, int gfp_mask);
		int cn_netlink_send(struct cn_msg *msg, u32 __groups, int gfp_mask);

		Sends message to the specified groups. It can be safely called from
		any context, but may silently fail under strong memory pressure.
		softirq context, but may silently fail under strong memory pressure.
		If there are no listeners for given group -ESRCH can be returned.

		struct cn_msg * - message header(with attached data).
		u32 __group - destination group.

Documentation/networking/ip-sysctl.txt

+47 −2

Original line number	Diff line number	Diff line
		@@ -355,6 +355,13 @@ somaxconn - INTEGER
		Defaults to 128. See also tcp_max_syn_backlog for additional tuning
		for TCP sockets.

		tcp_workaround_signed_windows - BOOLEAN
		If set, assume no receipt of a window scaling option means the
		remote TCP is broken and treats the window as a signed quantity.
		If unset, assume the remote TCP is not broken even if we do
		not receive a window scaling option from them.
		Default: 0

		IP Variables:

		ip_local_port_range - 2 INTEGERS
		@@ -619,6 +626,11 @@ arp_ignore - INTEGER
		The max value from conf/{all,interface}/arp_ignore is used
		when ARP request is received on the {interface}

		arp_accept - BOOLEAN
		Define behavior when gratuitous arp replies are received:
		0 - drop gratuitous arp frames
		1 - accept gratuitous arp frames

		app_solicit - INTEGER
		The maximum number of probes to send to the user space ARP daemon
		via netlink before dropping back to multicast probes (see
		@@ -717,6 +729,33 @@ accept_ra - BOOLEAN
		Functional default: enabled if local forwarding is disabled.
		disabled if local forwarding is enabled.

		accept_ra_defrtr - BOOLEAN
		Learn default router in Router Advertisement.

		Functional default: enabled if accept_ra is enabled.
		disabled if accept_ra is disabled.

		accept_ra_pinfo - BOOLEAN
		Learn Prefix Inforamtion in Router Advertisement.

		Functional default: enabled if accept_ra is enabled.
		disabled if accept_ra is disabled.

		accept_ra_rt_info_max_plen - INTEGER
		Maximum prefix length of Route Information in RA.

		Route Information w/ prefix larger than or equal to this
		variable shall be ignored.

		Functional default: 0 if accept_ra_rtr_pref is enabled.
		-1 if accept_ra_rtr_pref is disabled.

		accept_ra_rtr_pref - BOOLEAN
		Accept Router Preference in RA.

		Functional default: enabled if accept_ra is enabled.
		disabled if accept_ra is disabled.

		accept_redirects - BOOLEAN
		Accept Redirects.

		@@ -727,8 +766,8 @@ autoconf - BOOLEAN
		Autoconfigure addresses using Prefix Information in Router
		Advertisements.

		Functional default: enabled if accept_ra is enabled.
		disabled if accept_ra is disabled.
		Functional default: enabled if accept_ra_pinfo is enabled.
		disabled if accept_ra_pinfo is disabled.

		dad_transmits - INTEGER
		The amount of Duplicate Address Detection probes to send.
		@@ -771,6 +810,12 @@ mtu - INTEGER
		Default Maximum Transfer Unit
		Default: 1280 (IPv6 required minimum)

		router_probe_interval - INTEGER
		Minimum interval (in seconds) between Router Probing described
		in RFC4191.

		Default: 60

		router_solicitation_delay - INTEGER
		Number of seconds to wait after interface is brought up
		before sending Router Solicitations.

drivers/atm/suni.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -188,7 +188,7 @@ static int suni_ioctl(struct atm_dev dev,unsigned int cmd,void __user arg)
		case SONET_GETDIAG:
		return get_diag(dev,arg);
		case SONET_SETFRAMING:
		if (arg != SONET_FRAME_SONET) return -EINVAL;
		if ((int)(unsigned long)arg != SONET_FRAME_SONET) return -EINVAL;
		return 0;
		case SONET_GETFRAMING:
		return put_user(SONET_FRAME_SONET,(int __user *)arg) ?

drivers/connector/connector.c

+4 −3

Original line number	Diff line number	Diff line
		@@ -97,6 +97,9 @@ int cn_netlink_send(struct cn_msg *msg, u32 __group, gfp_t gfp_mask)
		group = __group;
		}

		if (!netlink_has_listeners(dev->nls, group))
		return -ESRCH;

		size = NLMSG_SPACE(sizeof(*msg) + msg->len);

		skb = alloc_skb(size, gfp_mask);
		@@ -111,9 +114,7 @@ int cn_netlink_send(struct cn_msg *msg, u32 __group, gfp_t gfp_mask)

		NETLINK_CB(skb).dst_group = group;

		netlink_broadcast(dev->nls, skb, 0, group, gfp_mask);

		return 0;
		return netlink_broadcast(dev->nls, skb, 0, group, gfp_mask);

		nlmsg_failure:
		kfree_skb(skb);

drivers/infiniband/ulp/ipoib/ipoib_main.c

+1 −15

Original line number	Diff line number	Diff line
		@@ -253,7 +253,6 @@ static void path_free(struct net_device dev, struct ipoib_path path)
		if (neigh->ah)
		ipoib_put_ah(neigh->ah);
		*to_ipoib_neigh(neigh->neighbour) = NULL;
		neigh->neighbour->ops->destructor = NULL;
		kfree(neigh);
		}

		@@ -531,7 +530,6 @@ static void neigh_add_path(struct sk_buff skb, struct net_device dev)
		err:
		*to_ipoib_neigh(skb->dst->neighbour) = NULL;
		list_del(&neigh->list);
		neigh->neighbour->ops->destructor = NULL;
		kfree(neigh);

		++priv->stats.tx_dropped;
		@@ -770,21 +768,9 @@ static void ipoib_neigh_destructor(struct neighbour *n)
		ipoib_put_ah(ah);
		}

		static int ipoib_neigh_setup(struct neighbour *neigh)
		{
		/*
		* Is this kosher? I can't find anybody in the kernel that
		* sets neigh->destructor, so we should be able to set it here
		* without trouble.
		*/
		neigh->ops->destructor = ipoib_neigh_destructor;

		return 0;
		}

		static int ipoib_neigh_setup_dev(struct net_device dev, struct neigh_parms parms)
		{
		parms->neigh_setup = ipoib_neigh_setup;
		parms->neigh_destructor = ipoib_neigh_destructor;

		return 0;
		}

Admin message