[patch] Patch for GCC 3.4 and linux kernel >=2.6.14

vpn.patch (text/plain), 1.74 KB, created by Jens Rutschmann on 2006-03-25 09:45:51 UTC

--- vpnclient/interceptor.c
+++ vpnclient/interceptor.c
@@ -56,7 +56,7 @@ static void do_cleanup(void);
 static int handle_vpnup(void);
 static int handle_vpndown(void);
 static CNIFRAGMENT build_ppp_fake_mac_frag(struct ethhdr *dummy);
-static int inline supported_device(struct net_device *dev);
+static int supported_device(struct net_device *dev);
 
 /*packet handler functions*/
 static int recv_ip_packet_handler(struct sk_buff *skb,
@@ -477,7 +477,7 @@ reset_inject_status(inject_status * s)
 }
 
 static int
-inline supported_device(struct net_device* dev)
+supported_device(struct net_device* dev)
 {
     int rc=0;
 
--- vpnclient/linuxcniapi.c
+++ vpnclient/linuxcniapi.c
@@ -292,6 +292,7 @@ CniInjectReceive(IN CNIBINDING Binding,
     PBINDING pBinding;
     LPFRAGMENTBUFFER lpMacFragment;
     struct sk_buff *skb = NULL;
+    struct timeval stamp;
     unsigned char *pIP = NULL, *pMac = NULL;
     int tmp_rc = 0;
 
@@ -312,7 +313,8 @@ CniInjectReceive(IN CNIBINDING Binding,
         goto exit_gracefully;
     }
     /* move the data into the packet */
-    do_gettimeofday(&skb->stamp);
+    do_gettimeofday(&stamp);
+    skb_set_timestamp(skb, &stamp);
 
     pIP = skb_put(skb, lpPacketDescriptor->uiPacketSize);
 
@@ -406,6 +408,7 @@ CniInjectSend(IN CNIBINDING Binding,
     PBINDING pBinding;
     LPFRAGMENTBUFFER lpMacFragment;
     struct sk_buff *skb;
+    struct timeval stamp;
     unsigned char *pIP = NULL, *pMac = NULL;
     int tmp_rc = 0;
 
@@ -449,7 +452,8 @@ CniInjectSend(IN CNIBINDING Binding,
     CniGetPacketData(Packet, 0, lpPacketDescriptor->uiPacketSize, pIP);
 
     /* put the mac header on */
-    do_gettimeofday(&skb->stamp);
+    do_gettimeofday(&stamp);
+    skb_set_timestamp(skb, &stamp);
 
     skb->dev = pBinding->pDevice;