diff options
Diffstat (limited to 'include/linux/inetdevice.h')
| -rw-r--r-- | include/linux/inetdevice.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/include/linux/inetdevice.h b/include/linux/inetdevice.h index ad27c7da8798..699e85c01a4d 100644 --- a/include/linux/inetdevice.h +++ b/include/linux/inetdevice.h | |||
| @@ -10,15 +10,13 @@ | |||
| 10 | #include <linux/timer.h> | 10 | #include <linux/timer.h> |
| 11 | #include <linux/sysctl.h> | 11 | #include <linux/sysctl.h> |
| 12 | 12 | ||
| 13 | struct ipv4_devconf | 13 | struct ipv4_devconf { |
| 14 | { | ||
| 15 | void *sysctl; | 14 | void *sysctl; |
| 16 | int data[__NET_IPV4_CONF_MAX - 1]; | 15 | int data[__NET_IPV4_CONF_MAX - 1]; |
| 17 | DECLARE_BITMAP(state, __NET_IPV4_CONF_MAX - 1); | 16 | DECLARE_BITMAP(state, __NET_IPV4_CONF_MAX - 1); |
| 18 | }; | 17 | }; |
| 19 | 18 | ||
| 20 | struct in_device | 19 | struct in_device { |
| 21 | { | ||
| 22 | struct net_device *dev; | 20 | struct net_device *dev; |
| 23 | atomic_t refcnt; | 21 | atomic_t refcnt; |
| 24 | int dead; | 22 | int dead; |
| @@ -85,6 +83,7 @@ static inline void ipv4_devconf_setall(struct in_device *in_dev) | |||
| 85 | #define IN_DEV_RPFILTER(in_dev) IN_DEV_MAXCONF((in_dev), RP_FILTER) | 83 | #define IN_DEV_RPFILTER(in_dev) IN_DEV_MAXCONF((in_dev), RP_FILTER) |
| 86 | #define IN_DEV_SOURCE_ROUTE(in_dev) IN_DEV_ANDCONF((in_dev), \ | 84 | #define IN_DEV_SOURCE_ROUTE(in_dev) IN_DEV_ANDCONF((in_dev), \ |
| 87 | ACCEPT_SOURCE_ROUTE) | 85 | ACCEPT_SOURCE_ROUTE) |
| 86 | #define IN_DEV_ACCEPT_LOCAL(in_dev) IN_DEV_ORCONF((in_dev), ACCEPT_LOCAL) | ||
| 88 | #define IN_DEV_BOOTP_RELAY(in_dev) IN_DEV_ANDCONF((in_dev), BOOTP_RELAY) | 87 | #define IN_DEV_BOOTP_RELAY(in_dev) IN_DEV_ANDCONF((in_dev), BOOTP_RELAY) |
| 89 | 88 | ||
| 90 | #define IN_DEV_LOG_MARTIANS(in_dev) IN_DEV_ORCONF((in_dev), LOG_MARTIANS) | 89 | #define IN_DEV_LOG_MARTIANS(in_dev) IN_DEV_ORCONF((in_dev), LOG_MARTIANS) |
| @@ -110,8 +109,7 @@ static inline void ipv4_devconf_setall(struct in_device *in_dev) | |||
| 110 | #define IN_DEV_ARP_IGNORE(in_dev) IN_DEV_MAXCONF((in_dev), ARP_IGNORE) | 109 | #define IN_DEV_ARP_IGNORE(in_dev) IN_DEV_MAXCONF((in_dev), ARP_IGNORE) |
| 111 | #define IN_DEV_ARP_NOTIFY(in_dev) IN_DEV_MAXCONF((in_dev), ARP_NOTIFY) | 110 | #define IN_DEV_ARP_NOTIFY(in_dev) IN_DEV_MAXCONF((in_dev), ARP_NOTIFY) |
| 112 | 111 | ||
| 113 | struct in_ifaddr | 112 | struct in_ifaddr { |
| 114 | { | ||
| 115 | struct in_ifaddr *ifa_next; | 113 | struct in_ifaddr *ifa_next; |
| 116 | struct in_device *ifa_dev; | 114 | struct in_device *ifa_dev; |
| 117 | struct rcu_head rcu_head; | 115 | struct rcu_head rcu_head; |
