Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 243757 Details for
Bug 333619
net-misc/cisco-vpnclient-3des-4.8.00.0490-r1 will not compile with gentoo-sources-2.6.34-r1
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
2.6.31.patch
2.6.31.patch (text/plain), 1.87 KB, created by
Cyprien Nicolas (fulax)
on 2010-08-20 20:31:44 UTC
(
hide
)
Description:
2.6.31.patch
Filename:
MIME Type:
Creator:
Cyprien Nicolas (fulax)
Created:
2010-08-20 20:31:44 UTC
Size:
1.87 KB
patch
obsolete
>diff -uBbr vpnclient.orig/interceptor.c vpnclient/interceptor.c >--- vpnclient.orig/interceptor.c 2009-10-07 20:22:56.000000000 +0200 >+++ vpnclient/interceptor.c 2009-10-07 20:28:48.000000000 +0200 >@@ -120,6 +120,14 @@ > .notifier_call = handle_netdev_event, > }; > >+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31) >+static const struct net_device_ops vpn_netdev_ops = { >+ .ndo_start_xmit = interceptor_tx, >+ .ndo_get_stats = interceptor_stats, >+ .ndo_do_ioctl = interceptor_ioctl, >+}; >+#endif >+ > #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22) > static int > #else >@@ -128,10 +136,13 @@ > interceptor_init(struct net_device *dev) > { > ether_setup(dev); >- >+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31) >+ dev->netdev_ops = &vpn_netdev_ops; >+ #else > dev->hard_start_xmit = interceptor_tx; > dev->get_stats = interceptor_stats; > dev->do_ioctl = interceptor_ioctl; >+ #endif > > dev->mtu = ETH_DATA_LEN-MTU_REDUCTION; > kernel_memcpy(dev->dev_addr, interceptor_eth_addr,ETH_ALEN); >@@ -268,8 +279,13 @@ > Bindings[i].original_mtu = dev->mtu; > > /*replace the original send function with our send function */ >+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31) >+ Bindings[i].InjectSend = dev->netdev_ops->ndo_start_xmit; >+ dev->netdev_ops->ndo_start_xmit = replacement_dev_xmit; >+ #else > Bindings[i].InjectSend = dev->hard_start_xmit; > dev->hard_start_xmit = replacement_dev_xmit; >+ #endif > > /*copy in the ip packet handler function and packet type struct */ > Bindings[i].InjectReceive = original_ip_handler.orig_handler_func; >@@ -291,7 +307,11 @@ > if (b) > { > rc = 0; >+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31) >+ dev->netdev_ops->ndo_start_xmit = b->InjectSend; >+ #else > dev->hard_start_xmit = b->InjectSend; >+ #endif > kernel_memset(b, 0, sizeof(BINDING)); > } > else
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 333619
:
243757
|
243873
|
243923