ipv6 addrconf: revert /proc/net/if_inet6 ifa_flag format (rhbz 1056711)

This commit is contained in:
Justin M. Forbes 2014-01-29 08:19:10 -06:00
parent 85c4c59423
commit 3e89e17795
2 changed files with 51 additions and 0 deletions

View File

@ -0,0 +1,45 @@
Bugzilla: 1056711
Upstream-status: Submitted for 3.15
This fixes the issue described here:
https://bugzilla.redhat.com/show_bug.cgi?id=1056711#c5
net-next commit 971a351ccbbd2b6eef136a2221da0b80aca50906
Author: Jiri Pirko <jiri@resnulli.us>
Date: Tue Dec 10 13:56:29 2013 +0100
ipv6 addrconf: revert /proc/net/if_inet6 ifa_flag format
Turned out that applications like ifconfig do not handle the change.
So revert ifa_flag format back to 2-letter hex value.
Introduced by:
commit 479840ffdbe4242e8a25349218c8e0859223aa35
"ipv6 addrconf: extend ifa_flags to u32"
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index be4dbbd..3c3425e 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -3367,12 +3367,12 @@ static void if6_seq_stop(struct seq_file *seq, void *v)
static int if6_seq_show(struct seq_file *seq, void *v)
{
struct inet6_ifaddr *ifp = (struct inet6_ifaddr *)v;
- seq_printf(seq, "%pi6 %02x %02x %02x %03x %8s\n",
+ seq_printf(seq, "%pi6 %02x %02x %02x %02x %8s\n",
&ifp->addr,
ifp->idev->dev->ifindex,
ifp->prefix_len,
ifp->scope,
- ifp->flags,
+ (u8) ifp->flags,
ifp->idev->dev->name);
return 0;
}
_______________________________________________
kernel mailing list
kernel@lists.fedoraproject.org
https://admin.fedoraproject.org/mailman/listinfo/kernel

View File

@ -756,6 +756,7 @@ Patch25182: Input-ALPS-add-support-for-Dolphin-devices.patch
#rhbz 1056711
Patch25183: ipv6-introduce-IFA_F_NOPREFIXROUTE-and-IFA_F_MANAGETEMPADDR-flags.patch
Patch25155: ipv6-addrconf-revert-if_inet6ifa_flag-format.patch
#rhbz 1057533
Patch25184: i915-remove-pm_qos-request-on-error.patch
@ -763,6 +764,7 @@ Patch25184: i915-remove-pm_qos-request-on-error.patch
#rhbz 990955
Patch25185: ath9k_htc-make-sta_rc_update-atomic-for-most-calls.patch
# END OF PATCH DEFINITIONS
%endif
@ -1474,6 +1476,7 @@ ApplyPatch Input-ALPS-add-support-for-Dolphin-devices.patch
#rhbz 1056711
ApplyPatch ipv6-introduce-IFA_F_NOPREFIXROUTE-and-IFA_F_MANAGETEMPADDR-flags.patch
ApplyPatch ipv6-addrconf-revert-if_inet6ifa_flag-format.patch
#rhbz 1057533
ApplyPatch i915-remove-pm_qos-request-on-error.patch
@ -2283,6 +2286,9 @@ fi
# ||----w |
# || ||
%changelog
* Wed Jan 29 2014 Justin M. Forbes <jforbes@fedoraproject.org> - 3.12.9-301
- ipv6 addrconf: revert /proc/net/if_inet6 ifa_flag format (rhbz 1056711)
* Tue Jan 28 2014 Josh Boyer <jwboyer@fedoraproject.org>
- Add patch from Stanislaw Gruszka to fix ath9k BUG (rhbz 990955)