[134/146] atm: expose ATM device index in sysfs

From: Greg KH
Date: Wed Jun 01 2011 - 04:57:57 EST

2.6.38-stable review patch. If anyone has any objections, please let us know.


From: Dan Williams <dcbw@xxxxxxxxxx>

commit e7a46b4d0839c2a3aa2e0ae0b145f293f6738498 upstream.

It's currently exposed only through /proc which, besides requiring
screen-scraping, doesn't allow userspace to distinguish between two
identical ATM adapters with different ATM indexes. The ATM device index
is required when using PPPoATM on a system with multiple ATM adapters.

Signed-off-by: Dan Williams <dcbw@xxxxxxxxxx>
Reviewed-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Tested-by: David Woodhouse <dwmw2@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>

net/atm/atm_sysfs.c | 10 ++++++++++
1 file changed, 10 insertions(+)

--- a/net/atm/atm_sysfs.c
+++ b/net/atm/atm_sysfs.c
@@ -59,6 +59,14 @@ static ssize_t show_atmaddress(struct de
return pos - buf;

+static ssize_t show_atmindex(struct device *cdev,
+ struct device_attribute *attr, char *buf)
+ struct atm_dev *adev = to_atm_dev(cdev);
+ return sprintf(buf, "%d\n", adev->number);
static ssize_t show_carrier(struct device *cdev,
struct device_attribute *attr, char *buf)
@@ -99,6 +107,7 @@ static ssize_t show_link_rate(struct dev

static DEVICE_ATTR(address, S_IRUGO, show_address, NULL);
static DEVICE_ATTR(atmaddress, S_IRUGO, show_atmaddress, NULL);
+static DEVICE_ATTR(atmindex, S_IRUGO, show_atmindex, NULL);
static DEVICE_ATTR(carrier, S_IRUGO, show_carrier, NULL);
static DEVICE_ATTR(type, S_IRUGO, show_type, NULL);
static DEVICE_ATTR(link_rate, S_IRUGO, show_link_rate, NULL);
@@ -106,6 +115,7 @@ static DEVICE_ATTR(link_rate, S_IRUGO, s
static struct device_attribute *atm_attrs[] = {
+ &dev_attr_atmindex,

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/