diff options
| author | David S. Miller <davem@davemloft.net> | 2008-03-23 22:54:03 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-23 22:54:03 -0700 |
| commit | 06802a819a0a2d31c952c0624cea6cd00e4e50da (patch) | |
| tree | 8ccd7c668c7fbd8f08cb89426006040217caf3f1 /net/9p | |
| parent | 9bd512f619cc116b7830134d7c9f6e404a38c7bf (diff) | |
| parent | 8f3ea33a5078a09eba12bfe57424507809367756 (diff) | |
| download | talos-op-linux-06802a819a0a2d31c952c0624cea6cd00e4e50da.tar.gz talos-op-linux-06802a819a0a2d31c952c0624cea6cd00e4e50da.zip | |
Merge branch 'master' of ../net-2.6/
Conflicts:
net/ipv6/ndisc.c
Diffstat (limited to 'net/9p')
| -rw-r--r-- | net/9p/trans_fd.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c index 1aa9d5175398..4e8d4e724b96 100644 --- a/net/9p/trans_fd.c +++ b/net/9p/trans_fd.c @@ -861,7 +861,6 @@ static void p9_mux_free_request(struct p9_conn *m, struct p9_req *req) static void p9_mux_flush_cb(struct p9_req *freq, void *a) { - p9_conn_req_callback cb; int tag; struct p9_conn *m; struct p9_req *req, *rreq, *rptr; @@ -872,7 +871,6 @@ static void p9_mux_flush_cb(struct p9_req *freq, void *a) freq->tcall->params.tflush.oldtag); spin_lock(&m->lock); - cb = NULL; tag = freq->tcall->params.tflush.oldtag; req = NULL; list_for_each_entry_safe(rreq, rptr, &m->req_list, req_list) { |
