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]
/
include
/
net
/
protocol.h
diff --git
a/include/net/protocol.h
b/include/net/protocol.h
index
357691f
..
6dc5970
100644
(file)
--- a/
include/net/protocol.h
+++ b/
include/net/protocol.h
@@
-43,7
+43,7
@@
struct net_protocol {
#if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE)
struct inet6_protocol
{
#if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE)
struct inet6_protocol
{
- int (*handler)(struct sk_buff **skb
, unsigned int *nhoffp
);
+ int (*handler)(struct sk_buff **skb);
void (*err_handler)(struct sk_buff *skb,
struct inet6_skb_parm *opt,
void (*err_handler)(struct sk_buff *skb,
struct inet6_skb_parm *opt,
@@
-65,7
+65,7
@@
struct inet_protosw {
int protocol; /* This is the L4 protocol number. */
struct proto *prot;
int protocol; /* This is the L4 protocol number. */
struct proto *prot;
- struct proto_ops *ops;
+
const
struct proto_ops *ops;
int capability; /* Which (if any) capability do
* we need to use this socket
int capability; /* Which (if any) capability do
* we need to use this socket
@@
-76,6
+76,7
@@
struct inet_protosw {
};
#define INET_PROTOSW_REUSE 0x01 /* Are ports automatically reusable? */
#define INET_PROTOSW_PERMANENT 0x02 /* Permanent protocols are unremovable. */
};
#define INET_PROTOSW_REUSE 0x01 /* Are ports automatically reusable? */
#define INET_PROTOSW_PERMANENT 0x02 /* Permanent protocols are unremovable. */
+#define INET_PROTOSW_ICSK 0x04 /* Is this an inet_connection_sock? */
extern struct net_protocol *inet_protocol_base;
extern struct net_protocol *inet_protos[MAX_INET_PROTOS];
extern struct net_protocol *inet_protocol_base;
extern struct net_protocol *inet_protos[MAX_INET_PROTOS];