diff options
| author | David S. Miller <davem@nuts.davemloft.net> | 2005-01-13 21:43:17 -0800 |
|---|---|---|
| committer | David S. Miller <davem@nuts.davemloft.net> | 2005-01-13 21:43:17 -0800 |
| commit | 62343f7629a612d82f0314777b17dff7807976dc (patch) | |
| tree | de61da72ad16fdd74d11401efe4f602e692d4073 /include/net | |
| parent | c749c9cc5bcfedc42f0b47c2ce4604e7fa2faf5a (diff) | |
| parent | c76178d6293fc6d894e5362001bb83d30bf4b54c (diff) | |
Merge bk://kernel.bkbits.net/acme/connection_sock-2.6
into nuts.davemloft.net:/disk1/BK/net-2.6
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/icmp.h | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/include/net/icmp.h b/include/net/icmp.h index 32b159f7ae22..3fc192478aa2 100644 --- a/include/net/icmp.h +++ b/include/net/icmp.h @@ -46,16 +46,15 @@ extern void icmp_init(struct net_proto_family *ops); /* Move into dst.h ? */ extern int xrlim_allow(struct dst_entry *dst, int timeout); -struct raw_opt { - struct icmp_filter filter; -}; - -/* WARNING: don't change the layout of the members in raw_sock! */ struct raw_sock { - struct inet_sock inet; - struct raw_opt raw4; + /* inet_sock has to be the first member */ + struct inet_sock inet; + struct icmp_filter filter; }; -#define raw4_sk(__sk) (&((struct raw_sock *)__sk)->raw4) +static inline struct raw_sock *raw_sk(const struct sock *sk) +{ + return (struct raw_sock *)sk; +} #endif /* _ICMP_H */ |