git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[SK_BUFF]: Introduce skb_network_offset()
[pandora-kernel.git]
/
net
/
ax25
/
ax25_out.c
diff --git
a/net/ax25/ax25_out.c
b/net/ax25/ax25_out.c
index
5d99852
..
02dea85
100644
(file)
--- a/
net/ax25/ax25_out.c
+++ b/
net/ax25/ax25_out.c
@@
-8,14
+8,12
@@
* Copyright (C) Jonathan Naylor G4KLX (g4klx@g4klx.demon.co.uk)
* Copyright (C) Joerg Reuter DL1BKE (jreuter@yaina.de)
*/
* Copyright (C) Jonathan Naylor G4KLX (g4klx@g4klx.demon.co.uk)
* Copyright (C) Joerg Reuter DL1BKE (jreuter@yaina.de)
*/
-#include <linux/config.h>
#include <linux/errno.h>
#include <linux/types.h>
#include <linux/socket.h>
#include <linux/in.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/errno.h>
#include <linux/types.h>
#include <linux/socket.h>
#include <linux/in.h>
#include <linux/kernel.h>
#include <linux/module.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>
@@
-71,11
+69,11
@@
ax25_cb *ax25_send_frame(struct sk_buff *skb, int paclen, ax25_address *src, ax2
ax25->dest_addr = *dest;
if (digi != NULL) {
ax25->dest_addr = *dest;
if (digi != NULL) {
- if ((ax25->digipeat = kmalloc(sizeof(ax25_digi), GFP_ATOMIC)) == NULL) {
+ ax25->digipeat = kmemdup(digi, sizeof(*digi), GFP_ATOMIC);
+ if (ax25->digipeat == NULL) {
ax25_cb_put(ax25);
return NULL;
}
ax25_cb_put(ax25);
return NULL;
}
- memcpy(ax25->digipeat, digi, sizeof(ax25_digi));
}
switch (ax25->ax25_dev->values[AX25_VALUES_PROTOCOL]) {
}
switch (ax25->ax25_dev->values[AX25_VALUES_PROTOCOL]) {
@@
-150,7
+148,7
@@
void ax25_output(ax25_cb *ax25, int paclen, struct sk_buff *skb)
if (ka9qfrag == 1) {
skb_reserve(skbn, frontlen + 2);
if (ka9qfrag == 1) {
skb_reserve(skbn, frontlen + 2);
- skbn->nh.raw = skbn->data +
(skb->nh.raw - skb->data
);
+ skbn->nh.raw = skbn->data +
skb_network_offset(skb
);
memcpy(skb_put(skbn, len), skb->data, len);
p = skb_push(skbn, 2);
memcpy(skb_put(skbn, len), skb->data, len);
p = skb_push(skbn, 2);
@@
-163,7
+161,7
@@
void ax25_output(ax25_cb *ax25, int paclen, struct sk_buff *skb)
}
} else {
skb_reserve(skbn, frontlen + 1);
}
} else {
skb_reserve(skbn, frontlen + 1);
- skbn->nh.raw = skbn->data +
(skb->nh.raw - skb->data
);
+ skbn->nh.raw = skbn->data +
skb_network_offset(skb
);
memcpy(skb_put(skbn, len), skb->data, len);
p = skb_push(skbn, 1);
*p = AX25_P_TEXT;
memcpy(skb_put(skbn, len), skb->data, len);
p = skb_push(skbn, 1);
*p = AX25_P_TEXT;
@@
-207,7
+205,7
@@
static void ax25_send_iframe(ax25_cb *ax25, struct sk_buff *skb, int poll_bit)
if (skb == NULL)
return;
if (skb == NULL)
return;
- skb
->nh.raw = skb->data
;
+ skb
_reset_network_header(skb)
;
if (ax25->modulus == AX25_MODULUS) {
frame = skb_push(skb, 1);
if (ax25->modulus == AX25_MODULUS) {
frame = skb_push(skb, 1);