linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / net / ax25 / ax25_ip.c

diff --git a/net/ax25/ax25_ip.c b/net/ax25/ax25_ip.c
index 04d7113..d643dac 100644 (file)
--- a/net/ax25/ax25_ip.c
+++ b/net/ax25/ax25_ip.c
@@ -47,7 +47,7 @@
 
 #ifdef CONFIG_INET
 
-int ax25_encapsulate(struct sk_buff *skb, struct net_device *dev, unsigned short type, void *daddr, void *saddr, unsigned len)
+int ax25_hard_header(struct sk_buff *skb, struct net_device *dev, unsigned short type, void *daddr, void *saddr, unsigned len)
 {
        unsigned char *buff;
 
@@ -88,7 +88,7 @@ int ax25_encapsulate(struct sk_buff *skb, struct net_device *dev, unsigned short
                *buff++ = AX25_P_ARP;
                break;
        default:
-               printk(KERN_ERR "AX.25: ax25_encapsulate - wrong protocol type 0x%2.2x\n", type);
+               printk(KERN_ERR "AX.25: ax25_hard_header - wrong protocol type 0x%2.2x\n", type);
                *buff++ = 0;
                break;
        }
@@ -199,9 +199,7 @@ int ax25_rebuild_header(struct sk_buff *skb)
                skb = ourskb;
        }
 
-       skb->dev      = dev;
-
-       ax25_queue_xmit(skb);
+       ax25_queue_xmit(skb, dev);
 
 put:
        ax25_put_route(route);
@@ -211,7 +209,7 @@ put:
 
 #else  /* INET */
 
-int ax25_encapsulate(struct sk_buff *skb, struct net_device *dev, unsigned short type, void *daddr, void *saddr, unsigned len)
+int ax25_hard_header(struct sk_buff *skb, struct net_device *dev, unsigned short type, void *daddr, void *saddr, unsigned len)
 {
        return -AX25_HEADER_LEN;
 }