diff options
| author | Miguel de Icaza <miguel@nuclecu.unam.mx> | 1997-08-06 19:14:48 +0000 |
|---|---|---|
| committer | Miguel de Icaza <miguel@nuclecu.unam.mx> | 1997-08-06 19:14:48 +0000 |
| commit | e2819e52a162873ff5061de81bb749831bdb5de9 (patch) | |
| tree | 6067ea700202750ba335a423696f2972700e5f76 /net/ax25 | |
| parent | 17a005074429bbf143e40401f405ae4363e56828 (diff) | |
Merge to 2.1.38.
IMPORTANT NOTE: I could not figure out what information is the
one that should be used for the following files (ie, those
that were in our tree, or those that came from Linus' patch),
please, check these:
include/asm-mips/jazz.h
include/asm-mips/jazzdma.h
include/asm-mips/ioctls.h
Diffstat (limited to 'net/ax25')
| -rw-r--r-- | net/ax25/ax25_ip.c | 2 | ||||
| -rw-r--r-- | net/ax25/ax25_route.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/ax25/ax25_ip.c b/net/ax25/ax25_ip.c index d26f008dd..3a8594fba 100644 --- a/net/ax25/ax25_ip.c +++ b/net/ax25/ax25_ip.c @@ -165,6 +165,8 @@ int ax25_rebuild_header(struct sk_buff *skb) bp[14] |= AX25_EBIT; bp[14] |= AX25_SSSID_SPARE; + skb_pull(skb, AX25_KISS_HEADER_LEN); + if (route->digipeat != NULL) { if ((ourskb = ax25_rt_build_path(skb, src, dst, route->digipeat)) == NULL) { kfree_skb(skb, FREE_WRITE); diff --git a/net/ax25/ax25_route.c b/net/ax25/ax25_route.c index 2c7d082a9..911b54834 100644 --- a/net/ax25/ax25_route.c +++ b/net/ax25/ax25_route.c @@ -410,8 +410,6 @@ struct sk_buff *ax25_rt_build_path(struct sk_buff *skb, ax25_address *src, ax25_ unsigned char *bp; int len; - skb_pull(skb, 1); /* skip KISS command */ - len = digi->ndigi * AX25_ADDR_LEN; if (skb_headroom(skb) < len) { |