summaryrefslogtreecommitdiffstats
path: root/sys/net/if_llatbl.h
diff options
context:
space:
mode:
authormelifaro <melifaro@FreeBSD.org>2015-08-11 12:38:54 +0000
committermelifaro <melifaro@FreeBSD.org>2015-08-11 12:38:54 +0000
commit0c24547a6601393b02ca3eda7ccc3fd0c26ff55c (patch)
treed443248beda555ecbf656be0f161a735357a4908 /sys/net/if_llatbl.h
parentdda8fad434f4f19e50af15e33a5407d253f424c3 (diff)
downloadFreeBSD-src-0c24547a6601393b02ca3eda7ccc3fd0c26ff55c.zip
FreeBSD-src-0c24547a6601393b02ca3eda7ccc3fd0c26ff55c.tar.gz
Use single 'lle_timer' callout in lltable instead of
two different names of the same timer.
Diffstat (limited to 'sys/net/if_llatbl.h')
-rw-r--r--sys/net/if_llatbl.h9
1 files changed, 1 insertions, 8 deletions
diff --git a/sys/net/if_llatbl.h b/sys/net/if_llatbl.h
index 3f2a08d..8502e80 100644
--- a/sys/net/if_llatbl.h
+++ b/sys/net/if_llatbl.h
@@ -82,11 +82,7 @@ struct llentry {
int lle_refcnt;
LIST_ENTRY(llentry) lle_chain; /* chain of deleted items */
- /* XXX af-private? */
- union {
- struct callout ln_timer_ch;
- struct callout la_timer;
- } lle_timer;
+ struct callout lle_timer;
struct rwlock lle_lock;
};
@@ -135,9 +131,6 @@ struct llentry {
} while (0)
-#define ln_timer_ch lle_timer.ln_timer_ch
-#define la_timer lle_timer.la_timer
-
typedef struct llentry *(llt_lookup_t)(struct lltable *, u_int flags,
const struct sockaddr *l3addr);
typedef struct llentry *(llt_create_t)(struct lltable *, u_int flags,
OpenPOWER on IntegriCloud