Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 142614 Details for
Bug 207536
net-misc/cisco-vpnclient-3des patch for 2.6.24 kernel
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Corrected patch for 4.8.00.0490
2.6.24_4.8.00.0490.patch (text/plain), 4.09 KB, created by
David Klempner
on 2008-02-03 22:24:01 UTC
(
hide
)
Description:
Corrected patch for 4.8.00.0490
Filename:
MIME Type:
Creator:
David Klempner
Created:
2008-02-03 22:24:01 UTC
Size:
4.09 KB
patch
obsolete
>diff -Nur vpnclient/GenDefs.h vpnclient.new/GenDefs.h >--- vpnclient/GenDefs.h 2005-11-22 01:43:57.000000000 -0800 >+++ vpnclient.new/GenDefs.h 2008-02-03 13:24:07.000000000 -0800 >@@ -105,6 +105,12 @@ > #define _INTPTR_T_DEFINED > #endif > >+/* uintptr_t has been defined in include/linux/types.h in 2.6.24. >+ * No need to define it here again (will only lead to compile errors) >+ * >+ * by Alexander Griesser <work@tuxx-home.at>, 2008-01-11 >+ */ >+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24) > #ifndef _UINTPTR_T_DEFINED > #if defined(_LP64) > #warning 64 bit >@@ -114,6 +120,7 @@ > #endif > #define _UINTPTR_T_DEFINED > #endif >+#endif > > > typedef int BOOL; >diff -Nur vpnclient/interceptor.c vpnclient.new/interceptor.c >--- vpnclient/interceptor.c 2008-02-03 14:06:20.000000000 -0800 >+++ vpnclient.new/interceptor.c 2008-02-03 14:07:43.000000000 -0800 >@@ -27,6 +27,10 @@ > #include <linux/udp.h> > #include <net/protocol.h> > >+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24) >+#include <net/net_namespace.h> >+#endif >+ > #include "linux_os.h" > > #include "vpn_ioctl_linux.h" >@@ -47,7 +51,13 @@ > unsigned long rx_bytes; > > /*methods of the cipsec network device*/ >-static int interceptor_init(struct net_device *); >+static >+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24) >+void >+#else >+int >+#endif >+interceptor_init(struct net_device *); > static struct net_device_stats *interceptor_stats(struct net_device *dev); > static int interceptor_ioctl(struct net_device *dev, struct ifreq *ifr, > int cmd); >@@ -91,15 +101,33 @@ > > BINDING Bindings[MAX_INTERFACES]; > >+/* 2.6.24 handles net_devices a little bit different >+ * >+ * by Alexander Griesser <work@tuxx-home.at>, 2008-01-11 >+ */ >+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24) >+static struct net_device* interceptor_dev; >+#else > static struct net_device interceptor_dev = { > .name = interceptor_name, > .init = interceptor_init > }; >+#endif >+ > static struct notifier_block interceptor_notifier = { > .notifier_call = handle_netdev_event, > }; > >+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22) >+static >+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24) >+void >+#else >+int >+#endif >+#else > static int __init >+#endif > interceptor_init(struct net_device *dev) > { > ether_setup(dev); >@@ -113,8 +141,9 @@ > dev->flags |= IFF_NOARP; > dev->flags &= ~(IFF_BROADCAST | IFF_MULTICAST); > kernel_memset(dev->broadcast, 0xFF, ETH_ALEN); >- >- return 0; >+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24) >+ return 0; >+#endif > } > > static struct net_device_stats * >@@ -344,7 +373,11 @@ > num_target_devices = 0; > > #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22) >- for_each_netdev(dp) >+ for_each_netdev( >+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24) >+ &init_net, >+ #endif >+ dp) > #else > for (dp = dev_base; dp != NULL; dp = dp->next) > #endif >@@ -843,15 +876,29 @@ > > rc = CniPluginLoad(&pcDeviceName, &PCNICallbackTable); > >+/* 2.6.24 needs to allocate each netdevice before registering it, otherwise >+ * the kernel BUG()s. >+ * >+ * by Alexander Griesser <work@tuxx-home.at>, 2008-01-11 >+ */ >+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24) >+ if(! (interceptor_dev = alloc_netdev(sizeof(struct net_device), interceptor_name, interceptor_init))) >+ return 0; >+#endif >+ > if (CNI_IS_SUCCESS(rc)) > { > > CNICallbackTable = *PCNICallbackTable; > CniPluginDeviceCreated(); >+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24) >+ if ((status = register_netdev(interceptor_dev)) != 0) >+#else > if ((status = register_netdev(&interceptor_dev)) != 0) >+#endif > { > printk(KERN_INFO "%s: error %d registering device \"%s\".\n", >- LINUX_VPN_IFNAME, status, interceptor_dev.name); >+ LINUX_VPN_IFNAME, status, interceptor_name); > CniPluginUnload(); > > } >@@ -871,7 +918,11 @@ > cleanup_frag_queue(); > CniPluginUnload(); > >+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24) >+ unregister_netdev(interceptor_dev); >+#else > unregister_netdev(&interceptor_dev); >+#endif > unregister_netdevice_notifier(&interceptor_notifier); > > return;
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 207536
:
142533
|
142578
| 142614 |
142628