Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki

2011-03-10 13:50:10 -05:00 · 2011-03-10 13:50:10 -05:00 · 2295238ee1
parent 69da4c8cfa 5208aa14ea
commit 2295238ee1
1 changed files with 2 additions and 0 deletions
--- a/cpu/mc1322x/lib/maca.c
+++ b/cpu/mc1322x/lib/maca.c
@ -368,7 +368,9 @@ void post_receive(void) {
 			  ( 4 << PRECOUNT) |
 			  ( fcs_mode << NOFC ) |
 			  ( prm_mode << PRM) |
+#if 0 //dak says removing ctrl auto fixes the autoack checksum error --- doesn't cause a performance issue either
 			  (1 << maca_ctrl_auto) |
+#endif
 			  (maca_ctrl_seq_rx));
 	/* status bit 10 is set immediately */
        /* then 11, 10, and 9 get set */