patch-2.1.15 linux/net/802/tr.c

Next file: linux/net/802/transit/Makefile
Previous file: linux/net/802/pseudo/pseudocode.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.14/linux/net/802/tr.c linux/net/802/tr.c
@@ -68,18 +68,18 @@
 
 }
 	
-int tr_rebuild_header(void *buff, struct device *dev, unsigned long dest,
-							 struct sk_buff *skb) {
+int tr_rebuild_header(struct sk_buff *skb) {
 
-	struct trh_hdr *trh=(struct trh_hdr *)buff;
-	struct trllc *trllc=(struct trllc *)(buff+sizeof(struct trh_hdr));
+	struct trh_hdr *trh=(struct trh_hdr *)skb->data;
+	struct trllc *trllc=(struct trllc *)(skb->data+sizeof(struct trh_hdr));
+	struct device *dev = skb->dev;
 
 	if(trllc->ethertype != htons(ETH_P_IP)) {
 		printk("tr_rebuild_header: Don't know how to resolve type %04X addresses ?\n",(unsigned int)htons(	trllc->ethertype));
 		return 0;
 	}
 
-	if(arp_find(trh->daddr, dest, dev, dev->pa_addr, skb)) {
+	if(arp_find(trh->daddr, skb)) {
 			return 1;
 	}
 	else {	

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov