git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
[sfrench/cifs-2.6.git]
/
include
/
linux
/
inetdevice.h
diff --git
a/include/linux/inetdevice.h
b/include/linux/inetdevice.h
index fd7af86151b1ed06879f12cd5fa3323cb1533f46..92297ff24e8525de2617dff728b3420a4649f66a 100644
(file)
--- a/
include/linux/inetdevice.h
+++ b/
include/linux/inetdevice.h
@@
-25,6
+25,7
@@
struct ipv4_devconf
int arp_filter;
int arp_announce;
int arp_ignore;
+ int arp_accept;
int medium_id;
int no_xfrm;
int no_policy;