Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (183 commits)
  [TG3]: Update version to 3.78.
  [TG3]: Add missing NVRAM strapping.
  [TG3]: Enable auto MDI.
  [TG3]: Fix the polarity bit.
  [TG3]: Fix irq_sync race condition.
  [NET_SCHED]: ematch: module autoloading
  [TCP]: tcp probe wraparound handling and other changes
  [RTNETLINK]: rtnl_link: allow specifying initial device address
  [RTNETLINK]: rtnl_link API simplification
  [VLAN]: Fix MAC address handling
  [ETH]: Validate address in eth_mac_addr
  [NET]: Fix races in net_rx_action vs netpoll.
  [AF_UNIX]: Rewrite garbage collector, fixes race.
  [NETFILTER]: {ip, nf}_conntrack_sctp: fix remotely triggerable NULL ptr dereference (CVE-2007-2876)
  [NET]: Make all initialized struct seq_operations const.
  [UDP]: Fix length check.
  [IPV6]: Remove unneeded pointer idev from addrconf_cleanup().
  [DECNET]: Another unnecessary net/tcp.h inclusion in net/dn.h
  [IPV6]: Make IPV6_{RECV,2292}RTHDR boolean options.
  [IPV6]: Do not send RH0 anymore.
  ...

Fixed up trivial conflict in Documentation/feature-removal-schedule.txt
manually.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

4 files changed, 7 insertions, 7 deletions

diff --git a/arch/ppc/8260_io/enet.c b/arch/ppc/8260_io/enet.c
index 4c0a7d732f69..615b6583d9b0 100644
--- a/arch/ppc/8260_io/enet.c
+++ b/arch/ppc/8260_io/enet.c
@@ -477,9 +477,9 @@ for (;;) {
                 }
                 else {
                         skb_put(skb,pkt_len-4); /* Make room */
-                        eth_copy_and_sum(skb,
+                        skb_copy_to_linear_data(skb,
                                 (unsigned char *)__va(bdp->cbd_bufaddr),
-                                pkt_len-4, 0);
+                                pkt_len-4);
                         skb->protocol=eth_type_trans(skb,dev);
                         netif_rx(skb);
                 }
diff --git a/arch/ppc/8260_io/fcc_enet.c b/arch/ppc/8260_io/fcc_enet.c
index cab395da25da..6f3ed6a72e0b 100644
--- a/arch/ppc/8260_io/fcc_enet.c
+++ b/arch/ppc/8260_io/fcc_enet.c
@@ -734,9 +734,9 @@ for (;;) {
                 }
                 else {
                         skb_put(skb,pkt_len);   /* Make room */
-                        eth_copy_and_sum(skb,
+                        skb_copy_to_linear_data(skb,
                                 (unsigned char *)__va(bdp->cbd_bufaddr),
-                                pkt_len, 0);
+                                pkt_len);
                         skb->protocol=eth_type_trans(skb,dev);
                         netif_rx(skb);
                 }
diff --git a/arch/ppc/8xx_io/enet.c b/arch/ppc/8xx_io/enet.c
index e58288e14369..703d47eee436 100644
--- a/arch/ppc/8xx_io/enet.c
+++ b/arch/ppc/8xx_io/enet.c
@@ -506,9 +506,9 @@ for (;;) {
                 }
                 else {
                         skb_put(skb,pkt_len-4); /* Make room */
-                        eth_copy_and_sum(skb,
+                        skb_copy_to_linear_data(skb,
                                 cep->rx_vaddr[bdp - cep->rx_bd_base],
-                                pkt_len-4, 0);
+                                pkt_len-4);
                         skb->protocol=eth_type_trans(skb,dev);
                         netif_rx(skb);
                 }
diff --git a/arch/ppc/8xx_io/fec.c b/arch/ppc/8xx_io/fec.c
index d38335d2d710..0288279be9aa 100644
--- a/arch/ppc/8xx_io/fec.c
+++ b/arch/ppc/8xx_io/fec.c
@@ -725,7 +725,7 @@ while (!(bdp->cbd_sc & BD_ENET_RX_EMPTY)) {
                 fep->stats.rx_dropped++;
         } else {
                 skb_put(skb,pkt_len-4); /* Make room */
-                eth_copy_and_sum(skb, data, pkt_len-4, 0);
+                skb_copy_to_linear_data(skb, data, pkt_len-4);
                 skb->protocol=eth_type_trans(skb,dev);
                 netif_rx(skb);
         }