svn commit: r214092 - stable/8/sys/net

[Bjoern A. Zeeb]

Author: bz
Date: Wed Oct 20 01:22:04 2010
New Revision: 214092
URL: http://svn.freebsd.org/changeset/base/214092

Log:
  MFC r213929:
    lltable_drain() has never been used so far, thus #if 0 it for now.
    While touching it add the missing locking to the now disabled code
    for the time when we'll resurrect it.

Modified:
  stable/8/sys/net/if_llatbl.c
  stable/8/sys/net/if_llatbl.h
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/net/if_llatbl.c
==============================================================================
--- stable/8/sys/net/if_llatbl.c	Wed Oct 20 00:41:38 2010	(r214091)
+++ stable/8/sys/net/if_llatbl.c	Wed Oct 20 01:22:04 2010	(r214092)
@@ -183,6 +183,7 @@ lltable_free(struct lltable *llt)
 	free(llt, M_LLTABLE);
 }
 
+#if 0
 void
 lltable_drain(int af)
 {
@@ -197,15 +198,18 @@ lltable_drain(int af)
 
 		for (i=0; i < LLTBL_HASHTBL_SIZE; i++) {
 			LIST_FOREACH(lle, &llt->lle_head[i], lle_next) {
+				LLE_WLOCK(lle);
 				if (lle->la_hold) {
 					m_freem(lle->la_hold);
 					lle->la_hold = NULL;
 				}
+				LLE_WUNLOCK(lle);
 			}
 		}
 	}
 	LLTABLE_RUNLOCK();
 }
+#endif
 
 void
 lltable_prefix_free(int af, struct sockaddr *prefix, struct sockaddr *mask)

Modified: stable/8/sys/net/if_llatbl.h
==============================================================================
--- stable/8/sys/net/if_llatbl.h	Wed Oct 20 00:41:38 2010	(r214091)
+++ stable/8/sys/net/if_llatbl.h	Wed Oct 20 01:22:04 2010	(r214092)
@@ -186,7 +186,9 @@ struct lltable *lltable_init(struct ifne
 void		lltable_free(struct lltable *);
 void		lltable_prefix_free(int, struct sockaddr *, 
                        struct sockaddr *);
+#if 0
 void		lltable_drain(int);
+#endif
 int		lltable_sysctl_dumparp(int, struct sysctl_req *);
 
 void		llentry_free(struct llentry *);