aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaciej Zenczykowski <maze@google.com>2014-02-07 16:23:48 -0800
committerStefan Bader <stefan.bader@canonical.com>2014-05-20 16:35:08 +0200
commita6fd7daffa6f195c8a70b299ca4eb3a415c2d241 (patch)
treec6c00dc5010659c82018149444fc5981f8c7a715
parent30e6fad24bfcdfa365d5e6d8e21367bc5a2ba35f (diff)
downloadlinux-2.6.32.y-drm33.z-a6fd7daffa6f195c8a70b299ca4eb3a415c2d241.tar.gz
net: fix 'ip rule' iif/oif device rename
[ Upstream commit 946c032e5a53992ea45e062ecb08670ba39b99e3 ] ip rules with iif/oif references do not update: (detach/attach) across interface renames. Signed-off-by: Maciej Zenczykowski <maze@google.com> CC: Willem de Bruijn <willemb@google.com> CC: Eric Dumazet <edumazet@google.com> CC: Chris Davis <chrismd@google.com> CC: Carlo Contavalli <ccontavalli@google.com> Google-Bug-Id: 12936021 Acked-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Willy Tarreau <w@1wt.eu> Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
-rw-r--r--net/core/fib_rules.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/net/core/fib_rules.c b/net/core/fib_rules.c
index de9eac9f181c9..06bdee7b23036 100644
--- a/net/core/fib_rules.c
+++ b/net/core/fib_rules.c
@@ -633,6 +633,13 @@ static int fib_rules_event(struct notifier_block *this, unsigned long event,
attach_rules(&ops->rules_list, dev);
break;
+ case NETDEV_CHANGENAME:
+ list_for_each_entry(ops, &net->rules_ops, list) {
+ detach_rules(&ops->rules_list, dev);
+ attach_rules(&ops->rules_list, dev);
+ }
+ break;
+
case NETDEV_UNREGISTER:
list_for_each_entry(ops, &net->rules_ops, list)
detach_rules(&ops->rules_list, dev);