diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-03-17 15:46:58 -0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-03-17 15:48:06 -0400 |
| commit | 2dd22997679a88874c131f6e6ffb963e6d43b3a6 (patch) | |
| tree | bfe1707dda7e755b8b550c6796e2649813bcfbb9 /include/linux/inetdevice.h | |
| parent | 36885ff0e6563687e6152da6d311abbf83c0198f (diff) | |
| parent | 7b7adc4a016a1decb806eb71ecab98721fa7f146 (diff) | |
Merge remote-tracking branch 'origin' into spi/next
Pull in Linus' tree to pick up changes required for the langwell gpio fixes
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 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) | |||
| 144 | #define IN_DEV_ARP_NOTIFY(in_dev) IN_DEV_MAXCONF((in_dev), ARP_NOTIFY) | 144 | #define IN_DEV_ARP_NOTIFY(in_dev) IN_DEV_MAXCONF((in_dev), ARP_NOTIFY) |
| 145 | 145 | ||
| 146 | struct in_ifaddr { | 146 | struct in_ifaddr { |
| 147 | struct hlist_node hash; | ||
| 147 | struct in_ifaddr *ifa_next; | 148 | struct in_ifaddr *ifa_next; |
| 148 | struct in_device *ifa_dev; | 149 | struct in_device *ifa_dev; |
| 149 | struct rcu_head rcu_head; | 150 | struct rcu_head rcu_head; |