aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/irda/discovery.c2
-rw-r--r--net/iucv/iucv.c2
-rw-r--r--net/netfilter/xt_CONNMARK.c2
-rw-r--r--net/netfilter/xt_connmark.c2
-rw-r--r--net/sched/em_meta.c2
5 files changed, 5 insertions, 5 deletions
diff --git a/net/irda/discovery.c b/net/irda/discovery.c
index af0cea721d2a..80c33f408e3f 100644
--- a/net/irda/discovery.c
+++ b/net/irda/discovery.c
@@ -202,7 +202,7 @@ void irlmp_expire_discoveries(hashbin_t *log, __u32 saddr, int force)
202 /* Drop the spinlock before calling the higher layers, as 202 /* Drop the spinlock before calling the higher layers, as
203 * we can't guarantee they won't call us back and create a 203 * we can't guarantee they won't call us back and create a
204 * deadlock. We will work on our own private data, so we 204 * deadlock. We will work on our own private data, so we
205 * don't care to be interupted. - Jean II */ 205 * don't care to be interrupted. - Jean II */
206 spin_unlock_irqrestore(&log->hb_spinlock, flags); 206 spin_unlock_irqrestore(&log->hb_spinlock, flags);
207 207
208 if(buffer == NULL) 208 if(buffer == NULL)
diff --git a/net/iucv/iucv.c b/net/iucv/iucv.c
index 983058d432dc..a2f5a6ea3895 100644
--- a/net/iucv/iucv.c
+++ b/net/iucv/iucv.c
@@ -389,7 +389,7 @@ static void iucv_block_cpu(void *data)
389 * iucv_declare_cpu 389 * iucv_declare_cpu
390 * @data: unused 390 * @data: unused
391 * 391 *
392 * Declare a interupt buffer on this cpu. 392 * Declare a interrupt buffer on this cpu.
393 */ 393 */
394static void iucv_declare_cpu(void *data) 394static void iucv_declare_cpu(void *data)
395{ 395{
diff --git a/net/netfilter/xt_CONNMARK.c b/net/netfilter/xt_CONNMARK.c
index 8cc324b159e9..856793e8db7a 100644
--- a/net/netfilter/xt_CONNMARK.c
+++ b/net/netfilter/xt_CONNMARK.c
@@ -23,7 +23,7 @@
23#include <linux/ip.h> 23#include <linux/ip.h>
24#include <net/checksum.h> 24#include <net/checksum.h>
25 25
26MODULE_AUTHOR("Henrik Nordstrom <hno@marasytems.com>"); 26MODULE_AUTHOR("Henrik Nordstrom <hno@marasystems.com>");
27MODULE_DESCRIPTION("IP tables CONNMARK matching module"); 27MODULE_DESCRIPTION("IP tables CONNMARK matching module");
28MODULE_LICENSE("GPL"); 28MODULE_LICENSE("GPL");
29MODULE_ALIAS("ipt_CONNMARK"); 29MODULE_ALIAS("ipt_CONNMARK");
diff --git a/net/netfilter/xt_connmark.c b/net/netfilter/xt_connmark.c
index 1071fc54d6d3..9f67920af41f 100644
--- a/net/netfilter/xt_connmark.c
+++ b/net/netfilter/xt_connmark.c
@@ -25,7 +25,7 @@
25#include <linux/netfilter/x_tables.h> 25#include <linux/netfilter/x_tables.h>
26#include <linux/netfilter/xt_connmark.h> 26#include <linux/netfilter/xt_connmark.h>
27 27
28MODULE_AUTHOR("Henrik Nordstrom <hno@marasytems.com>"); 28MODULE_AUTHOR("Henrik Nordstrom <hno@marasystems.com>");
29MODULE_DESCRIPTION("IP tables connmark match module"); 29MODULE_DESCRIPTION("IP tables connmark match module");
30MODULE_LICENSE("GPL"); 30MODULE_LICENSE("GPL");
31MODULE_ALIAS("ipt_connmark"); 31MODULE_ALIAS("ipt_connmark");
diff --git a/net/sched/em_meta.c b/net/sched/em_meta.c
index e9989610712c..ceda8890ab0e 100644
--- a/net/sched/em_meta.c
+++ b/net/sched/em_meta.c
@@ -55,7 +55,7 @@
55 * ppp0..9. 55 * ppp0..9.
56 * 56 *
57 * NOTE: Certain meta values depend on other subsystems and are 57 * NOTE: Certain meta values depend on other subsystems and are
58 * only available if that subsytem is enabled in the kernel. 58 * only available if that subsystem is enabled in the kernel.
59 */ 59 */
60 60
61#include <linux/module.h> 61#include <linux/module.h>