| 1 |
Author: mpagano |
| 2 |
Date: 2008-09-08 19:03:45 +0000 (Mon, 08 Sep 2008) |
| 3 |
New Revision: 1344 |
| 4 |
|
| 5 |
Added: |
| 6 |
genpatches-2.6/trunk/2.6.26/1004_linux-2.6.26.5.patch |
| 7 |
Modified: |
| 8 |
genpatches-2.6/trunk/2.6.26/0000_README |
| 9 |
Log: |
| 10 |
Version bump |
| 11 |
|
| 12 |
Modified: genpatches-2.6/trunk/2.6.26/0000_README |
| 13 |
=================================================================== |
| 14 |
--- genpatches-2.6/trunk/2.6.26/0000_README 2008-09-08 12:17:10 UTC (rev 1343) |
| 15 |
+++ genpatches-2.6/trunk/2.6.26/0000_README 2008-09-08 19:03:45 UTC (rev 1344) |
| 16 |
@@ -55,6 +55,10 @@ |
| 17 |
From: http://www.kernel.org |
| 18 |
Desc: Linux 2.6.26.4 |
| 19 |
|
| 20 |
+Patch: 1004_linux-2.6.26.5.patch |
| 21 |
+From: http://www.kernel.org |
| 22 |
+Desc: Linux 2.6.26.5 |
| 23 |
+ |
| 24 |
Patch: 1900_UTC-timestamp-option.patch |
| 25 |
From: http://bugs.gentoo.org/233307 |
| 26 |
Desc: Fix to add UTC timestamp option |
| 27 |
|
| 28 |
Added: genpatches-2.6/trunk/2.6.26/1004_linux-2.6.26.5.patch |
| 29 |
=================================================================== |
| 30 |
--- genpatches-2.6/trunk/2.6.26/1004_linux-2.6.26.5.patch (rev 0) |
| 31 |
+++ genpatches-2.6/trunk/2.6.26/1004_linux-2.6.26.5.patch 2008-09-08 19:03:45 UTC (rev 1344) |
| 32 |
@@ -0,0 +1,96 @@ |
| 33 |
+diff --git a/include/linux/mroute.h b/include/linux/mroute.h |
| 34 |
+index 35a8277..5e30ac3 100644 |
| 35 |
+--- a/include/linux/mroute.h |
| 36 |
++++ b/include/linux/mroute.h |
| 37 |
+@@ -2,7 +2,10 @@ |
| 38 |
+ #define __LINUX_MROUTE_H |
| 39 |
+ |
| 40 |
+ #include <linux/sockios.h> |
| 41 |
++#include <linux/types.h> |
| 42 |
++#ifdef __KERNEL__ |
| 43 |
+ #include <linux/in.h> |
| 44 |
++#endif |
| 45 |
+ |
| 46 |
+ /* |
| 47 |
+ * Based on the MROUTING 3.5 defines primarily to keep |
| 48 |
+@@ -126,6 +129,7 @@ struct igmpmsg |
| 49 |
+ */ |
| 50 |
+ |
| 51 |
+ #ifdef __KERNEL__ |
| 52 |
++#include <linux/pim.h> |
| 53 |
+ #include <net/sock.h> |
| 54 |
+ |
| 55 |
+ #ifdef CONFIG_IP_MROUTE |
| 56 |
+@@ -210,27 +214,6 @@ struct mfc_cache |
| 57 |
+ #define IGMPMSG_WHOLEPKT 3 /* For PIM Register processing */ |
| 58 |
+ |
| 59 |
+ #ifdef __KERNEL__ |
| 60 |
+- |
| 61 |
+-#define PIM_V1_VERSION __constant_htonl(0x10000000) |
| 62 |
+-#define PIM_V1_REGISTER 1 |
| 63 |
+- |
| 64 |
+-#define PIM_VERSION 2 |
| 65 |
+-#define PIM_REGISTER 1 |
| 66 |
+- |
| 67 |
+-#define PIM_NULL_REGISTER __constant_htonl(0x40000000) |
| 68 |
+- |
| 69 |
+-/* PIMv2 register message header layout (ietf-draft-idmr-pimvsm-v2-00.ps */ |
| 70 |
+- |
| 71 |
+-struct pimreghdr |
| 72 |
+-{ |
| 73 |
+- __u8 type; |
| 74 |
+- __u8 reserved; |
| 75 |
+- __be16 csum; |
| 76 |
+- __be32 flags; |
| 77 |
+-}; |
| 78 |
+- |
| 79 |
+-extern int pim_rcv_v1(struct sk_buff *); |
| 80 |
+- |
| 81 |
+ struct rtmsg; |
| 82 |
+ extern int ipmr_get_route(struct sk_buff *skb, struct rtmsg *rtm, int nowait); |
| 83 |
+ #endif |
| 84 |
+diff --git a/include/linux/mroute6.h b/include/linux/mroute6.h |
| 85 |
+index e798959..90010dd 100644 |
| 86 |
+--- a/include/linux/mroute6.h |
| 87 |
++++ b/include/linux/mroute6.h |
| 88 |
+@@ -115,6 +115,7 @@ struct sioc_mif_req6 |
| 89 |
+ |
| 90 |
+ #ifdef __KERNEL__ |
| 91 |
+ |
| 92 |
++#include <linux/pim.h> |
| 93 |
+ #include <linux/skbuff.h> /* for struct sk_buff_head */ |
| 94 |
+ |
| 95 |
+ #ifdef CONFIG_IPV6_MROUTE |
| 96 |
+diff --git a/include/linux/pim.h b/include/linux/pim.h |
| 97 |
+new file mode 100644 |
| 98 |
+index 0000000..1ba0661 |
| 99 |
+--- /dev/null |
| 100 |
++++ b/include/linux/pim.h |
| 101 |
+@@ -0,0 +1,27 @@ |
| 102 |
++#ifndef __LINUX_PIM_H |
| 103 |
++#define __LINUX_PIM_H |
| 104 |
++ |
| 105 |
++#include <asm/byteorder.h> |
| 106 |
++ |
| 107 |
++/* Message types - V1 */ |
| 108 |
++#define PIM_V1_VERSION __constant_htonl(0x10000000) |
| 109 |
++#define PIM_V1_REGISTER 1 |
| 110 |
++ |
| 111 |
++/* Message types - V2 */ |
| 112 |
++#define PIM_VERSION 2 |
| 113 |
++#define PIM_REGISTER 1 |
| 114 |
++ |
| 115 |
++#define PIM_NULL_REGISTER __constant_htonl(0x40000000) |
| 116 |
++ |
| 117 |
++/* PIMv2 register message header layout (ietf-draft-idmr-pimvsm-v2-00.ps */ |
| 118 |
++struct pimreghdr |
| 119 |
++{ |
| 120 |
++ __u8 type; |
| 121 |
++ __u8 reserved; |
| 122 |
++ __be16 csum; |
| 123 |
++ __be32 flags; |
| 124 |
++}; |
| 125 |
++ |
| 126 |
++struct sk_buff; |
| 127 |
++extern int pim_rcv_v1(struct sk_buff *); |
| 128 |
++#endif |
Archives