diff options
| author | David S. Miller <davem@davemloft.net> | 2011-06-09 14:56:13 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-06-09 14:56:13 -0700 |
| commit | 6018e1183ba52735d47e8c183497d8598da75351 (patch) | |
| tree | 3e9be6d850e292274ff05744ce36431492b975c7 /net/batman-adv/bat_sysfs.c | |
| parent | 075cd29e307720dfde5b67d1715a102473bf4623 (diff) | |
| parent | ecbd532108cb21d9d3770f73e168bad65d14d9eb (diff) | |
| download | linux-stable-6018e1183ba52735d47e8c183497d8598da75351.tar.gz | |
Merge branch 'batman-adv/next' of git://git.open-mesh.org/ecsv/linux-merge
Diffstat (limited to 'net/batman-adv/bat_sysfs.c')
| -rw-r--r-- | net/batman-adv/bat_sysfs.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/net/batman-adv/bat_sysfs.c b/net/batman-adv/bat_sysfs.c index 6f70560ef508..924d5773da21 100644 --- a/net/batman-adv/bat_sysfs.c +++ b/net/batman-adv/bat_sysfs.c @@ -28,9 +28,17 @@ #include "gateway_client.h" #include "vis.h" -#define to_dev(obj) container_of(obj, struct device, kobj) -#define kobj_to_netdev(obj) to_net_dev(to_dev(obj->parent)) -#define kobj_to_batpriv(obj) netdev_priv(kobj_to_netdev(obj)) +static struct net_device *kobj_to_netdev(struct kobject *obj) +{ + struct device *dev = container_of(obj->parent, struct device, kobj); + return to_net_dev(dev); +} + +static struct bat_priv *kobj_to_batpriv(struct kobject *obj) +{ + struct net_device *net_dev = kobj_to_netdev(obj); + return netdev_priv(net_dev); +} /* Use this, if you have customized show and store functions */ #define BAT_ATTR(_name, _mode, _show, _store) \ |