diff options
| author | Alexey Kuznetsov <kuznet@ms2.inr.ac.ru> | 2002-10-17 01:48:16 -0700 |
|---|---|---|
| committer | David S. Miller <davem@nuts.ninka.net> | 2002-10-17 01:48:16 -0700 |
| commit | faa1befcf7147a609a25daf5e5ae5a98a5bfbe0c (patch) | |
| tree | bcbd46a3754bd25c81076ee6f9b7ff0bcaa05f29 /include/net | |
| parent | b97e69ae427dc5408cf7e84ec5efae552b274db4 (diff) | |
[IPv4]: More output path work.
- Fix a bug noted by Maxim Giryaev (gem@asplinux.ru)
when corking on a non-SG interface
- Convert ICMP and ip_send_reply to ip_append_foo.
- Rename generic_getfrag to more namespace friendly
ip_generic_getfrag.
- Kill n_iov member from ip_reply_arg.
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/ip.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/net/ip.h b/include/net/ip.h index 36de9ce94756..3d2491e9c1a9 100644 --- a/include/net/ip.h +++ b/include/net/ip.h @@ -116,7 +116,7 @@ extern int ip_append_data(struct sock *sk, struct ipcm_cookie *ipc, struct rtable *rt, unsigned int flags); -extern int generic_getfrag(void *from, char *to, int offset, int len, int odd, struct sk_buff *skb); +extern int ip_generic_getfrag(void *from, char *to, int offset, int len, int odd, struct sk_buff *skb); extern ssize_t ip_append_page(struct sock *sk, struct page *page, int offset, size_t size, int flags); extern int ip_push_pending_frames(struct sock *sk); @@ -141,8 +141,7 @@ static inline void ip_tr_mc_map(u32 addr, char *buf) } struct ip_reply_arg { - struct iovec iov[2]; - int n_iov; /* redundant */ + struct iovec iov[1]; u32 csum; int csumoffset; /* u16 offset of csum in iov[0].iov_base */ /* -1 if not needed */ |