Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6

[linux-2.6] / net / rose / rose_loopback.c

diff --git a/net/rose/rose_loopback.c b/net/rose/rose_loopback.c
index 103b4d38f88ad679dab8d24ce014f76bad98135d..cd01642f0491ae01f57e86ba6868bc13172eec9a 100644 (file)
--- a/net/rose/rose_loopback.c
+++ b/net/rose/rose_loopback.c
@@ -77,9 +77,10 @@ static void rose_loopback_timer(unsigned long param)
                dest      = (rose_address *)(skb->data + 4);
                lci_o     = 0xFFF - lci_i;
 
-               skb->h.raw = skb->data;
+               skb_reset_transport_header(skb);
 
-               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;
@@ -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 (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);