From owner-svn-src-head@FreeBSD.ORG Fri Oct 5 00:08:18 2012 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 821BF106566C; Fri, 5 Oct 2012 00:08:18 +0000 (UTC) (envelope-from yanegomi@gmail.com) Received: from mail-ob0-f182.google.com (mail-ob0-f182.google.com [209.85.214.182]) by mx1.freebsd.org (Postfix) with ESMTP id BF6C48FC0C; Fri, 5 Oct 2012 00:08:17 +0000 (UTC) Received: by mail-ob0-f182.google.com with SMTP id wc20so1526902obb.13 for ; Thu, 04 Oct 2012 17:08:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=IPthyT5vKssHXX4SFZqPrSj/fRVLrSy00sasitiFACE=; b=EkogAwIIjZ7AU5dN1OdRwj8FzzO01gHRPNY6iWYJpUWEmTIEPXjGdJhJRlFr/Q46ZG ytrFMb9c4oA3ZdZq/ixAOEAIeCd3RxT33i0XrqC2R4HhahrbxRytbDnwvuSxgDq7U9H/ r+kMzpPZB5s4ng4fQ05naryCBVhlN9ZEyrLnLb/rk7CalTQO27rl7N010KNgJ4k9MahS RE4uUghxGcOU3M85SnRjgvcDIDUg7QXWwc1mmBdGsG6V5r6alT3d2R8GP/qmne/Wmz+j hONA3YH7gWhr27wrgOU1DNrwouyHcEmyY4frKn2HRLX8GEY01OwaNdo4hANQxcyV+zBO sfdQ== MIME-Version: 1.0 Received: by 10.60.171.134 with SMTP id au6mr5761915oec.69.1349395690886; Thu, 04 Oct 2012 17:08:10 -0700 (PDT) Received: by 10.76.142.201 with HTTP; Thu, 4 Oct 2012 17:08:10 -0700 (PDT) In-Reply-To: <201209242035.q8OKZvUM093772@svn.freebsd.org> References: <201209242035.q8OKZvUM093772@svn.freebsd.org> Date: Thu, 4 Oct 2012 17:08:10 -0700 Message-ID: From: Garrett Cooper To: Adrian Chadd Content-Type: multipart/mixed; boundary=bcaec550b604d1145e04cb44aa73 Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r240899 - head/sys/dev/ath X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Oct 2012 00:08:18 -0000 --bcaec550b604d1145e04cb44aa73 Content-Type: text/plain; charset=ISO-8859-1 On Mon, Sep 24, 2012 at 1:35 PM, Adrian Chadd wrote: > Author: adrian > Date: Mon Sep 24 20:35:56 2012 > New Revision: 240899 > URL: http://svn.freebsd.org/changeset/base/240899 > > Log: > Migrate the ath(4) KTR logging to use an ATH_KTR() macro. > > This should eventually be unified with ATH_DEBUG() so I can get both > from one macro; that may take some time. > > Add some new probes for TX and TX completion. This commit broke the non-IEEE80211_SUPPORT_TDMA case. My attached patch fixes it by better unifying the IEEE80211_SUPPORT_TDMA and non-IEEE80211_SUPPORT_TDMA cases where it made sense (it could be further unified, but that might make things more convoluted). Thanks! -Garrett --bcaec550b604d1145e04cb44aa73 Content-Type: application/octet-stream; name="fix-if_ath_tx-non-IEEE80211_SUPPORT_TDMA.patch" Content-Disposition: attachment; filename="fix-if_ath_tx-non-IEEE80211_SUPPORT_TDMA.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_h7wjb0230 SW5kZXg6IGRldi9hdGgvaWZfYXRoX3R4LmMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gZGV2L2F0aC9pZl9hdGhf dHguYwkocmV2aXNpb24gMjQxMjEzKQorKysgZGV2L2F0aC9pZl9hdGhfdHguYwkod29ya2luZyBj b3B5KQpAQCAtNzI1LDE1ICs3MjUsMTkgQEAKIAogCS8qIEZvciBub3csIHNvIG5vdCB0byBnZW5l cmF0ZSB3aGl0ZXNwYWNlIGRpZmZzICovCiAJaWYgKDEpIHsKLSNpZmRlZiBJRUVFODAyMTFfU1VQ UE9SVF9URE1BCiAJCWludCBxYnVzeTsKIAogCQlBVEhfVFhRX0lOU0VSVF9UQUlMKHR4cSwgYmYs IGJmX2xpc3QpOwogCQlxYnVzeSA9IGF0aF9oYWxfdHhxZW5hYmxlZChhaCwgdHhxLT5heHFfcW51 bSk7Ci0KIAkJQVRIX0tUUihzYywgQVRIX0tUUl9UWCwgNCwKLQkJICAgICJhdGhfdHhfaGFuZG9m ZjogdHhxPSV1LCBhZGQgYmY9JXAsIHFidXN5PSVkLCBkZXB0aD0lZCIsCisJCSAgICAiYXRoX3R4 X2hhbmRvZmYlczogdHhxPSV1LCBhZGQgYmY9JXAsIHFidXN5PSVkLCBkZXB0aD0lZCIsCisjaWZk ZWYgSUVFRTgwMjExX1NVUFBPUlRfVERNQQorCQkgICAgIiIKKyNlbHNlCisJCSAgICAiOiBub24t dGRtYSIKKyNlbmRpZgogCQkgICAgdHhxLT5heHFfcW51bSwgYmYsIHFidXN5LCB0eHEtPmF4cV9k ZXB0aCk7CisjaWZkZWYgSUVFRTgwMjExX1NVUFBPUlRfVERNQQogCQlpZiAodHhxLT5heHFfbGlu ayA9PSBOVUxMKSB7CiAJCQkvKgogCQkJICogQmUgY2FyZWZ1bCB3cml0aW5nIHRoZSBhZGRyZXNz IHRvIFRYRFAuICBJZgpAQCAtODA4LDE0ICs4MTIsNiBAQAogCQkJfQogCQl9CiAjZWxzZQotCQlB VEhfVFhRX0lOU0VSVF9UQUlMKHR4cSwgYmYsIGJmX2xpc3QpOwotCQlBVEhfS1RSKHNjLCBBVEhf S1RSX1RYLCA0LAotCQkgICAgImF0aF90eF9oYW5kb2ZmOiBub24tdGRtYTogdHhxPSV1LCBhZGQg YmY9JXAsIHFidXN5PSVkLCAiCi0JCSAgICAiZGVwdGg9JWQiLAotCQkgICAgdHhxLT5heHFfcW51 bSwKLQkJICAgIGJmLAotCQkgICAgcWJ1c3ksCi0JCSAgICB0eHEtPmF4cV9kZXB0aCk7CiAJCWlm ICh0eHEtPmF4cV9saW5rID09IE5VTEwpIHsKIAkJCWF0aF9oYWxfcHV0dHhidWYoYWgsIHR4cS0+ YXhxX3FudW0sIGJmLT5iZl9kYWRkcik7CiAJCQlEUFJJTlRGKHNjLCBBVEhfREVCVUdfWE1JVCwK --bcaec550b604d1145e04cb44aa73--