* Linux 2.6.26.5
@ 2008-09-08 17:46 Greg KH
2008-09-08 17:46 ` Greg KH
0 siblings, 1 reply; 2+ messages in thread
From: Greg KH @ 2008-09-08 17:46 UTC (permalink / raw)
To: linux-kernel, Andrew Morton, torvalds, stable
We (the -stable team) are announcing the release of the 2.6.26.5
kernel.
It fixes the build error introduced in 2.6.26.4 due to me applying a
stale patch to the tree. Thanks to David Miller for providing the
correct patch and Randy Dunlap for pointing out my error.
I'll also be replying to this message with a copy of the patch between
2.6.26.4 and 2.6.26.5
The updated 2.6.26.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.26.y.git
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6.26.y.git;a=summary
thanks,
greg k-h
------------
Makefile | 2 +-
include/linux/mroute.h | 25 ++++---------------------
include/linux/mroute6.h | 1 +
include/linux/pim.h | 27 +++++++++++++++++++++++++++
4 files changed, 33 insertions(+), 22 deletions(-)
Greg Kroah-Hartman (2):
NET: fix build error caused by Greg K-H
Linux 2.6.26.5
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: Linux 2.6.26.5
2008-09-08 17:46 Linux 2.6.26.5 Greg KH
@ 2008-09-08 17:46 ` Greg KH
0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2008-09-08 17:46 UTC (permalink / raw)
To: linux-kernel, Andrew Morton, torvalds, stable
diff --git a/Makefile b/Makefile
index 63c96c6..56fb747 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 26
-EXTRAVERSION = .4
+EXTRAVERSION = .5
NAME = Rotary Wombat
# *DOCUMENTATION*
diff --git a/include/linux/mroute.h b/include/linux/mroute.h
index 35a8277..5e30ac3 100644
--- a/include/linux/mroute.h
+++ b/include/linux/mroute.h
@@ -2,7 +2,10 @@
#define __LINUX_MROUTE_H
#include <linux/sockios.h>
+#include <linux/types.h>
+#ifdef __KERNEL__
#include <linux/in.h>
+#endif
/*
* Based on the MROUTING 3.5 defines primarily to keep
@@ -126,6 +129,7 @@ struct igmpmsg
*/
#ifdef __KERNEL__
+#include <linux/pim.h>
#include <net/sock.h>
#ifdef CONFIG_IP_MROUTE
@@ -210,27 +214,6 @@ struct mfc_cache
#define IGMPMSG_WHOLEPKT 3 /* For PIM Register processing */
#ifdef __KERNEL__
-
-#define PIM_V1_VERSION __constant_htonl(0x10000000)
-#define PIM_V1_REGISTER 1
-
-#define PIM_VERSION 2
-#define PIM_REGISTER 1
-
-#define PIM_NULL_REGISTER __constant_htonl(0x40000000)
-
-/* PIMv2 register message header layout (ietf-draft-idmr-pimvsm-v2-00.ps */
-
-struct pimreghdr
-{
- __u8 type;
- __u8 reserved;
- __be16 csum;
- __be32 flags;
-};
-
-extern int pim_rcv_v1(struct sk_buff *);
-
struct rtmsg;
extern int ipmr_get_route(struct sk_buff *skb, struct rtmsg *rtm, int nowait);
#endif
diff --git a/include/linux/mroute6.h b/include/linux/mroute6.h
index e798959..90010dd 100644
--- a/include/linux/mroute6.h
+++ b/include/linux/mroute6.h
@@ -115,6 +115,7 @@ struct sioc_mif_req6
#ifdef __KERNEL__
+#include <linux/pim.h>
#include <linux/skbuff.h> /* for struct sk_buff_head */
#ifdef CONFIG_IPV6_MROUTE
diff --git a/include/linux/pim.h b/include/linux/pim.h
new file mode 100644
index 0000000..1ba0661
--- /dev/null
+++ b/include/linux/pim.h
@@ -0,0 +1,27 @@
+#ifndef __LINUX_PIM_H
+#define __LINUX_PIM_H
+
+#include <asm/byteorder.h>
+
+/* Message types - V1 */
+#define PIM_V1_VERSION __constant_htonl(0x10000000)
+#define PIM_V1_REGISTER 1
+
+/* Message types - V2 */
+#define PIM_VERSION 2
+#define PIM_REGISTER 1
+
+#define PIM_NULL_REGISTER __constant_htonl(0x40000000)
+
+/* PIMv2 register message header layout (ietf-draft-idmr-pimvsm-v2-00.ps */
+struct pimreghdr
+{
+ __u8 type;
+ __u8 reserved;
+ __be16 csum;
+ __be32 flags;
+};
+
+struct sk_buff;
+extern int pim_rcv_v1(struct sk_buff *);
+#endif
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-09-08 17:47 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-09-08 17:46 Linux 2.6.26.5 Greg KH
2008-09-08 17:46 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).