From: Chris Wright Date: Wed, 21 Dec 2005 19:46:00 +0000 (-0800) Subject: Add rtnetlink regression fix, fwd from DaveM X-Git-Tag: v2.6.14.6~29 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8bcff64493d1199690de81677bbea73f76cc43a4;p=thirdparty%2Fkernel%2Fstable-queue.git Add rtnetlink regression fix, fwd from DaveM --- diff --git a/queue/rtnetlink-fix-RTNLGRP-definitions-in-rtnetlink.h.patch b/queue/rtnetlink-fix-RTNLGRP-definitions-in-rtnetlink.h.patch new file mode 100644 index 00000000000..4f003c94a6f --- /dev/null +++ b/queue/rtnetlink-fix-RTNLGRP-definitions-in-rtnetlink.h.patch @@ -0,0 +1,51 @@ +From stable-bounces@linux.kernel.org Mon Dec 19 17:01:37 2005 +Date: Mon, 19 Dec 2005 16:59:18 -0800 (PST) +Message-Id: <20051219.165918.32394643.davem@davemloft.net> +To: stable@kernel.org +From: "David S. Miller" +Subject: [RTNETLINK]: Fix RTNLGRP definitions in rtnetlink.h + +From: Kristian Slavov + +I reported a problem and gave hints to the solution, but nobody seemed +to react. So I prepared a patch against 2.6.14.4. + +Tested on 2.6.14.4 with "ip monitor addr" and with the program +attached, while adding and removing IPv6 address. Both programs didn't +receive any messages. Tested 2.6.14.4 + this patch, and both programs +received add and remove messages. + +Signed-off-by: Kristian Slavov +Acked-by: Jamal Hadi salim +ACKed-by: Patrick McHardy +Signed-off-by: David S. Miller +Signed-off-by: Chris Wright +--- + + include/linux/rtnetlink.h | 4 ++++ + 1 files changed, 4 insertions(+) + +Index: linux-2.6.14.y/include/linux/rtnetlink.h +=================================================================== +--- linux-2.6.14.y.orig/include/linux/rtnetlink.h ++++ linux-2.6.14.y/include/linux/rtnetlink.h +@@ -866,6 +866,7 @@ enum rtnetlink_groups { + #define RTNLGRP_IPV4_MROUTE RTNLGRP_IPV4_MROUTE + RTNLGRP_IPV4_ROUTE, + #define RTNLGRP_IPV4_ROUTE RTNLGRP_IPV4_ROUTE ++ RTNLGRP_NOP1, + RTNLGRP_IPV6_IFADDR, + #define RTNLGRP_IPV6_IFADDR RTNLGRP_IPV6_IFADDR + RTNLGRP_IPV6_MROUTE, +@@ -876,8 +877,11 @@ enum rtnetlink_groups { + #define RTNLGRP_IPV6_IFINFO RTNLGRP_IPV6_IFINFO + RTNLGRP_DECnet_IFADDR, + #define RTNLGRP_DECnet_IFADDR RTNLGRP_DECnet_IFADDR ++ RTNLGRP_NOP2, + RTNLGRP_DECnet_ROUTE, + #define RTNLGRP_DECnet_ROUTE RTNLGRP_DECnet_ROUTE ++ RTNLGRP_NOP3, ++ RTNLGRP_NOP4, + RTNLGRP_IPV6_PREFIX, + #define RTNLGRP_IPV6_PREFIX RTNLGRP_IPV6_PREFIX + __RTNLGRP_MAX diff --git a/queue/series b/queue/series index ea95a98f009..ec12f8d325f 100644 --- a/queue/series +++ b/queue/series @@ -8,3 +8,4 @@ gre-fix-hardware-checksum-modification.patch fix-vlan-checksumming.patch fix-nat-init-order.patch fix-incorrect-dependency-for-IP6_NF_TARGET_NFQUEUE.patch +rtnetlink-fix-RTNLGRP-definitions-in-rtnetlink.h.patch