diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-07-13 18:09:23 -0400 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-07-13 18:09:23 -0400 |
| commit | c514720716c7b109ff980f8b3cb93f9af872c91c (patch) | |
| tree | 490a9578995705de69712893a190b67651bddc56 /include/linux/igmp.h | |
| parent | 07929dcb963786512c760dd3ecd148d89295e7e5 (diff) | |
| parent | 1e279dd855d15b72364b4103f872d67d8592647e (diff) | |
Automatic merge with /usr/src/ntfs-2.6.git.
Diffstat (limited to 'include/linux/igmp.h')
| -rw-r--r-- | include/linux/igmp.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/igmp.h b/include/linux/igmp.h index 390e760a96d3..0c31ef0b5bad 100644 --- a/include/linux/igmp.h +++ b/include/linux/igmp.h | |||
| @@ -148,7 +148,6 @@ struct ip_sf_socklist | |||
| 148 | struct ip_mc_socklist | 148 | struct ip_mc_socklist |
| 149 | { | 149 | { |
| 150 | struct ip_mc_socklist *next; | 150 | struct ip_mc_socklist *next; |
| 151 | int count; | ||
| 152 | struct ip_mreqn multi; | 151 | struct ip_mreqn multi; |
| 153 | unsigned int sfmode; /* MCAST_{INCLUDE,EXCLUDE} */ | 152 | unsigned int sfmode; /* MCAST_{INCLUDE,EXCLUDE} */ |
| 154 | struct ip_sf_socklist *sflist; | 153 | struct ip_sf_socklist *sflist; |