diff options
author | Simon Wunderlich <siwu@hrz.tu-chemnitz.de> | 2013-04-25 05:57:42 -0400 |
---|---|---|
committer | Antonio Quartulli <antonio@meshcoding.com> | 2013-10-09 15:22:32 -0400 |
commit | 9f4980e68b4b72e6a4d7caadfacc54260d05ebf6 (patch) | |
tree | ddff273e32b44ba11aefcf9d380f47563504a194 /net/batman-adv/sysfs.c | |
parent | 0035f97e65761099cbfa9554ee8cd9bfc395eeea (diff) |
batman-adv: remove vis functionality
This is replaced by a userspace program, we don't need this
functionality to bloat the kernel.
Signed-off-by: Simon Wunderlich <siwu@hrz.tu-chemnitz.de>
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Signed-off-by: Antonio Quartulli <antonio@meshcoding.com>
Diffstat (limited to 'net/batman-adv/sysfs.c')
-rw-r--r-- | net/batman-adv/sysfs.c | 72 |
1 files changed, 0 insertions, 72 deletions
diff --git a/net/batman-adv/sysfs.c b/net/batman-adv/sysfs.c index fbc1c251711d..869eb46329cb 100644 --- a/net/batman-adv/sysfs.c +++ b/net/batman-adv/sysfs.c | |||
@@ -26,7 +26,6 @@ | |||
26 | #include "hard-interface.h" | 26 | #include "hard-interface.h" |
27 | #include "gateway_common.h" | 27 | #include "gateway_common.h" |
28 | #include "gateway_client.h" | 28 | #include "gateway_client.h" |
29 | #include "vis.h" | ||
30 | 29 | ||
31 | static struct net_device *batadv_kobj_to_netdev(struct kobject *obj) | 30 | static struct net_device *batadv_kobj_to_netdev(struct kobject *obj) |
32 | { | 31 | { |
@@ -231,74 +230,6 @@ __batadv_store_uint_attr(const char *buff, size_t count, | |||
231 | return ret; | 230 | return ret; |
232 | } | 231 | } |
233 | 232 | ||
234 | static ssize_t batadv_show_vis_mode(struct kobject *kobj, | ||
235 | struct attribute *attr, char *buff) | ||
236 | { | ||
237 | struct batadv_priv *bat_priv = batadv_kobj_to_batpriv(kobj); | ||
238 | int vis_mode = atomic_read(&bat_priv->vis_mode); | ||
239 | const char *mode; | ||
240 | |||
241 | if (vis_mode == BATADV_VIS_TYPE_CLIENT_UPDATE) | ||
242 | mode = "client"; | ||
243 | else | ||
244 | mode = "server"; | ||
245 | |||
246 | return sprintf(buff, "%s\n", mode); | ||
247 | } | ||
248 | |||
249 | static ssize_t batadv_store_vis_mode(struct kobject *kobj, | ||
250 | struct attribute *attr, char *buff, | ||
251 | size_t count) | ||
252 | { | ||
253 | struct net_device *net_dev = batadv_kobj_to_netdev(kobj); | ||
254 | struct batadv_priv *bat_priv = netdev_priv(net_dev); | ||
255 | unsigned long val; | ||
256 | int ret, vis_mode_tmp = -1; | ||
257 | const char *old_mode, *new_mode; | ||
258 | |||
259 | ret = kstrtoul(buff, 10, &val); | ||
260 | |||
261 | if (((count == 2) && (!ret) && | ||
262 | (val == BATADV_VIS_TYPE_CLIENT_UPDATE)) || | ||
263 | (strncmp(buff, "client", 6) == 0) || | ||
264 | (strncmp(buff, "off", 3) == 0)) | ||
265 | vis_mode_tmp = BATADV_VIS_TYPE_CLIENT_UPDATE; | ||
266 | |||
267 | if (((count == 2) && (!ret) && | ||
268 | (val == BATADV_VIS_TYPE_SERVER_SYNC)) || | ||
269 | (strncmp(buff, "server", 6) == 0)) | ||
270 | vis_mode_tmp = BATADV_VIS_TYPE_SERVER_SYNC; | ||
271 | |||
272 | if (vis_mode_tmp < 0) { | ||
273 | if (buff[count - 1] == '\n') | ||
274 | buff[count - 1] = '\0'; | ||
275 | |||
276 | batadv_info(net_dev, | ||
277 | "Invalid parameter for 'vis mode' setting received: %s\n", | ||
278 | buff); | ||
279 | return -EINVAL; | ||
280 | } | ||
281 | |||
282 | if (atomic_read(&bat_priv->vis_mode) == vis_mode_tmp) | ||
283 | return count; | ||
284 | |||
285 | if (atomic_read(&bat_priv->vis_mode) == BATADV_VIS_TYPE_CLIENT_UPDATE) | ||
286 | old_mode = "client"; | ||
287 | else | ||
288 | old_mode = "server"; | ||
289 | |||
290 | if (vis_mode_tmp == BATADV_VIS_TYPE_CLIENT_UPDATE) | ||
291 | new_mode = "client"; | ||
292 | else | ||
293 | new_mode = "server"; | ||
294 | |||
295 | batadv_info(net_dev, "Changing vis mode from: %s to: %s\n", old_mode, | ||
296 | new_mode); | ||
297 | |||
298 | atomic_set(&bat_priv->vis_mode, (unsigned int)vis_mode_tmp); | ||
299 | return count; | ||
300 | } | ||
301 | |||
302 | static ssize_t batadv_show_bat_algo(struct kobject *kobj, | 233 | static ssize_t batadv_show_bat_algo(struct kobject *kobj, |
303 | struct attribute *attr, char *buff) | 234 | struct attribute *attr, char *buff) |
304 | { | 235 | { |
@@ -431,8 +362,6 @@ BATADV_ATTR_SIF_BOOL(distributed_arp_table, S_IRUGO | S_IWUSR, | |||
431 | #endif | 362 | #endif |
432 | BATADV_ATTR_SIF_BOOL(fragmentation, S_IRUGO | S_IWUSR, batadv_update_min_mtu); | 363 | BATADV_ATTR_SIF_BOOL(fragmentation, S_IRUGO | S_IWUSR, batadv_update_min_mtu); |
433 | BATADV_ATTR_SIF_BOOL(ap_isolation, S_IRUGO | S_IWUSR, NULL); | 364 | BATADV_ATTR_SIF_BOOL(ap_isolation, S_IRUGO | S_IWUSR, NULL); |
434 | static BATADV_ATTR(vis_mode, S_IRUGO | S_IWUSR, batadv_show_vis_mode, | ||
435 | batadv_store_vis_mode); | ||
436 | static BATADV_ATTR(routing_algo, S_IRUGO, batadv_show_bat_algo, NULL); | 365 | static BATADV_ATTR(routing_algo, S_IRUGO, batadv_show_bat_algo, NULL); |
437 | static BATADV_ATTR(gw_mode, S_IRUGO | S_IWUSR, batadv_show_gw_mode, | 366 | static BATADV_ATTR(gw_mode, S_IRUGO | S_IWUSR, batadv_show_gw_mode, |
438 | batadv_store_gw_mode); | 367 | batadv_store_gw_mode); |
@@ -463,7 +392,6 @@ static struct batadv_attribute *batadv_mesh_attrs[] = { | |||
463 | #endif | 392 | #endif |
464 | &batadv_attr_fragmentation, | 393 | &batadv_attr_fragmentation, |
465 | &batadv_attr_ap_isolation, | 394 | &batadv_attr_ap_isolation, |
466 | &batadv_attr_vis_mode, | ||
467 | &batadv_attr_routing_algo, | 395 | &batadv_attr_routing_algo, |
468 | &batadv_attr_gw_mode, | 396 | &batadv_attr_gw_mode, |
469 | &batadv_attr_orig_interval, | 397 | &batadv_attr_orig_interval, |