From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sat, 23 Sep 2006 23:49:31 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.19-rc1~1272
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=a4c12d6c5dde48c69464baf7c703e425ee511433;hp=-c

Merge /pub/scm/linux/kernel/git/davem/net-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (353 commits)
  [IPV6] ADDRCONF: Mobile IPv6 Home Address support.
  [IPV6] ADDRCONF: Allow non-DAD'able addresses.
  [IPV6] NDISC: Fix is_router flag setting.
  [IPV6] ADDRCONF: Convert addrconf_lock to RCU.
  [IPV6] NDISC: Add proxy_ndp sysctl.
  [IPV6] NDISC: Set per-entry is_router flag in Proxy NA.
  [IPV6] NDISC: Avoid updating neighbor cache for proxied address in receiving NA.
  [IPV6]: Don't forward packets to proxied link-local address.
  [IPV6] NDISC: Handle NDP messages to proxied addresses.
  [NETFILTER]: PPTP conntrack: fix another GRE keymap leak
  [NETFILTER]: PPTP conntrack: fix GRE keymap leak
  [NETFILTER]: PPTP conntrack: fix PPTP_IN_CALL message types
  [NETFILTER]: PPTP conntrack: check call ID before changing state
  [NETFILTER]: PPTP conntrack: clean up debugging cruft
  [NETFILTER]: PPTP conntrack: consolidate header parsing
  [NETFILTER]: PPTP conntrack: consolidate header size checks
  [NETFILTER]: PPTP conntrack: simplify expectation handling
  [NETFILTER]: PPTP conntrack: remove unnecessary cid/pcid header pointers
  [NETFILTER]: PPTP conntrack: fix header definitions
  [NETFILTER]: PPTP conntrack: remove more dead code
  ...
---

a4c12d6c5dde48c69464baf7c703e425ee511433
diff --combined drivers/net/mv643xx_eth.c
index 59de3e74d2d7,38df58fdb358..d4dcc856b3cd
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@@ -385,7 -385,7 +385,7 @@@ static int mv643xx_eth_receive_queue(st
  	struct pkt_info pkt_info;
  
  	while (budget-- > 0 && eth_port_receive(mp, &pkt_info) == ETH_OK) {
 -		dma_unmap_single(NULL, pkt_info.buf_ptr, RX_SKB_SIZE,
 +		dma_unmap_single(NULL, pkt_info.buf_ptr, ETH_RX_SKB_SIZE,
  							DMA_FROM_DEVICE);
  		mp->rx_desc_count--;
  		received_packets++;
@@@ -1147,7 -1147,7 +1147,7 @@@ static void eth_tx_submit_descs_for_skb
  	desc->byte_cnt = length;
  	desc->buf_ptr = dma_map_single(NULL, skb->data, length, DMA_TO_DEVICE);
  
- 	if (skb->ip_summed == CHECKSUM_HW) {
+ 	if (skb->ip_summed == CHECKSUM_PARTIAL) {
  		BUG_ON(skb->protocol != ETH_P_IP);
  
  		cmd_sts |= ETH_GEN_TCP_UDP_CHECKSUM |