diff options
| author | Luiz Otavio O Souza <luiz@netgate.com> | 2016-02-09 10:19:06 -0600 |
|---|---|---|
| committer | Luiz Otavio O Souza <luiz@netgate.com> | 2016-02-09 10:19:06 -0600 |
| commit | 8af5a1ea8e519a20c3c5d49486319b443b4375da (patch) | |
| tree | e53ad5153ce3c574394c21b78c76ea0f8a7091e2 /sys/netinet | |
| parent | 12edb8fb64808ccdca681c3a2f91ca3a8dffee05 (diff) | |
| parent | 87ab639764a7d4ff24c9e2ecd1f21536e3b9ceb5 (diff) | |
| download | FreeBSD-src-8af5a1ea8e519a20c3c5d49486319b443b4375da.zip FreeBSD-src-8af5a1ea8e519a20c3c5d49486319b443b4375da.tar.gz | |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'sys/netinet')
| -rw-r--r-- | sys/netinet/igmp.c | 4 | ||||
| -rw-r--r-- | sys/netinet/in_rmx.c | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/sys/netinet/igmp.c b/sys/netinet/igmp.c index 34a60a8..47f90ba 100644 --- a/sys/netinet/igmp.c +++ b/sys/netinet/igmp.c @@ -654,16 +654,12 @@ igmp_ifdetach(struct ifnet *ifp) void igmp_domifdetach(struct ifnet *ifp) { - struct igmp_ifinfo *igi; CTR3(KTR_IGMPV3, "%s: called for ifp %p(%s)", __func__, ifp, ifp->if_xname); IGMP_LOCK(); - - igi = ((struct in_ifinfo *)ifp->if_afdata[AF_INET])->ii_igmp; igi_delete_locked(ifp); - IGMP_UNLOCK(); } diff --git a/sys/netinet/in_rmx.c b/sys/netinet/in_rmx.c index 9b89fbd..80177e4 100644 --- a/sys/netinet/in_rmx.c +++ b/sys/netinet/in_rmx.c @@ -373,7 +373,7 @@ in_detachhead(void **head, int off) { callout_drain(&V_rtq_timer); - return (1); + return (rn_detachhead(head)); } #endif |
