From owner-cvs-src-old@FreeBSD.ORG Sat Oct 23 11:26:34 2010 Return-Path: Delivered-To: cvs-src-old@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 03CFC1065674 for ; Sat, 23 Oct 2010 11:26:34 +0000 (UTC) (envelope-from bschmidt@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E5D2E8FC1A for ; Sat, 23 Oct 2010 11:26:33 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o9NBQXBH041779 for ; Sat, 23 Oct 2010 11:26:33 GMT (envelope-from bschmidt@repoman.freebsd.org) Received: (from svn2cvs@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o9NBQX8c041778 for cvs-src-old@freebsd.org; Sat, 23 Oct 2010 11:26:33 GMT (envelope-from bschmidt@repoman.freebsd.org) Message-Id: <201010231126.o9NBQX8c041778@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to bschmidt@repoman.freebsd.org using -f From: Bernhard Schmidt Date: Sat, 23 Oct 2010 11:26:22 +0000 (UTC) To: cvs-src-old@freebsd.org X-FreeBSD-CVS-Branch: HEAD Subject: cvs commit: src/sys/dev/iwi if_iwi.c X-BeenThere: cvs-src-old@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: **OBSOLETE** CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Oct 2010 11:26:34 -0000 bschmidt 2010-10-23 11:26:22 UTC FreeBSD src repository Modified files: sys/dev/iwi if_iwi.c Log: SVN rev 214236 on 2010-10-23 11:26:22Z by bschmidt The firmware does pad notifications to an even number of bytes (at least the association notification), the included information though always contains an elem block with an odd number of bytes. We handle the last byte as if it might contain a whole elem block, this of course is not true as one byte is not enough to hold a block, we therefore discard the complete frame. The solution here is to subtract one from the actual notification length, this is also what the Linux driver does. With this change the frames ends exactly where the last elem block ends. This commit also reverts r214160 which is no longer required and now even wrong. MFC after: 1 week Revision Changes Path 1.77 +2 -2 src/sys/dev/iwi/if_iwi.c