patch-2.2.7 linux/net/sched/cls_rsvp.h

• Lines: 31
• Date: Thu Apr 22 19:45:20 1999
• Orig file: v2.2.6/linux/net/sched/cls_rsvp.h
• Orig date: Mon Mar 29 11:09:12 1999

diff -u --recursive --new-file v2.2.6/linux/net/sched/cls_rsvp.h linux/net/sched/cls_rsvp.h
@@ -193,23 +193,23 @@
 				    && src[2] == f->src[2]
 #endif
 				    ) {
+					*res = f->res;
 
 					RSVP_POLICE();
 
 matched:
-					if (f->tunnelhdr == 0) {
-						*res = f->res;
+					if (f->tunnelhdr == 0)
 						return 0;
-					} else {
-						tunnelid = f->res.classid;
-						nhptr = (void*)(xprt + f->tunnelhdr - sizeof(*nhptr));
-						goto restart;
-					}
+
+					tunnelid = f->res.classid;
+					nhptr = (void*)(xprt + f->tunnelhdr - sizeof(*nhptr));
+					goto restart;
 				}
 			}
 
 			/* And wildcard bucket... */
 			for (f = s->ht[16]; f; f = f->next) {
+				*res = f->res;
 				RSVP_POLICE();
 				goto matched;
 			}