diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-11-23 15:20:48 -0500 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-11-23 15:20:48 -0500 |
| commit | 4b076544218227e9fa0a09a2adbb4bdab85a1089 (patch) | |
| tree | 677c58dfbabcd1487bc93041a642523f0b7ed6a9 | |
| parent | c1c3b7975246aa396b0a4879af6c935337a0e50f (diff) | |
| download | longterm-queue-2.6.34-4b076544218227e9fa0a09a2adbb4bdab85a1089.tar.gz | |
add rtnetlink fix
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/rtnetlink-Add-missing-manual-netlink-notification-in.patch | 41 | ||||
| -rw-r--r-- | queue/series | 3 |
2 files changed, 44 insertions, 0 deletions
diff --git a/queue/rtnetlink-Add-missing-manual-netlink-notification-in.patch b/queue/rtnetlink-Add-missing-manual-netlink-notification-in.patch new file mode 100644 index 0000000..b7b27f8 --- /dev/null +++ b/queue/rtnetlink-Add-missing-manual-netlink-notification-in.patch @@ -0,0 +1,41 @@ +From 3f6de0b6c0e7949b4cd683fd9a2fed369308fc60 Mon Sep 17 00:00:00 2001 +From: "Eric W. Biederman" <ebiederm@xmission.com> +Date: Fri, 21 Oct 2011 06:24:20 +0000 +Subject: [PATCH] rtnetlink: Add missing manual netlink notification in + dev_change_net_namespaces + +commit d2237d35748e7f448a9c2d9dc6a85ef637466e24 upstream. + +Renato Westphal noticed that since commit a2835763e130c343ace5320c20d33c281e7097b7 +"rtnetlink: handle rtnl_link netlink notifications manually" was merged +we no longer send a netlink message when a networking device is moved +from one network namespace to another. + +Fix this by adding the missing manual notification in dev_change_net_namespaces. + +Since all network devices that are processed by dev_change_net_namspaces are +in the initialized state the complicated tests that guard the manual +rtmsg_ifinfo calls in rollback_registered and register_netdevice are +unnecessary and we can just perform a plain notification. + +Cc: stable@kernel.org +Tested-by: Renato Westphal <renatowestphal@gmail.com> +Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> +Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> + +diff --git a/net/core/dev.c b/net/core/dev.c +index 1bde8b7..bcd5f6e 100644 +--- a/net/core/dev.c ++++ b/net/core/dev.c +@@ -5693,6 +5693,7 @@ int dev_change_net_namespace(struct net_device *dev, struct net *net, const char + */ + call_netdevice_notifiers(NETDEV_UNREGISTER, dev); + call_netdevice_notifiers(NETDEV_UNREGISTER_BATCH, dev); ++ rtmsg_ifinfo(RTM_DELLINK, dev, ~0U); + + /* + * Flush the unicast and multicast chains +-- +1.7.7 + diff --git a/queue/series b/queue/series index a7e165d..b33f3af 100644 --- a/queue/series +++ b/queue/series @@ -209,6 +209,9 @@ inet_diag-fix-inet_diag_bc_audit.patch # Content taken from v2.6.32.44 gro-Only-reset-frag0-when-skb-can-be-pulled.patch +# Content taken from v3.0.9 +rtnetlink-Add-missing-manual-netlink-notification-in.patch + # others fs-partitions-efi.c-corrupted-GUID-partition-tables-.patch Bluetooth-Prevent-buffer-overflow-in-l2cap-config-re.patch |