From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 28 May 2010 17:18:40 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.35-rc1~24
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=72da3bc0cb3e82bd95f278a0c5c988e506e56d13;p=~emulex%2Finfiniband.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (22 commits)
  netlink: bug fix: wrong size was calculated for vfinfo list blob
  netlink: bug fix: don't overrun skbs on vf_port dump
  xt_tee: use skb_dst_drop()
  netdev/fec: fix ifconfig eth0 down hang issue
  cnic: Fix context memory init. on 5709.
  drivers/net: Eliminate a NULL pointer dereference
  drivers/net/hamradio: Eliminate a NULL pointer dereference
  be2net: Patch removes redundant while statement in loop.
  ipv6: Add GSO support on forwarding path
  net: fix __neigh_event_send()
  vhost: fix the memory leak which will happen when memory_access_ok fails
  vhost-net: fix to check the return value of copy_to/from_user() correctly
  vhost: fix to check the return value of copy_to/from_user() correctly
  vhost: Fix host panic if ioctl called with wrong index
  net: fix lock_sock_bh/unlock_sock_bh
  net/iucv: Add missing spin_unlock
  net: ll_temac: fix checksum offload logic
  net: ll_temac: fix interrupt bug when interrupt 0 is used
  sctp: dubious bitfields in sctp_transport
  ipmr: off by one in __ipmr_fill_mroute()
  ...
---

72da3bc0cb3e82bd95f278a0c5c988e506e56d13
diff --cc drivers/net/ll_temac_main.c
index fa7620e2840,fbd07de2e08..52dcc849564
--- a/drivers/net/ll_temac_main.c
+++ b/drivers/net/ll_temac_main.c
@@@ -926,8 -948,20 +948,20 @@@ temac_of_probe(struct of_device *op, co
  		goto nodev;
  	}
  
+ 	/* Setup checksum offload, but default to off if not specified */
+ 	lp->temac_features = 0;
+ 	p = (__be32 *)of_get_property(op->dev.of_node, "xlnx,txcsum", NULL);
+ 	if (p && be32_to_cpu(*p)) {
+ 		lp->temac_features |= TEMAC_FEATURE_TX_CSUM;
+ 		/* Can checksum TCP/UDP over IPv4. */
+ 		ndev->features |= NETIF_F_IP_CSUM;
+ 	}
+ 	p = (__be32 *)of_get_property(op->dev.of_node, "xlnx,rxcsum", NULL);
+ 	if (p && be32_to_cpu(*p))
+ 		lp->temac_features |= TEMAC_FEATURE_RX_CSUM;
+ 
  	/* Find the DMA node, map the DMA registers, and decode the DMA IRQs */
 -	np = of_parse_phandle(op->node, "llink-connected", 0);
 +	np = of_parse_phandle(op->dev.of_node, "llink-connected", 0);
  	if (!np) {
  		dev_err(&op->dev, "could not find DMA node\n");
  		goto nodev;