Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 314543
b: refs/heads/master
c: 9563877
h: refs/heads/master
i:
  314541: 3521120
  314539: 83644d2
  314535: 69b497d
  314527: b549e59
v: v3
  • Loading branch information
Sven Eckelmann authored and Antonio Quartulli committed Jun 20, 2012
1 parent a16ad0d commit fd088a3
Show file tree
Hide file tree
Showing 7 changed files with 44 additions and 42 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 84d5e5e003752bc56b413f8d2c3fcfeeec066145
refs/heads/master: 9563877ea52ea18bb4f1ed724c5e3a39bbbcf60b
20 changes: 11 additions & 9 deletions trunk/net/batman-adv/bat_sysfs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,9 +122,10 @@ ssize_t store_##_name(struct kobject *kobj, struct attribute *attr, \
char *buff, size_t count) \
{ \
struct net_device *net_dev = kobj_to_netdev(kobj); \
struct hard_iface *hard_iface = hardif_get_by_netdev(net_dev); \
struct hard_iface *hard_iface; \
ssize_t length; \
\
hard_iface = batadv_hardif_get_by_netdev(net_dev); \
if (!hard_iface) \
return 0; \
\
Expand All @@ -140,9 +141,10 @@ ssize_t show_##_name(struct kobject *kobj, \
struct attribute *attr, char *buff) \
{ \
struct net_device *net_dev = kobj_to_netdev(kobj); \
struct hard_iface *hard_iface = hardif_get_by_netdev(net_dev); \
struct hard_iface *hard_iface; \
ssize_t length; \
\
hard_iface = batadv_hardif_get_by_netdev(net_dev); \
if (!hard_iface) \
return 0; \
\
Expand Down Expand Up @@ -433,7 +435,7 @@ BAT_ATTR_SIF_BOOL(bonding, S_IRUGO | S_IWUSR, NULL);
#ifdef CONFIG_BATMAN_ADV_BLA
BAT_ATTR_SIF_BOOL(bridge_loop_avoidance, S_IRUGO | S_IWUSR, NULL);
#endif
BAT_ATTR_SIF_BOOL(fragmentation, S_IRUGO | S_IWUSR, update_min_mtu);
BAT_ATTR_SIF_BOOL(fragmentation, S_IRUGO | S_IWUSR, batadv_update_min_mtu);
BAT_ATTR_SIF_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);
Expand Down Expand Up @@ -523,7 +525,7 @@ static ssize_t show_mesh_iface(struct kobject *kobj, struct attribute *attr,
char *buff)
{
struct net_device *net_dev = kobj_to_netdev(kobj);
struct hard_iface *hard_iface = hardif_get_by_netdev(net_dev);
struct hard_iface *hard_iface = batadv_hardif_get_by_netdev(net_dev);
ssize_t length;

if (!hard_iface)
Expand All @@ -541,7 +543,7 @@ static ssize_t store_mesh_iface(struct kobject *kobj, struct attribute *attr,
char *buff, size_t count)
{
struct net_device *net_dev = kobj_to_netdev(kobj);
struct hard_iface *hard_iface = hardif_get_by_netdev(net_dev);
struct hard_iface *hard_iface = batadv_hardif_get_by_netdev(net_dev);
int status_tmp = -1;
int ret = count;

Expand Down Expand Up @@ -576,15 +578,15 @@ static ssize_t store_mesh_iface(struct kobject *kobj, struct attribute *attr,
}

if (status_tmp == IF_NOT_IN_USE) {
hardif_disable_interface(hard_iface);
batadv_hardif_disable_interface(hard_iface);
goto unlock;
}

/* if the interface already is in use */
if (hard_iface->if_status != IF_NOT_IN_USE)
hardif_disable_interface(hard_iface);
batadv_hardif_disable_interface(hard_iface);

ret = hardif_enable_interface(hard_iface, buff);
ret = batadv_hardif_enable_interface(hard_iface, buff);

unlock:
rtnl_unlock();
Expand All @@ -597,7 +599,7 @@ static ssize_t show_iface_status(struct kobject *kobj, struct attribute *attr,
char *buff)
{
struct net_device *net_dev = kobj_to_netdev(kobj);
struct hard_iface *hard_iface = hardif_get_by_netdev(net_dev);
struct hard_iface *hard_iface = batadv_hardif_get_by_netdev(net_dev);
ssize_t length;

if (!hard_iface)
Expand Down
32 changes: 16 additions & 16 deletions trunk/net/batman-adv/hard-interface.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

#include <linux/if_arp.h>

void hardif_free_rcu(struct rcu_head *rcu)
void batadv_hardif_free_rcu(struct rcu_head *rcu)
{
struct hard_iface *hard_iface;

Expand All @@ -41,7 +41,7 @@ void hardif_free_rcu(struct rcu_head *rcu)
kfree(hard_iface);
}

struct hard_iface *hardif_get_by_netdev(const struct net_device *net_dev)
struct hard_iface *batadv_hardif_get_by_netdev(const struct net_device *net_dev)
{
struct hard_iface *hard_iface;

Expand Down Expand Up @@ -180,7 +180,7 @@ static void check_known_mac_addr(const struct net_device *net_dev)
rcu_read_unlock();
}

int hardif_min_mtu(struct net_device *soft_iface)
int batadv_hardif_min_mtu(struct net_device *soft_iface)
{
const struct bat_priv *bat_priv = netdev_priv(soft_iface);
const struct hard_iface *hard_iface;
Expand Down Expand Up @@ -209,11 +209,11 @@ int hardif_min_mtu(struct net_device *soft_iface)
}

/* adjusts the MTU if a new interface with a smaller MTU appeared. */
void update_min_mtu(struct net_device *soft_iface)
void batadv_update_min_mtu(struct net_device *soft_iface)
{
int min_mtu;

min_mtu = hardif_min_mtu(soft_iface);
min_mtu = batadv_hardif_min_mtu(soft_iface);
if (soft_iface->mtu != min_mtu)
soft_iface->mtu = min_mtu;
}
Expand Down Expand Up @@ -242,7 +242,7 @@ static void hardif_activate_interface(struct hard_iface *hard_iface)
bat_info(hard_iface->soft_iface, "Interface activated: %s\n",
hard_iface->net_dev->name);

update_min_mtu(hard_iface->soft_iface);
batadv_update_min_mtu(hard_iface->soft_iface);

out:
if (primary_if)
Expand All @@ -260,11 +260,11 @@ static void hardif_deactivate_interface(struct hard_iface *hard_iface)
bat_info(hard_iface->soft_iface, "Interface deactivated: %s\n",
hard_iface->net_dev->name);

update_min_mtu(hard_iface->soft_iface);
batadv_update_min_mtu(hard_iface->soft_iface);
}

int hardif_enable_interface(struct hard_iface *hard_iface,
const char *iface_name)
int batadv_hardif_enable_interface(struct hard_iface *hard_iface,
const char *iface_name)
{
struct bat_priv *bat_priv;
struct net_device *soft_iface;
Expand Down Expand Up @@ -357,7 +357,7 @@ int hardif_enable_interface(struct hard_iface *hard_iface,
return ret;
}

void hardif_disable_interface(struct hard_iface *hard_iface)
void batadv_hardif_disable_interface(struct hard_iface *hard_iface)
{
struct bat_priv *bat_priv = netdev_priv(hard_iface->soft_iface);
struct hard_iface *primary_if = NULL;
Expand Down Expand Up @@ -461,7 +461,7 @@ static void hardif_remove_interface(struct hard_iface *hard_iface)

/* first deactivate interface */
if (hard_iface->if_status != IF_NOT_IN_USE)
hardif_disable_interface(hard_iface);
batadv_hardif_disable_interface(hard_iface);

if (hard_iface->if_status != IF_NOT_IN_USE)
return;
Expand All @@ -471,7 +471,7 @@ static void hardif_remove_interface(struct hard_iface *hard_iface)
hardif_free_ref(hard_iface);
}

void hardif_remove_interfaces(void)
void batadv_hardif_remove_interfaces(void)
{
struct hard_iface *hard_iface, *hard_iface_tmp;

Expand All @@ -488,7 +488,7 @@ static int hard_if_event(struct notifier_block *this,
unsigned long event, void *ptr)
{
struct net_device *net_dev = ptr;
struct hard_iface *hard_iface = hardif_get_by_netdev(net_dev);
struct hard_iface *hard_iface = batadv_hardif_get_by_netdev(net_dev);
struct hard_iface *primary_if = NULL;
struct bat_priv *bat_priv;

Expand All @@ -513,7 +513,7 @@ static int hard_if_event(struct notifier_block *this,
break;
case NETDEV_CHANGEMTU:
if (hard_iface->soft_iface)
update_min_mtu(hard_iface->soft_iface);
batadv_update_min_mtu(hard_iface->soft_iface);
break;
case NETDEV_CHANGEADDR:
if (hard_iface->if_status == IF_NOT_IN_USE)
Expand Down Expand Up @@ -545,7 +545,7 @@ static int hard_if_event(struct notifier_block *this,

/* This function returns true if the interface represented by ifindex is a
* 802.11 wireless device */
bool is_wifi_iface(int ifindex)
bool batadv_is_wifi_iface(int ifindex)
{
struct net_device *net_device = NULL;
bool ret = false;
Expand Down Expand Up @@ -573,6 +573,6 @@ bool is_wifi_iface(int ifindex)
return ret;
}

struct notifier_block hard_if_notifier = {
struct notifier_block batadv_hard_if_notifier = {
.notifier_call = hard_if_event,
};
22 changes: 11 additions & 11 deletions trunk/net/batman-adv/hard-interface.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,23 +31,23 @@ enum hard_if_state {
IF_I_WANT_YOU
};

extern struct notifier_block hard_if_notifier;
extern struct notifier_block batadv_hard_if_notifier;

struct hard_iface*
hardif_get_by_netdev(const struct net_device *net_dev);
int hardif_enable_interface(struct hard_iface *hard_iface,
const char *iface_name);
void hardif_disable_interface(struct hard_iface *hard_iface);
void hardif_remove_interfaces(void);
int hardif_min_mtu(struct net_device *soft_iface);
void update_min_mtu(struct net_device *soft_iface);
void hardif_free_rcu(struct rcu_head *rcu);
bool is_wifi_iface(int ifindex);
batadv_hardif_get_by_netdev(const struct net_device *net_dev);
int batadv_hardif_enable_interface(struct hard_iface *hard_iface,
const char *iface_name);
void batadv_hardif_disable_interface(struct hard_iface *hard_iface);
void batadv_hardif_remove_interfaces(void);
int batadv_hardif_min_mtu(struct net_device *soft_iface);
void batadv_update_min_mtu(struct net_device *soft_iface);
void batadv_hardif_free_rcu(struct rcu_head *rcu);
bool batadv_is_wifi_iface(int ifindex);

static inline void hardif_free_ref(struct hard_iface *hard_iface)
{
if (atomic_dec_and_test(&hard_iface->refcount))
call_rcu(&hard_iface->rcu, hardif_free_rcu);
call_rcu(&hard_iface->rcu, batadv_hardif_free_rcu);
}

static inline struct hard_iface *primary_if_get_selected(
Expand Down
6 changes: 3 additions & 3 deletions trunk/net/batman-adv/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ static int __init batman_init(void)
bat_socket_init();
batadv_debugfs_init();

register_netdevice_notifier(&hard_if_notifier);
register_netdevice_notifier(&batadv_hard_if_notifier);

pr_info("B.A.T.M.A.N. advanced %s (compatibility version %i) loaded\n",
SOURCE_VERSION, COMPAT_VERSION);
Expand All @@ -79,8 +79,8 @@ static int __init batman_init(void)
static void __exit batman_exit(void)
{
batadv_debugfs_destroy();
unregister_netdevice_notifier(&hard_if_notifier);
hardif_remove_interfaces();
unregister_netdevice_notifier(&batadv_hard_if_notifier);
batadv_hardif_remove_interfaces();

flush_workqueue(bat_event_workqueue);
destroy_workqueue(bat_event_workqueue);
Expand Down
2 changes: 1 addition & 1 deletion trunk/net/batman-adv/soft-interface.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ static int interface_set_mac_addr(struct net_device *dev, void *p)
static int interface_change_mtu(struct net_device *dev, int new_mtu)
{
/* check ranges */
if ((new_mtu < 68) || (new_mtu > hardif_min_mtu(dev)))
if ((new_mtu < 68) || (new_mtu > batadv_hardif_min_mtu(dev)))
return -EINVAL;

dev->mtu = new_mtu;
Expand Down
2 changes: 1 addition & 1 deletion trunk/net/batman-adv/translation-table.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ void tt_local_add(struct net_device *soft_iface, const uint8_t *addr,

memcpy(tt_local_entry->common.addr, addr, ETH_ALEN);
tt_local_entry->common.flags = NO_FLAGS;
if (is_wifi_iface(ifindex))
if (batadv_is_wifi_iface(ifindex))
tt_local_entry->common.flags |= TT_CLIENT_WIFI;
atomic_set(&tt_local_entry->common.refcount, 2);
tt_local_entry->last_seen = jiffies;
Expand Down

0 comments on commit fd088a3

Please sign in to comment.