diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-07-13 16:23:51 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-07-13 16:23:51 -0400 |
| commit | 327309e899662b482c58cf25f574513d38b5788c (patch) | |
| tree | 069de438aa0e92dd9b6ba28e6b207e2cd07151a5 /include/linux/igmp.h | |
| parent | 0c168775709faa74c1b87f1e61046e0c51ade7f3 (diff) | |
| parent | c32511e2718618f0b53479eb36e07439aa363a74 (diff) | |
Merge upstream 2.6.13-rc3 into ieee80211 branch of netdev-2.6.
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; |