summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Olsson <mnemo@minimum.se>2009-04-07 10:30:24 +0200
committerJiri Kosina <jkosina@suse.cz>2009-06-12 18:01:46 +0200
commit6d60f9dfc8d437e914d46fa355c50c695cad24e7 (patch)
treeb9e1d84faf19965eb8efe802d25b40b36c27fc64
parent7ea2ac9b6632038377cb488c7d1cb60b88164d4d (diff)
downloadop-kernel-dev-6d60f9dfc8d437e914d46fa355c50c695cad24e7.zip
op-kernel-dev-6d60f9dfc8d437e914d46fa355c50c695cad24e7.tar.gz
trivial: Fix paramater/parameter typo in dmesg and source comments
Signed-off-by: Martin Olsson <martin@minimum.se> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rw-r--r--drivers/net/wireless/rndis_wlan.c2
-rw-r--r--net/netfilter/nf_conntrack_acct.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
index bebf735..ff0042f 100644
--- a/drivers/net/wireless/rndis_wlan.c
+++ b/drivers/net/wireless/rndis_wlan.c
@@ -584,7 +584,7 @@ static int rndis_set_config_parameter(struct usbnet *dev, char *param,
ret = rndis_set_oid(dev, OID_GEN_RNDIS_CONFIG_PARAMETER,
infobuf, info_len);
if (ret != 0)
- devdbg(dev, "setting rndis config paramater failed, %d.", ret);
+ devdbg(dev, "setting rndis config parameter failed, %d.", ret);
kfree(infobuf);
return ret;
diff --git a/net/netfilter/nf_conntrack_acct.c b/net/netfilter/nf_conntrack_acct.c
index 9fe8982..4a1d94a 100644
--- a/net/netfilter/nf_conntrack_acct.c
+++ b/net/netfilter/nf_conntrack_acct.c
@@ -116,7 +116,7 @@ int nf_conntrack_acct_init(struct net *net)
if (net_eq(net, &init_net)) {
#ifdef CONFIG_NF_CT_ACCT
printk(KERN_WARNING "CONFIG_NF_CT_ACCT is deprecated and will be removed soon. Please use\n");
- printk(KERN_WARNING "nf_conntrack.acct=1 kernel paramater, acct=1 nf_conntrack module option or\n");
+ printk(KERN_WARNING "nf_conntrack.acct=1 kernel parameter, acct=1 nf_conntrack module option or\n");
printk(KERN_WARNING "sysctl net.netfilter.nf_conntrack_acct=1 to enable it.\n");
#endif
OpenPOWER on IntegriCloud