From patchwork Fri Feb 17 07:18:30 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Lindner X-Patchwork-Id: 141746 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id D132E1007D4 for ; Fri, 17 Feb 2012 18:25:43 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751323Ab2BQHZl (ORCPT ); Fri, 17 Feb 2012 02:25:41 -0500 Received: from nm3.bullet.mail.ukl.yahoo.com ([217.146.182.224]:22067 "HELO nm3.bullet.mail.ukl.yahoo.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1751163Ab2BQHZk (ORCPT ); Fri, 17 Feb 2012 02:25:40 -0500 X-Greylist: delayed 347 seconds by postgrey-1.27 at vger.kernel.org; Fri, 17 Feb 2012 02:25:40 EST Received: from [217.146.183.181] by nm3.bullet.mail.ukl.yahoo.com with NNFMP; 17 Feb 2012 07:19:52 -0000 Received: from [217.146.182.73] by tm12.bullet.mail.ukl.yahoo.com with NNFMP; 17 Feb 2012 07:19:52 -0000 Received: from [127.0.0.1] by smtp119.mail.ukl.yahoo.com with NNFMP; 17 Feb 2012 07:19:52 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.de; s=s1024; t=1329463192; bh=j72/zqBcj1kmFSzGqFApu6NYWRn7d1G/Y6QdLfvpbK0=; h=X-Yahoo-Newman-Id:X-Yahoo-Newman-Property:X-YMail-OSG:X-Yahoo-SMTP:Received:From:To:Cc:Subject:Date:Message-Id:X-Mailer:In-Reply-To:References; b=xiJcfCNmA/d4kD7TaBtoVKTFzKIKR1FyCd7aomW+3G5x8bnn8994uJDtl/5zcvtBfvpVErN1hlGLcAhDGZzGxP3i9LGSZXmyhYKKYTQnygQPgZKb8rc4r00MzW1DfCIWrPze5YGp2JXqGjaLWY3pqTHTupOViCJpbr/z7gX3QwE= X-Yahoo-Newman-Id: 939668.14833.bm@smtp119.mail.ukl.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: Wa47LGMVM1lH_TM1cSvetLekVc9PQfnjA5h1.mi9Q1XsMTf q8DjCU8ZBhAfQC5Xq0Qr567J7Dh8pUV97laxYOnEjl_KNLeCAMkgtwvEpPzg MXrHk9yRRgYPM4bO06Fu249uwp0828zObzQzx3mW0XfxRbmvC3hv7_ki65Oq D7_3Z6azMHpgOGzD2E5lgOH0ruHl8q1OiZcoyBRJpNmSgh64dRV0PFhjZ5H7 kOtvUWx.74Y5JmIUXElhhGkHgMDefD.cGiRirBMmfNA9HgDn.r55kiRLxM_u vZ7bHLZ1k8Xmn.W8HcMaYKcCJ99DXyiwGS67KeDgWl2NvwNZ0oqz89Josv9Z Iwfrtj8hdvTpTSNUM619ExzxJvWFnst1SVjHqZ56yR3Dz0fouBO4eXotbx71 SnA-- X-Yahoo-SMTP: tW.h3tiswBBMXO2coYcbPigGD5Lt6zY_.Zc- Received: from localhost (lindner_marek@210.177.7.38 with plain) by smtp119.mail.ukl.yahoo.com with SMTP; 16 Feb 2012 23:19:51 -0800 PST From: Marek Lindner To: davem@davemloft.net Cc: netdev@vger.kernel.org, b.a.t.m.a.n@lists.open-mesh.org, Marek Lindner Subject: [PATCH 10/10] batman-adv: export used routing algorithm via sysfs Date: Fri, 17 Feb 2012 15:18:30 +0800 Message-Id: <1329463110-856-11-git-send-email-lindner_marek@yahoo.de> X-Mailer: git-send-email 1.7.9 In-Reply-To: <1329463110-856-1-git-send-email-lindner_marek@yahoo.de> References: <1329463110-856-1-git-send-email-lindner_marek@yahoo.de> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Marek Lindner --- Documentation/ABI/testing/sysfs-class-net-mesh | 7 +++++++ net/batman-adv/bat_sysfs.c | 9 +++++++++ 2 files changed, 16 insertions(+), 0 deletions(-) diff --git a/Documentation/ABI/testing/sysfs-class-net-mesh b/Documentation/ABI/testing/sysfs-class-net-mesh index b020014..b218e0f 100644 --- a/Documentation/ABI/testing/sysfs-class-net-mesh +++ b/Documentation/ABI/testing/sysfs-class-net-mesh @@ -65,6 +65,13 @@ Description: Defines the penalty which will be applied to an originator message's tq-field on every hop. +What: /sys/class/net//mesh/routing_algo +Date: Dec 2011 +Contact: Marek Lindner +Description: + Defines the routing procotol this mesh instance + uses to find the optimal paths through the mesh. + What: /sys/class/net//mesh/vis_mode Date: May 2010 Contact: Marek Lindner diff --git a/net/batman-adv/bat_sysfs.c b/net/batman-adv/bat_sysfs.c index c25492f..480ae0a 100644 --- a/net/batman-adv/bat_sysfs.c +++ b/net/batman-adv/bat_sysfs.c @@ -272,6 +272,13 @@ static ssize_t store_vis_mode(struct kobject *kobj, struct attribute *attr, return count; } +static ssize_t show_bat_algo(struct kobject *kobj, struct attribute *attr, + char *buff) +{ + struct bat_priv *bat_priv = kobj_to_batpriv(kobj); + return sprintf(buff, "%s\n", bat_priv->bat_algo_ops->name); +} + static void post_gw_deselect(struct net_device *net_dev) { struct bat_priv *bat_priv = netdev_priv(net_dev); @@ -382,6 +389,7 @@ BAT_ATTR_BOOL(bonding, S_IRUGO | S_IWUSR, NULL); BAT_ATTR_BOOL(fragmentation, S_IRUGO | S_IWUSR, update_min_mtu); BAT_ATTR_BOOL(ap_isolation, S_IRUGO | S_IWUSR, NULL); static BAT_ATTR(vis_mode, S_IRUGO | S_IWUSR, show_vis_mode, store_vis_mode); +static BAT_ATTR(routing_algo, S_IRUGO, show_bat_algo, NULL); static BAT_ATTR(gw_mode, S_IRUGO | S_IWUSR, show_gw_mode, store_gw_mode); BAT_ATTR_UINT(orig_interval, S_IRUGO | S_IWUSR, 2 * JITTER, INT_MAX, NULL); BAT_ATTR_UINT(hop_penalty, S_IRUGO | S_IWUSR, 0, TQ_MAX_VALUE, NULL); @@ -399,6 +407,7 @@ static struct bat_attribute *mesh_attrs[] = { &bat_attr_fragmentation, &bat_attr_ap_isolation, &bat_attr_vis_mode, + &bat_attr_routing_algo, &bat_attr_gw_mode, &bat_attr_orig_interval, &bat_attr_hop_penalty,