matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Backout the 2.4 utsname hash patch.

This commit is contained in:
shemminger 2006-03-22 00:07:49 +00:00
parent 7b5657545d
commit 267480f553
2 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2006-03-21 Stephen Hemminger <shemminger@freekitty.pdx.osdl.net>
* Back out the 2.4 utsname patch
2006-03-21 James Lentini <jlentini@netapp.com> 2006-03-21 James Lentini <jlentini@netapp.com>
* Increase size of hw address allowed for ip neigh to allow * Increase size of hw address allowed for ip neigh to allow

18
tc/f_u32.c
View File

@ -17,7 +17,6 @@
#include <syslog.h> #include <syslog.h>
#include <fcntl.h> #include <fcntl.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/utsname.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#include <string.h> #include <string.h>
@ -877,7 +876,7 @@ static int u32_parse_opt(struct filter_util *qu, char *handle, int argc, char **
} else if (strcmp(*argv, "sample") == 0) { } else if (strcmp(*argv, "sample") == 0) {
__u32 hash; __u32 hash;
unsigned divisor = 0x100; unsigned divisor = 0x100;
struct utsname utsname;
struct { struct {
struct tc_u32_sel sel; struct tc_u32_sel sel;
struct tc_u32_key keys[4]; struct tc_u32_key keys[4];
@ -902,19 +901,8 @@ static int u32_parse_opt(struct filter_util *qu, char *handle, int argc, char **
NEXT_ARG(); NEXT_ARG();
} }
hash = sel2.sel.keys[0].val&sel2.sel.keys[0].mask; hash = sel2.sel.keys[0].val&sel2.sel.keys[0].mask;
uname(&utsname); hash ^= hash>>16;
if (strncmp(utsname.release, "2.4.", 4) == 0) { hash ^= hash>>8;
hash ^= hash>>16;
hash ^= hash>>8;
}
else {
__u32 mask = sel2.sel.keys[0].mask;
while (mask && !(mask & 1)) {
mask >>= 1;
hash >>= 1;
}
hash &= 0xFF;
}
htid = ((hash%divisor)<<12)|(htid&0xFFF00000); htid = ((hash%divisor)<<12)|(htid&0xFFF00000);
sample_ok = 1; sample_ok = 1;
continue; continue;