diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2007-05-01 00:24:54 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2007-05-01 00:24:54 -0400 |
| commit | bc95f3669f5e6f63cf0b84fe4922c3c6dd4aa775 (patch) | |
| tree | 427fcf2a7287c16d4b5aa6cbf494d59579a6a8b1 /include/net/esp.h | |
| parent | 3d29cdff999c37b3876082278a8134a0642a02cd (diff) | |
| parent | dc87c3985e9b442c60994308a96f887579addc39 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/usb/input/Makefile
drivers/usb/input/gtco.c
Diffstat (limited to 'include/net/esp.h')
| -rw-r--r-- | include/net/esp.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/net/esp.h b/include/net/esp.h index 713d039f4af7..d05d8d2c78f4 100644 --- a/include/net/esp.h +++ b/include/net/esp.h | |||
| @@ -40,8 +40,6 @@ struct esp_data | |||
| 40 | } auth; | 40 | } auth; |
| 41 | }; | 41 | }; |
| 42 | 42 | ||
| 43 | extern int skb_to_sgvec(struct sk_buff *skb, struct scatterlist *sg, int offset, int len); | ||
| 44 | extern int skb_cow_data(struct sk_buff *skb, int tailbits, struct sk_buff **trailer); | ||
| 45 | extern void *pskb_put(struct sk_buff *skb, struct sk_buff *tail, int len); | 43 | extern void *pskb_put(struct sk_buff *skb, struct sk_buff *tail, int len); |
| 46 | 44 | ||
| 47 | static inline int esp_mac_digest(struct esp_data *esp, struct sk_buff *skb, | 45 | static inline int esp_mac_digest(struct esp_data *esp, struct sk_buff *skb, |