Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 210075 Details for
Bug 234361
net-misc/cisco-vpnclient-3des-4.8.02.0030 version bump
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
4.8.02.0030-linuxcniapi.c.patch
4.8.02.0030-linuxcniapi.c.patch (text/plain), 2.30 KB, created by
Matthew Schultz
on 2009-11-12 21:51:24 UTC
(
hide
)
Description:
4.8.02.0030-linuxcniapi.c.patch
Filename:
MIME Type:
Creator:
Matthew Schultz
Created:
2009-11-12 21:51:24 UTC
Size:
2.30 KB
patch
obsolete
>--- vpnclient-orig/linuxcniapi.c 2008-06-23 11:59:12.000000000 -0500 >+++ vpnclient/linuxcniapi.c 2009-11-12 15:33:52.135669168 -0600 >@@ -338,8 +338,12 @@ > skb->ip_summed = CHECKSUM_UNNECESSARY; > > #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22) >- skb->network_header = (sk_buff_data_t) skb->data; >- skb->mac_header = (sk_buff_data_t)pMac; >+/* 2.6.22 added an inline function for 32-/64-bit usage here, so use it. >+ * We have to use (pMac - skb->data) to get an offset. >+ * We need to cast ptrs to byte ptrs and take the difference. >+ */ >+ skb_reset_network_header(skb); >+ skb_set_mac_header(skb, (int)((void *)pMac - (void *)skb->data)); > #else > skb->nh.iph = (struct iphdr *) skb->data; > skb->mac.raw = pMac; >@@ -478,8 +482,12 @@ > skb->dev = pBinding->pDevice; > > #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22) >- skb->mac_header = (sk_buff_data_t)pMac; >- skb->network_header = (sk_buff_data_t)pIP; >+/* 2.6.22 added an inline function for 32-/64-bit usage here, so use it. >+ * We have to use (pIP/pMac - skb->data) to get an offset. >+ * We need to cast ptrs to byte ptrs and take the difference. >+ */ >+ skb_set_mac_header(skb, (int)((void *)pMac - (void *)skb->data)); >+ skb_set_network_header(skb, (int)((void *)pIP - (void *)skb->data)); > #else > skb->mac.raw = pMac; > skb->nh.raw = pIP; >@@ -487,8 +495,13 @@ > > /*ip header length is in 32bit words */ > #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22) >- skb->transport_header = (sk_buff_data_t) >- (pIP + (((struct iphdr*)(skb->network_header))->ihl * 4)); >+/* 2.6.22 added an inline function for 32-/64-bit usage here, so use it. >+ * We have to use (pIP - skb->data) to get an offset. >+ * We need to cast ptrs to byte ptrs and take the difference. >+ */ >+ skb_set_transport_header(skb, >+ ((int)((void *)pIP - (void *)skb->data) + >+ (((struct iphdr*)(skb_network_header(skb)))->ihl * 4))); > #else > skb->h.raw = pIP + (skb->nh.iph->ihl * 4); > #endif >@@ -496,7 +509,11 @@ > > /* send this packet up the NIC driver */ > // May need to call dev_queue_xmit(skb) instead >+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29) >+ tmp_rc = pBinding->Inject_ops->ndo_start_xmit(skb, skb->dev); >+#else > tmp_rc = pBinding->InjectSend(skb, skb->dev); >+#endif > > #ifdef VIRTUAL_ADAPTER > pVABinding = CniGetVABinding();
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 234361
:
165978
|
170645
|
170646
|
205228
|
210069
|
210071
|
210073
| 210075 |
210076
|
210078
|
210080
|
210081
|
210090
|
232657
|
272205
|
272207
|
272209