diff options
author | Ting Liu <b28495@freescale.com> | 2013-03-05 08:33:32 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-07 11:14:36 +0000 |
commit | 14cd284ce1b65d3ddd2aa2a15e0c1a8543cea27f (patch) | |
tree | 690279d277dae905971005ab06581d13532be0ae /meta/recipes-connectivity/iproute2/iproute2/0004-ipntable-more-fixes-for-ppc64.patch | |
parent | f4a10bbbf5a6e97a547921f0c32d58d659dbe5b3 (diff) | |
download | poky-14cd284ce1b65d3ddd2aa2a15e0c1a8543cea27f.tar.gz |
iproute2: Fix build failure on ppc64
Backport three patches from upstream for ppc64:
http://git.kernel.org/cgit/linux/kernel/git/shemminger/iproute2.git
ae70d96 ipntable: more fixes for ppc64
a55a8fd fix dependency on sizeof(__u64) == sizeof(unsigned long long)
a7c2882 ip: fix ipv6 ntable on ppc64
(From OE-Core rev: 041f784c06403e1d418be677fd15ea159c3bf90d)
Signed-off-by: Ting Liu <b28495@freescale.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/iproute2/iproute2/0004-ipntable-more-fixes-for-ppc64.patch')
-rw-r--r-- | meta/recipes-connectivity/iproute2/iproute2/0004-ipntable-more-fixes-for-ppc64.patch | 68 |
1 files changed, 68 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/iproute2/iproute2/0004-ipntable-more-fixes-for-ppc64.patch b/meta/recipes-connectivity/iproute2/iproute2/0004-ipntable-more-fixes-for-ppc64.patch new file mode 100644 index 0000000000..e841709867 --- /dev/null +++ b/meta/recipes-connectivity/iproute2/iproute2/0004-ipntable-more-fixes-for-ppc64.patch | |||
@@ -0,0 +1,68 @@ | |||
1 | Upstream-Status: Backport | ||
2 | |||
3 | From ae70d9665615ae723a108947aa60b5f65caffab2 Mon Sep 17 00:00:00 2001 | ||
4 | From: Stephen Hemminger <stephen@networkplumber.org> | ||
5 | Date: Mon, 4 Mar 2013 13:59:39 -0800 | ||
6 | Subject: [PATCH] ipntable: more fixes for ppc64 | ||
7 | |||
8 | Not all arch have sizeof(unsigned long long) == sizeof(__u64) | ||
9 | --- | ||
10 | ip/ipntable.c | 30 ++++++++++++++++++++---------- | ||
11 | 1 file changed, 20 insertions(+), 10 deletions(-) | ||
12 | |||
13 | diff --git a/ip/ipntable.c b/ip/ipntable.c | ||
14 | index a1a3c26..67b199e 100644 | ||
15 | --- a/ip/ipntable.c | ||
16 | +++ b/ip/ipntable.c | ||
17 | @@ -560,28 +560,38 @@ int print_ntable(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg) | ||
18 | fprintf(fp, " "); | ||
19 | fprintf(fp, "stats "); | ||
20 | |||
21 | - fprintf(fp, "allocs %llu ", ndts->ndts_allocs); | ||
22 | - fprintf(fp, "destroys %llu ", ndts->ndts_destroys); | ||
23 | - fprintf(fp, "hash_grows %llu ", ndts->ndts_hash_grows); | ||
24 | + fprintf(fp, "allocs %llu ", | ||
25 | + (unsigned long long) ndts->ndts_allocs); | ||
26 | + fprintf(fp, "destroys %llu ", | ||
27 | + (unsigned long long) ndts->ndts_destroys); | ||
28 | + fprintf(fp, "hash_grows %llu ", | ||
29 | + (unsigned long long) ndts->ndts_hash_grows); | ||
30 | |||
31 | fprintf(fp, "%s", _SL_); | ||
32 | fprintf(fp, " "); | ||
33 | |||
34 | - fprintf(fp, "res_failed %llu ", ndts->ndts_res_failed); | ||
35 | - fprintf(fp, "lookups %llu ", ndts->ndts_lookups); | ||
36 | - fprintf(fp, "hits %llu ", ndts->ndts_hits); | ||
37 | + fprintf(fp, "res_failed %llu ", | ||
38 | + (unsigned long long) ndts->ndts_res_failed); | ||
39 | + fprintf(fp, "lookups %llu ", | ||
40 | + (unsigned long long) ndts->ndts_lookups); | ||
41 | + fprintf(fp, "hits %llu ", | ||
42 | + (unsigned long long) ndts->ndts_hits); | ||
43 | |||
44 | fprintf(fp, "%s", _SL_); | ||
45 | fprintf(fp, " "); | ||
46 | |||
47 | - fprintf(fp, "rcv_probes_mcast %llu ", ndts->ndts_rcv_probes_mcast); | ||
48 | - fprintf(fp, "rcv_probes_ucast %llu ", ndts->ndts_rcv_probes_ucast); | ||
49 | + fprintf(fp, "rcv_probes_mcast %llu ", | ||
50 | + (unsigned long long) ndts->ndts_rcv_probes_mcast); | ||
51 | + fprintf(fp, "rcv_probes_ucast %llu ", | ||
52 | + (unsigned long long) ndts->ndts_rcv_probes_ucast); | ||
53 | |||
54 | fprintf(fp, "%s", _SL_); | ||
55 | fprintf(fp, " "); | ||
56 | |||
57 | - fprintf(fp, "periodic_gc_runs %llu ", ndts->ndts_periodic_gc_runs); | ||
58 | - fprintf(fp, "forced_gc_runs %llu ", ndts->ndts_forced_gc_runs); | ||
59 | + fprintf(fp, "periodic_gc_runs %llu ", | ||
60 | + (unsigned long long) ndts->ndts_periodic_gc_runs); | ||
61 | + fprintf(fp, "forced_gc_runs %llu ", | ||
62 | + (unsigned long long) ndts->ndts_forced_gc_runs); | ||
63 | |||
64 | fprintf(fp, "%s", _SL_); | ||
65 | } | ||
66 | -- | ||
67 | 1.7.9.7 | ||
68 | |||