From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 18 Jun 2009 21:07:15 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d2aa4550379f92e929af7ed1dd4f55e6a1e331f8;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

Merge git://git./linux/kernel/git/davem/net-next-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (55 commits)
  netxen: fix tx ring accounting
  netxen: fix detection of cut-thru firmware mode
  forcedeth: fix dma api mismatches
  atm: sk_wmem_alloc initial value is one
  net: correct off-by-one write allocations reports
  via-velocity : fix no link detection on boot
  Net / e100: Fix suspend of devices that cannot be power managed
  TI DaVinci EMAC : Fix rmmod error
  net: group address list and its count
  ipv4: Fix fib_trie rebalancing, part 2
  pkt_sched: Update drops stats in act_police
  sky2: version 1.23
  sky2: add GRO support
  sky2: skb recycling
  sky2: reduce default transmit ring
  sky2: receive counter update
  sky2: fix shutdown synchronization
  sky2: PCI irq issues
  sky2: more receive shutdown
  sky2: turn off pause during shutdown
  ...

Manually fix trivial conflict in net/core/skbuff.c due to kmemcheck
---

d2aa4550379f92e929af7ed1dd4f55e6a1e331f8
diff --cc net/core/skbuff.c
index 5c93435b0347,a4c01f5c6585..9e0597d189b0
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@@ -202,8 -201,10 +202,12 @@@ struct sk_buff *__alloc_skb(unsigned in
  	skb->data = data;
  	skb_reset_tail_pointer(skb);
  	skb->end = skb->tail + size;
 +	kmemcheck_annotate_bitfield(skb, flags1);
 +	kmemcheck_annotate_bitfield(skb, flags2);
+ #ifdef NET_SKBUFF_DATA_USES_OFFSET
+ 	skb->mac_header = ~0U;
+ #endif
+ 
  	/* make sure we initialize shinfo sequentially */
  	shinfo = skb_shinfo(skb);
  	atomic_set(&shinfo->dataref, 1);