diff options
| author | Linus Lüssing <linus.luessing@web.de> | 2010-11-21 23:55:52 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-11-29 19:09:11 (GMT) |
| commit | 641ee3f8f4375bde4e216aacd26d286a34efed61 (patch) | |
| tree | 033e80f7abeff43d97f4b46f55a14697a1c522e3 /drivers/staging/batman-adv/routing.c | |
| parent | 420193573f1191b22e08f85ead41c090d283dd05 (diff) | |
| download | linux-fsl-qoriq-641ee3f8f4375bde4e216aacd26d286a34efed61.tar.xz | |
Staging: batman-adv: Unify sysfs file names with their bat_priv atomics
Both sysfs entries and variable names shall be as descriptive as
possible while not exceeding a certain length. This patch renames
bat_priv atomics to be equally descriptive with their according sysfs
entries.
Unifying sysfs and bat_priv atomic names also makes it easier to find
each others pendant.
The reduced ("type"-)information which was previously indicated with a
_enabled for booleans got substituted by a comment in bat_priv.
This patch has also been done in regards for the future BAT_ATTR_*
macros (they only need one name argument instead of a file and variable
name).
Signed-off-by: Linus Lüssing <linus.luessing@web.de>
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Signed-off-by: Sven Eckelmann <sven.eckelmann@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/batman-adv/routing.c')
| -rw-r--r-- | drivers/staging/batman-adv/routing.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/batman-adv/routing.c b/drivers/staging/batman-adv/routing.c index 3946c7c..1b35486 100644 --- a/drivers/staging/batman-adv/routing.c +++ b/drivers/staging/batman-adv/routing.c @@ -1019,7 +1019,7 @@ struct neigh_node *find_router(struct bat_priv *bat_priv, /* without bonding, the first node should * always choose the default router. */ - bonding_enabled = atomic_read(&bat_priv->bonding_enabled); + bonding_enabled = atomic_read(&bat_priv->bonding); if ((!recv_if) && (!bonding_enabled)) return orig_node->router; @@ -1168,7 +1168,7 @@ int route_unicast_packet(struct sk_buff *skb, struct batman_if *recv_if, unicast_packet = (struct unicast_packet *)skb->data; if (unicast_packet->packet_type == BAT_UNICAST && - atomic_read(&bat_priv->frag_enabled) && + atomic_read(&bat_priv->fragmentation) && skb->len > batman_if->net_dev->mtu) return frag_send_skb(skb, bat_priv, batman_if, dstaddr); |