diff options
| author | Nathan Scott <nathans@sgi.com> | 2006-06-20 06:56:23 +0200 |
|---|---|---|
| committer | Nathan Scott <nathans@sgi.com> | 2006-06-20 06:56:23 +0200 |
| commit | 98174e46974323e4941c72e46345f7277755e146 (patch) | |
| tree | c4644c8f38a519cfb3929d1175fc7107eefe48b9 /include/net/ip.h | |
| parent | [XFS] Remove files from the build that are now unused. (diff) | |
| parent | Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus (diff) | |
| download | linux-98174e46974323e4941c72e46345f7277755e146.tar.xz linux-98174e46974323e4941c72e46345f7277755e146.zip | |
Merge HEAD from ../linux-2.6
Diffstat (limited to 'include/net/ip.h')
| -rw-r--r-- | include/net/ip.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/net/ip.h b/include/net/ip.h index 3d2e5ca62a5a..ead233c9540d 100644 --- a/include/net/ip.h +++ b/include/net/ip.h @@ -147,7 +147,6 @@ void ip_send_reply(struct sock *sk, struct sk_buff *skb, struct ip_reply_arg *ar struct ipv4_config { int log_martians; - int autoconfig; int no_pmtu_disc; }; |