[PATCH] (4/11) netrom - reserve room for AX25 header in skb

• Previous message: Stephen Hemminger: "[PATCH] (6/11) netrom - ax25 interface changes"
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

From: Jeroen Vreeken <sepyv.lmvho@nahan.com>

Reserve space in socket header for AX25 header.

diff -Nru a/net/netrom/nr_dev.c b/net/netrom/nr_dev.c
--- a/net/netrom/nr_dev.c Wed Aug 13 12:22:13 2003
+++ b/net/netrom/nr_dev.c Wed Aug 13 12:22:13 2003
@@ -204,7 +204,7 @@
         dev->stop = nr_close;
 
         dev->hard_header = nr_header;
- dev->hard_header_len = AX25_BPQ_HEADER_LEN + AX25_MAX_HEADER_LEN + NR_NETWORK_LEN + NR_TRANSPORT_LEN;
+ dev->hard_header_len = NR_NETWORK_LEN + NR_TRANSPORT_LEN;
         dev->addr_len = AX25_ADDR_LEN;
         dev->type = ARPHRD_NETROM;
         dev->rebuild_header = nr_rebuild_header;
diff -Nru a/net/netrom/nr_subr.c b/net/netrom/nr_subr.c
--- a/net/netrom/nr_subr.c Wed Aug 13 12:22:13 2003
+++ b/net/netrom/nr_subr.c Wed Aug 13 12:22:13 2003
@@ -127,7 +127,7 @@
         unsigned char *dptr;
         int len, timeout;
 
- len = AX25_BPQ_HEADER_LEN + AX25_MAX_HEADER_LEN + NR_NETWORK_LEN + NR_TRANSPORT_LEN;
+ len = NR_NETWORK_LEN + NR_TRANSPORT_LEN;
 
         switch (frametype & 0x0F) {
         case NR_CONNREQ:
@@ -151,7 +151,7 @@
         /*
          * Space for AX.25 and NET/ROM network header
          */
- skb_reserve(skb, AX25_BPQ_HEADER_LEN + AX25_MAX_HEADER_LEN + NR_NETWORK_LEN);
+ skb_reserve(skb, NR_NETWORK_LEN);
 
         dptr = skb_put(skb, skb_tailroom(skb));
 
@@ -219,12 +219,12 @@
         unsigned char *dptr;
         int len;
 
- len = AX25_BPQ_HEADER_LEN + AX25_MAX_HEADER_LEN + NR_NETWORK_LEN + NR_TRANSPORT_LEN + 1;
+ len = NR_NETWORK_LEN + NR_TRANSPORT_LEN + 1;
 
         if ((skbn = alloc_skb(len, GFP_ATOMIC)) == NULL)
                 return;
 
- skb_reserve(skbn, AX25_BPQ_HEADER_LEN + AX25_MAX_HEADER_LEN);
+ skb_reserve(skbn, 0);
 
         dptr = skb_put(skbn, NR_NETWORK_LEN + NR_TRANSPORT_LEN);
 
-
To unsubscribe from this list: send the line "unsubscribe linux-hams" in
the body of a message to terhi.victor@logonet.com
More majordomo info at http://vger.kernel.org/majordomo-info.html

• Next message: Stephen Hemminger: "[PATCH] (8/11) netrom - make lists and locks static"
• Previous message: Stephen Hemminger: "[PATCH] (6/11) netrom - ax25 interface changes"
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

This archive was generated by hypermail 2b30 : Thu Aug 14 2003 - 01:42:32 EEST