aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/mesh.h2
-rw-r--r--net/wanrouter/wanmain.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/net/mac80211/mesh.h b/net/mac80211/mesh.h
index ebd3f1d9d889..58e741128968 100644
--- a/net/mac80211/mesh.h
+++ b/net/mac80211/mesh.h
@@ -115,7 +115,7 @@ struct mesh_path {
115 * @hash_rnd: random value used for hash computations 115 * @hash_rnd: random value used for hash computations
116 * @entries: number of entries in the table 116 * @entries: number of entries in the table
117 * @free_node: function to free nodes of the table 117 * @free_node: function to free nodes of the table
118 * @copy_node: fuction to copy nodes of the table 118 * @copy_node: function to copy nodes of the table
119 * @size_order: determines size of the table, there will be 2^size_order hash 119 * @size_order: determines size of the table, there will be 2^size_order hash
120 * buckets 120 * buckets
121 * @mean_chain_len: maximum average length for the hash buckets' list, if it is 121 * @mean_chain_len: maximum average length for the hash buckets' list, if it is
diff --git a/net/wanrouter/wanmain.c b/net/wanrouter/wanmain.c
index 2bf23406637a..74944a2dd436 100644
--- a/net/wanrouter/wanmain.c
+++ b/net/wanrouter/wanmain.c
@@ -471,7 +471,7 @@ static int wanrouter_device_setup(struct wan_device *wandev,
471 data = vmalloc(conf->data_size); 471 data = vmalloc(conf->data_size);
472 if (!data) { 472 if (!data) {
473 printk(KERN_INFO 473 printk(KERN_INFO
474 "%s: ERROR, Faild allocate kernel memory !\n", 474 "%s: ERROR, Failed allocate kernel memory !\n",
475 wandev->name); 475 wandev->name);
476 kfree(conf); 476 kfree(conf);
477 return -ENOBUFS; 477 return -ENOBUFS;
@@ -481,7 +481,7 @@ static int wanrouter_device_setup(struct wan_device *wandev,
481 err = wandev->setup(wandev, conf); 481 err = wandev->setup(wandev, conf);
482 } else { 482 } else {
483 printk(KERN_INFO 483 printk(KERN_INFO
484 "%s: ERROR, Faild to copy from user data !\n", 484 "%s: ERROR, Failed to copy from user data !\n",
485 wandev->name); 485 wandev->name);
486 err = -EFAULT; 486 err = -EFAULT;
487 } 487 }