Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6.15 (236fa081) · Commits · e / devices / android_kernel_samsung_universal8895

include/linux/skbuff.h

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -171,7 +171,6 @@ enum {
	* struct sk_buff - socket buffer		* struct sk_buff - socket buffer
	* @next: Next buffer in list		* @next: Next buffer in list
	* @prev: Previous buffer in list		* @prev: Previous buffer in list
	* @list: List we are on
	* @sk: Socket we are owned by		* @sk: Socket we are owned by
	* @tstamp: Time we arrived		* @tstamp: Time we arrived
	* @dev: Device we arrived on/are leaving by		* @dev: Device we arrived on/are leaving by
	@@ -190,6 +189,7 @@ enum {
	* @cloned: Head may be cloned (check refcnt to be sure)		* @cloned: Head may be cloned (check refcnt to be sure)
	* @nohdr: Payload reference only, must not modify header		* @nohdr: Payload reference only, must not modify header
	* @pkt_type: Packet class		* @pkt_type: Packet class
			* @fclone: skbuff clone status
	* @ip_summed: Driver fed us an IP checksum		* @ip_summed: Driver fed us an IP checksum
	* @priority: Packet queueing priority		* @priority: Packet queueing priority
	* @users: User count - see {datagram,tcp}.c		* @users: User count - see {datagram,tcp}.c
	@@ -202,6 +202,7 @@ enum {
	* @destructor: Destruct function		* @destructor: Destruct function
	* @nfmark: Can be used for communication between hooks		* @nfmark: Can be used for communication between hooks
	* @nfct: Associated connection, if any		* @nfct: Associated connection, if any
			* @ipvs_property: skbuff is owned by ipvs
	* @nfctinfo: Relationship of this skb to the connection		* @nfctinfo: Relationship of this skb to the connection
	* @nf_bridge: Saved data about a bridged frame - see br_netfilter.c		* @nf_bridge: Saved data about a bridged frame - see br_netfilter.c
	* @tc_index: Traffic control index		* @tc_index: Traffic control index

include/net/dst.h

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -94,7 +94,6 @@ struct dst_ops
	struct dst_entry * (negative_advice)(struct dst_entry );		struct dst_entry * (negative_advice)(struct dst_entry );
	void (link_failure)(struct sk_buff );		void (link_failure)(struct sk_buff );
	void (update_pmtu)(struct dst_entry dst, u32 mtu);		void (update_pmtu)(struct dst_entry dst, u32 mtu);
	int (get_mss)(struct dst_entry dst, u32 mtu);
	int entry_size;		int entry_size;

	atomic_t entries;		atomic_t entries;

net/core/neighbour.c

+1 −4

Original line number	Original line	Diff line number	Diff line
	@@ -1625,12 +1625,9 @@ static int neightbl_fill_info(struct neigh_table tbl, struct sk_buff skb,

	memset(&ndst, 0, sizeof(ndst));		memset(&ndst, 0, sizeof(ndst));

	for (cpu = 0; cpu < NR_CPUS; cpu++) {		for_each_cpu(cpu) {
	struct neigh_statistics *st;		struct neigh_statistics *st;

	if (!cpu_possible(cpu))
	continue;

	st = per_cpu_ptr(tbl->stats, cpu);		st = per_cpu_ptr(tbl->stats, cpu);
	ndst.ndts_allocs += st->allocs;		ndst.ndts_allocs += st->allocs;
	ndst.ndts_destroys += st->destroys;		ndst.ndts_destroys += st->destroys;

net/core/pktgen.c

+229 −277

File changed.

Preview size limit exceeded, changes collapsed.

net/core/skbuff.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -122,6 +122,8 @@ void skb_under_panic(struct sk_buff skb, int sz, void here)
	* __alloc_skb - allocate a network buffer		* __alloc_skb - allocate a network buffer
	* @size: size to allocate		* @size: size to allocate
	* @gfp_mask: allocation mask		* @gfp_mask: allocation mask
			* @fclone: allocate from fclone cache instead of head cache
			* and allocate a cloned (child) skb
	*		*
	* Allocate a new &sk_buff. The returned buffer has no headroom and a		* Allocate a new &sk_buff. The returned buffer has no headroom and a
	* tail room of size bytes. The object has a reference count of one.		* tail room of size bytes. The object has a reference count of one.