diff options
| author | Jaroslav Kysela <perex@suse.cz> | 2006-03-22 05:02:08 -0500 |
|---|---|---|
| committer | Jaroslav Kysela <perex@suse.cz> | 2006-03-22 05:02:08 -0500 |
| commit | 5501972e0b5857bc8354770d900ceb9b40c7f6b7 (patch) | |
| tree | ff239422827c4cd54d2998f8851304255de31b38 /include/linux/inetdevice.h | |
| parent | 9d2f928ddf64ca0361562e30faf584cd33055c60 (diff) | |
| parent | e952f31bce6e9f64db01f607abc46529ba57ac9e (diff) | |
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/linux/inetdevice.h')
| -rw-r--r-- | include/linux/inetdevice.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/inetdevice.h b/include/linux/inetdevice.h index fd7af86151b1..92297ff24e85 100644 --- a/include/linux/inetdevice.h +++ b/include/linux/inetdevice.h | |||
| @@ -25,6 +25,7 @@ struct ipv4_devconf | |||
| 25 | int arp_filter; | 25 | int arp_filter; |
| 26 | int arp_announce; | 26 | int arp_announce; |
| 27 | int arp_ignore; | 27 | int arp_ignore; |
| 28 | int arp_accept; | ||
| 28 | int medium_id; | 29 | int medium_id; |
| 29 | int no_xfrm; | 30 | int no_xfrm; |
| 30 | int no_policy; | 31 | int no_policy; |