patch-1.3.6 linux/net/802/psnap.c

Next file: linux/net/802/tr.c
Previous file: linux/net/802/p8023.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.5/linux/net/802/psnap.c linux/net/802/psnap.c
@@ -58,7 +58,7 @@
 		 */
 		 
 		skb->h.raw += 5;
-		skb->len -= 5;
+		skb_pull(skb,5);
 		if (psnap_packet_type.type == 0)
 			psnap_packet_type.type=htons(ETH_P_SNAP);
 		return proto->rcvfunc(skb, dev, &psnap_packet_type);
@@ -74,10 +74,9 @@
  
 static void snap_datalink_header(struct datalink_proto *dl, struct sk_buff *skb, unsigned char *dest_node)
 {
-	struct device	*dev = skb->dev;
 	unsigned char	*rawp;
 
-	rawp = skb->data + snap_dl->header_length+dev->hard_header_len;
+	rawp = skb_push(skb,5);
 	memcpy(rawp,dl->type,5);
 	skb->h.raw = rawp+5;
 	snap_dl->datalink_header(snap_dl, skb, dest_node);

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this