summaryrefslogtreecommitdiff
path: root/include/linux/inetdevice.h
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-04-03 14:29:43 +0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-04-03 14:29:43 +0400
commitf94f3cb37a1c4d44dd2070cc4a6165689bda9c92 (patch)
tree21bbdeacbc1b9895cf917231d1675eaaa63b9229 /include/linux/inetdevice.h
parente27808df97ff7b43b4927aadf410705f33313523 (diff)
parent1b4610ebf37a05a65e9f29cdf4d87c207573104d (diff)
downloadlinux-f94f3cb37a1c4d44dd2070cc4a6165689bda9c92.tar.xz
Merge branch 'for-2.6.39' into for-2.6.40
Diffstat (limited to 'include/linux/inetdevice.h')
-rw-r--r--include/linux/inetdevice.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/inetdevice.h b/include/linux/inetdevice.h
index ae8fdc54e0c0..5f8146695b7f 100644
--- a/include/linux/inetdevice.h
+++ b/include/linux/inetdevice.h
@@ -144,6 +144,7 @@ static inline void ipv4_devconf_setall(struct in_device *in_dev)
#define IN_DEV_ARP_NOTIFY(in_dev) IN_DEV_MAXCONF((in_dev), ARP_NOTIFY)
struct in_ifaddr {
+ struct hlist_node hash;
struct in_ifaddr *ifa_next;
struct in_device *ifa_dev;
struct rcu_head rcu_head;