diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-06-26 01:31:38 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-06-26 01:31:38 -0400 |
| commit | 4854c7b27f0975a2b629f35ea3996d2968eb7c4f (patch) | |
| tree | 4102bdb70289764a2058aff0f907b13d7cf0e0d1 /include/linux/igmp.h | |
| parent | 3cbd5b32cb625f5c0f1b1476d154fac873dd49ce (diff) | |
| parent | fcc18e83e1f6fd9fa6b333735bf0fcd530655511 (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/igmp.h')
| -rw-r--r-- | include/linux/igmp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/igmp.h b/include/linux/igmp.h index 28f4f3b36950..899c3d4776f3 100644 --- a/include/linux/igmp.h +++ b/include/linux/igmp.h | |||
| @@ -169,7 +169,7 @@ struct ip_sf_list | |||
| 169 | struct ip_mc_list | 169 | struct ip_mc_list |
| 170 | { | 170 | { |
| 171 | struct in_device *interface; | 171 | struct in_device *interface; |
| 172 | unsigned long multiaddr; | 172 | __be32 multiaddr; |
| 173 | struct ip_sf_list *sources; | 173 | struct ip_sf_list *sources; |
| 174 | struct ip_sf_list *tomb; | 174 | struct ip_sf_list *tomb; |
| 175 | unsigned int sfmode; | 175 | unsigned int sfmode; |