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
vserver 2.0 rc7
[linux-2.6.git]
/
net
/
ipv4
/
esp4.c
diff --git
a/net/ipv4/esp4.c
b/net/ipv4/esp4.c
index
49d3cee
..
eae84cc
100644
(file)
--- a/
net/ipv4/esp4.c
+++ b/
net/ipv4/esp4.c
@@
-17,11
+17,9
@@
struct esp_decap_data {
__u8 proto;
};
__u8 proto;
};
-static int esp_output(struct sk_buff *skb)
+static int esp_output(struct
xfrm_state *x, struct
sk_buff *skb)
{
int err;
{
int err;
- struct dst_entry *dst = skb->dst;
- struct xfrm_state *x = dst->xfrm;
struct iphdr *top_iph;
struct ip_esp_hdr *esph;
struct crypto_tfm *tfm;
struct iphdr *top_iph;
struct ip_esp_hdr *esph;
struct crypto_tfm *tfm;
@@
-480,7
+478,7
@@
static int __init esp4_init(void)
{
struct xfrm_decap_state decap;
{
struct xfrm_decap_state decap;
- if (sizeof(struct esp_decap_data)
<
+ if (sizeof(struct esp_decap_data)
>
sizeof(decap.decap_data)) {
extern void decap_data_too_small(void);
sizeof(decap.decap_data)) {
extern void decap_data_too_small(void);