diff options
| author | David Lamparter <equinox@diac24.net> | 2010-02-04 03:00:46 +0100 |
|---|---|---|
| committer | David Lamparter <equinox@diac24.net> | 2010-02-04 03:30:17 +0100 |
| commit | f4b356490dc03d3758b50da11b1548254fb56138 (patch) | |
| tree | ead2e56720973f2f1c7eebe0ae032f2c826bc328 /lib/thread.c | |
| parent | 7d5fe54553c735a12e3fc40c3d9f0e59c79a33c6 (diff) | |
| parent | 2442cdc3064f87860972ce6397fbaab52e200a00 (diff) | |
| download | quagga-f4b356490dc03d3758b50da11b1548254fb56138.tar.bz2 quagga-f4b356490dc03d3758b50da11b1548254fb56138.tar.xz | |
Merge branch 'patches/sh_bgp-write-cork' into dn42
Conflicts:
lib/sockunion.c
Diffstat (limited to 'lib/thread.c')
| -rw-r--r-- | lib/thread.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/thread.c b/lib/thread.c index 70f8defa..1e714417 100644 --- a/lib/thread.c +++ b/lib/thread.c @@ -958,7 +958,6 @@ thread_fetch (struct thread_master *m, struct thread *fetch) struct thread *thread; fd_set readfd; fd_set writefd; - fd_set exceptfd; struct timeval timer_val; struct timeval timer_val_bg; struct timeval *timer_wait; @@ -984,7 +983,6 @@ thread_fetch (struct thread_master *m, struct thread *fetch) /* Structure copy. */ readfd = m->readfd; writefd = m->writefd; - exceptfd = m->exceptfd; /* Calculate select wait timer if nothing else to do */ quagga_get_relative (NULL); @@ -995,7 +993,7 @@ thread_fetch (struct thread_master *m, struct thread *fetch) (!timer_wait || (timeval_cmp (*timer_wait, *timer_wait_bg) > 0))) timer_wait = timer_wait_bg; - num = select (FD_SETSIZE, &readfd, &writefd, &exceptfd, timer_wait); + num = select (FD_SETSIZE, &readfd, &writefd, NULL, timer_wait); /* Signals should get quick treatment */ if (num < 0) |