Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net...

diff --git a/drivers/net/hamachi.c b/drivers/net/hamachi.c
index f5fba73c87380c3350e1f3416fdd01b70233a114..a09041aa85099d0e210cda09de1ea90da8f2a4b5 100644 (file)
--- a/drivers/net/hamachi.c
+++ b/drivers/net/hamachi.c
@@ -134,6 +134,7 @@ static int tx_params[MAX_UNITS] = {-1, -1, -1, -1, -1, -1, -1, -1};
  *   TCP and UDP packets.  Otherwise the upper layers do the calculation.
  * 3/10/1999 Pete Wyckoff <wyckoff@ca.sandia.gov>
  */
+#define RX_CHECKSUM
 
 /* Operational parameters that usually are not changed. */
 /* Time in jiffies before concluding the transmitter is hung. */