git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
net
/
rose
/
rose_loopback.c
diff --git
a/net/rose/rose_loopback.c
b/net/rose/rose_loopback.c
index
103b4d3
..
3e41bd9
100644
(file)
--- a/
net/rose/rose_loopback.c
+++ b/
net/rose/rose_loopback.c
@@
-79,7
+79,8
@@
static void rose_loopback_timer(unsigned long param)
skb->h.raw = skb->data;
skb->h.raw = skb->data;
- if ((sk = rose_find_socket(lci_o, rose_loopback_neigh)) != NULL) {
+ sk = rose_find_socket(lci_o, &rose_loopback_neigh);
+ if (sk) {
if (rose_process_rx_frame(sk, skb) == 0)
kfree_skb(skb);
continue;
if (rose_process_rx_frame(sk, skb) == 0)
kfree_skb(skb);
continue;
@@
-87,7
+88,7
@@
static void rose_loopback_timer(unsigned long param)
if (frametype == ROSE_CALL_REQUEST) {
if ((dev = rose_dev_get(dest)) != NULL) {
if (frametype == ROSE_CALL_REQUEST) {
if ((dev = rose_dev_get(dest)) != NULL) {
- if (rose_rx_call_request(skb, dev, rose_loopback_neigh, lci_o) == 0)
+ if (rose_rx_call_request(skb, dev,
&
rose_loopback_neigh, lci_o) == 0)
kfree_skb(skb);
} else {
kfree_skb(skb);
kfree_skb(skb);
} else {
kfree_skb(skb);