The following commit has been merged in the master branch: commit dc1c387049b06b4429b62289d2a8d76f1ada154b Author: Joe Perches joe@perches.com Date: Mon Aug 29 14:17:24 2011 -0700

batman-adv: Remove unnecessary OOM logging messages

Removing unnecessary messages saves code and text.

Site specific OOM messages are duplications of a generic MM out of memory message and aren't really useful, so just delete them.

Signed-off-by: Joe Perches joe@perches.com

diff --git a/hard-interface.c b/hard-interface.c index 0cc0f04..7704df4 100644 --- a/hard-interface.c +++ b/hard-interface.c @@ -434,11 +434,8 @@ static struct hard_iface *hardif_add_interface(struct net_device *net_dev) dev_hold(net_dev);

hard_iface = kmalloc(sizeof(*hard_iface), GFP_ATOMIC); - if (!hard_iface) { - pr_err("Can't add interface (%s): out of memory\n", - net_dev->name); + if (!hard_iface) goto release_dev; - }

ret = sysfs_add_hardif(&hard_iface->hardif_obj, net_dev); if (ret) diff --git a/main.c b/main.c index 79b9ae5..fb87bdc 100644 --- a/main.c +++ b/main.c @@ -117,8 +117,6 @@ int mesh_init(struct net_device *soft_iface) goto end;

err: - pr_err("Unable to allocate memory for mesh information structures: " - "out of mem ?\n"); mesh_free(soft_iface); return -1;

diff --git a/originator.c b/originator.c index cd7d256..0e5b772 100644 --- a/originator.c +++ b/originator.c @@ -492,10 +492,8 @@ static int orig_node_add_if(struct orig_node *orig_node, int max_if_num)

data_ptr = kmalloc(max_if_num * sizeof(unsigned long) * NUM_WORDS, GFP_ATOMIC); - if (!data_ptr) { - pr_err("Can't resize orig: out of memory\n"); + if (!data_ptr) return -1; - }

memcpy(data_ptr, orig_node->bcast_own, (max_if_num - 1) * sizeof(unsigned long) * NUM_WORDS); @@ -503,10 +501,8 @@ static int orig_node_add_if(struct orig_node *orig_node, int max_if_num) orig_node->bcast_own = data_ptr;

data_ptr = kmalloc(max_if_num * sizeof(uint8_t), GFP_ATOMIC); - if (!data_ptr) { - pr_err("Can't resize orig: out of memory\n"); + if (!data_ptr) return -1; - }

memcpy(data_ptr, orig_node->bcast_own_sum, (max_if_num - 1) * sizeof(uint8_t)); @@ -561,10 +557,8 @@ static int orig_node_del_if(struct orig_node *orig_node,

chunk_size = sizeof(unsigned long) * NUM_WORDS; data_ptr = kmalloc(max_if_num * chunk_size, GFP_ATOMIC); - if (!data_ptr) { - pr_err("Can't resize orig: out of memory\n"); + if (!data_ptr) return -1; - }

/* copy first part */ memcpy(data_ptr, orig_node->bcast_own, del_if_num * chunk_size); @@ -582,10 +576,8 @@ free_bcast_own: goto free_own_sum;

data_ptr = kmalloc(max_if_num * sizeof(uint8_t), GFP_ATOMIC); - if (!data_ptr) { - pr_err("Can't resize orig: out of memory\n"); + if (!data_ptr) return -1; - }

memcpy(data_ptr, orig_node->bcast_own_sum, del_if_num * sizeof(uint8_t)); diff --git a/soft-interface.c b/soft-interface.c index 7d8332e..aceeabc 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -801,10 +801,8 @@ struct net_device *softif_create(const char *name)

soft_iface = alloc_netdev(sizeof(*bat_priv), name, interface_setup);

- if (!soft_iface) { - pr_err("Unable to allocate the batman interface: %s\n", name); + if (!soft_iface) goto out; - }

ret = register_netdevice(soft_iface); if (ret < 0) { diff --git a/vis.c b/vis.c index fb9b19f..f81a6b6 100644 --- a/vis.c +++ b/vis.c @@ -887,10 +887,8 @@ int vis_init(struct bat_priv *bat_priv) }

bat_priv->my_vis_info = kmalloc(MAX_VIS_PACKET_SIZE, GFP_ATOMIC); - if (!bat_priv->my_vis_info) { - pr_err("Can't initialize vis packet\n"); + if (!bat_priv->my_vis_info) goto err; - }

bat_priv->my_vis_info->skb_packet = dev_alloc_skb(sizeof(*packet) + MAX_VIS_PACKET_SIZE +