Subject: [PATCH PKT_SCHED 3/4]: cls_route: fix tcf_exts fallout

From: Patrick McHardy <[email-masked]>
Date: Wed, 19 Jan 2005 05:38:46 +0100

# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
#   2005/01/19 04:53:51+01:00 [email-masked] 
#   [PKT_SCHED]: cls_route: fix tcf_exts fallout
#   
#   handle is computed wrong, this makes creating a filter not using
#   "from" fail.
#   
#   Signed-off-by: Patrick McHardy <[email-masked]>
# 
# net/sched/cls_route.c
#   2005/01/19 04:53:43+01:00 [email-masked] +2 -2
#   [PKT_SCHED]: cls_route: fix tcf_exts fallout
#   
#   handle is computed wrong, this makes creating a filter not using
#   "from" fail.
#   
#   Signed-off-by: Patrick McHardy <[email-masked]>
# 
diff -Nru a/net/sched/cls_route.c b/net/sched/cls_route.c
--- a/net/sched/cls_route.c	2005-01-19 05:29:55 +01:00
+++ b/net/sched/cls_route.c	2005-01-19 05:29:55 +01:00
@@ -384,9 +384,9 @@
 		id = *(u32*)RTA_DATA(tb[TCA_ROUTE4_IIF-1]);
 		if (id > 0x7FFF)
 			goto errout;
-		nhandle = (id | 0x8000) << 16;
+		nhandle |= (id | 0x8000) << 16;
 	} else
-		nhandle = 0xFFFF << 16;
+		nhandle |= 0xFFFF << 16;
 
 	if (handle && new) {
 		nhandle |= handle & 0x7F00;