git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
net
/
decnet
/
netfilter
/
dn_rtmsg.c
diff --git
a/net/decnet/netfilter/dn_rtmsg.c
b/net/decnet/netfilter/dn_rtmsg.c
index
f86a625
..
74133ec
100644
(file)
--- a/
net/decnet/netfilter/dn_rtmsg.c
+++ b/
net/decnet/netfilter/dn_rtmsg.c
@@
-19,14
+19,13
@@
#include <linux/netfilter.h>
#include <linux/spinlock.h>
#include <linux/netlink.h>
#include <linux/netfilter.h>
#include <linux/spinlock.h>
#include <linux/netlink.h>
+#include <linux/netfilter_decnet.h>
#include <net/sock.h>
#include <net/flow.h>
#include <net/dn.h>
#include <net/dn_route.h>
#include <net/sock.h>
#include <net/flow.h>
#include <net/dn.h>
#include <net/dn_route.h>
-#include <linux/netfilter_decnet.h>
-
static struct sock *dnrmg = NULL;
static struct sock *dnrmg = NULL;
@@
-71,10
+70,10
@@
static void dnrmg_send_peer(struct sk_buff *skb)
switch(flags & DN_RT_CNTL_MSK) {
case DN_RT_PKT_L1RT:
switch(flags & DN_RT_CNTL_MSK) {
case DN_RT_PKT_L1RT:
- group = DNR
MG_L1_GROUP
;
+ group = DNR
NG_NLGRP_L1
;
break;
case DN_RT_PKT_L2RT:
break;
case DN_RT_PKT_L2RT:
- group = DNR
MG_L2_GROUP
;
+ group = DNR
NG_NLGRP_L2
;
break;
default:
return;
break;
default:
return;
@@
-83,7
+82,7
@@
static void dnrmg_send_peer(struct sk_buff *skb)
skb2 = dnrmg_build_message(skb, &status);
if (skb2 == NULL)
return;
skb2 = dnrmg_build_message(skb, &status);
if (skb2 == NULL)
return;
- NETLINK_CB(skb2).dst_group
s
= group;
+ NETLINK_CB(skb2).dst_group = group;
netlink_broadcast(dnrmg, skb2, 0, group, GFP_ATOMIC);
}
netlink_broadcast(dnrmg, skb2, 0, group, GFP_ATOMIC);
}
@@
-119,8
+118,9
@@
static inline void dnrmg_receive_user_skb(struct sk_buff *skb)
static void dnrmg_receive_user_sk(struct sock *sk, int len)
{
struct sk_buff *skb;
static void dnrmg_receive_user_sk(struct sock *sk, int len)
{
struct sk_buff *skb;
+ unsigned int qlen = skb_queue_len(&sk->sk_receive_queue);
-
while((skb = skb_dequeue(&sk->sk_receive_queue)) != NULL
) {
+
for (; qlen && (skb = skb_dequeue(&sk->sk_receive_queue)); qlen--
) {
dnrmg_receive_user_skb(skb);
kfree_skb(skb);
}
dnrmg_receive_user_skb(skb);
kfree_skb(skb);
}
@@
-133,11
+133,12
@@
static struct nf_hook_ops dnrmg_ops = {
.priority = NF_DN_PRI_DNRTMSG,
};
.priority = NF_DN_PRI_DNRTMSG,
};
-static int __init init(void)
+static int __init
dn_rtmsg_
init(void)
{
int rv = 0;
{
int rv = 0;
- dnrmg = netlink_kernel_create(NETLINK_DNRTMSG, dnrmg_receive_user_sk);
+ dnrmg = netlink_kernel_create(NETLINK_DNRTMSG, DNRNG_NLGRP_MAX,
+ dnrmg_receive_user_sk, THIS_MODULE);
if (dnrmg == NULL) {
printk(KERN_ERR "dn_rtmsg: Cannot create netlink socket");
return -ENOMEM;
if (dnrmg == NULL) {
printk(KERN_ERR "dn_rtmsg: Cannot create netlink socket");
return -ENOMEM;
@@
-151,7
+152,7
@@
static int __init init(void)
return rv;
}
return rv;
}
-static void __exit fini(void)
+static void __exit
dn_rtmsg_
fini(void)
{
nf_unregister_hook(&dnrmg_ops);
sock_release(dnrmg->sk_socket);
{
nf_unregister_hook(&dnrmg_ops);
sock_release(dnrmg->sk_socket);
@@
-161,7
+162,8
@@
static void __exit fini(void)
MODULE_DESCRIPTION("DECnet Routing Message Grabulator");
MODULE_AUTHOR("Steven Whitehouse <steve@chygwyn.com>");
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("DECnet Routing Message Grabulator");
MODULE_AUTHOR("Steven Whitehouse <steve@chygwyn.com>");
MODULE_LICENSE("GPL");
+MODULE_ALIAS_NET_PF_PROTO(PF_NETLINK, NETLINK_DNRTMSG);
-module_init(init);
-module_exit(fini);
+module_init(
dn_rtmsg_
init);
+module_exit(
dn_rtmsg_
fini);