projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6
[powerpc.git]
/
net
/
netrom
/
nr_in.c
diff --git
a/net/netrom/nr_in.c
b/net/netrom/nr_in.c
index
004e859
..
6817648
100644
(file)
--- a/
net/netrom/nr_in.c
+++ b/
net/netrom/nr_in.c
@@
-12,7
+12,6
@@
#include <linux/socket.h>
#include <linux/in.h>
#include <linux/kernel.h>
#include <linux/socket.h>
#include <linux/in.h>
#include <linux/kernel.h>
-#include <linux/sched.h>
#include <linux/timer.h>
#include <linux/string.h>
#include <linux/sockios.h>
#include <linux/timer.h>
#include <linux/string.h>
#include <linux/sockios.h>
@@
-52,10
+51,12
@@
static int nr_queue_rx_frame(struct sock *sk, struct sk_buff *skb, int more)
if ((skbn = alloc_skb(nr->fraglen, GFP_ATOMIC)) == NULL)
return 1;
if ((skbn = alloc_skb(nr->fraglen, GFP_ATOMIC)) == NULL)
return 1;
- skb
n->h.raw = skbn->data
;
+ skb
_reset_transport_header(skbn)
;
while ((skbo = skb_dequeue(&nr->frag_queue)) != NULL) {
while ((skbo = skb_dequeue(&nr->frag_queue)) != NULL) {
- memcpy(skb_put(skbn, skbo->len), skbo->data, skbo->len);
+ skb_copy_from_linear_data(skbo,
+ skb_put(skbn, skbo->len),
+ skbo->len);
kfree_skb(skbo);
}
kfree_skb(skbo);
}
@@
-99,7
+100,7
@@
static int nr_state1_machine(struct sock *sk, struct sk_buff *skb,
break;
case NR_RESET:
break;
case NR_RESET:
- if (sysctl_netrom_reset_circuit)
;
+ if (sysctl_netrom_reset_circuit)
nr_disconnect(sk, ECONNRESET);
break;
nr_disconnect(sk, ECONNRESET);
break;
@@
-130,7
+131,7
@@
static int nr_state2_machine(struct sock *sk, struct sk_buff *skb,
break;
case NR_RESET:
break;
case NR_RESET:
- if (sysctl_netrom_reset_circuit)
;
+ if (sysctl_netrom_reset_circuit)
nr_disconnect(sk, ECONNRESET);
break;
nr_disconnect(sk, ECONNRESET);
break;
@@
-265,7
+266,7
@@
static int nr_state3_machine(struct sock *sk, struct sk_buff *skb, int frametype
break;
case NR_RESET:
break;
case NR_RESET:
- if (sysctl_netrom_reset_circuit)
;
+ if (sysctl_netrom_reset_circuit)
nr_disconnect(sk, ECONNRESET);
break;
nr_disconnect(sk, ECONNRESET);
break;