Reset to the original

[linux-2.6.git] / linux-2.6-594-new_ns_pid.patch

diff --git a/linux-2.6-594-new_ns_pid.patch b/linux-2.6-594-new_ns_pid.patch
index f986980..9d69f2a 100644 (file)
--- a/linux-2.6-594-new_ns_pid.patch
+++ b/linux-2.6-594-new_ns_pid.patch
@@ -1,23 +1,24 @@
-diff -Nurb linux-2.6.22-592/net/core/net-sysfs.c linux-2.6.22-594/net/core/net-sysfs.c
---- linux-2.6.22-592/net/core/net-sysfs.c      2008-02-29 08:45:15.000000000 -0500
-+++ linux-2.6.22-594/net/core/net-sysfs.c      2008-02-29 08:55:47.000000000 -0500
-@@ -190,6 +190,40 @@
+diff -Nurb linux-2.6.22-593/net/core/net-sysfs.c linux-2.6.22-594/net/core/net-sysfs.c
+--- linux-2.6.22-593/net/core/net-sysfs.c      2008-02-29 09:01:43.000000000 -0500
++++ linux-2.6.22-594/net/core/net-sysfs.c      2008-02-29 09:20:20.000000000 -0500
+@@ -190,6 +190,41 @@
        return netdev_store(device, attr, buf, len, change_mtu);
  }
  
-+static ssize_t show_new_ns_pid(struct class_device *cd, char *buf)
++static ssize_t show_new_ns_pid(struct device *cd, struct device_attribute *attr, char *buf)
 +{
 +      return -EPERM;
 +}
++
 +static int change_new_ns_pid(struct net_device *dev, unsigned long new_ns_pid)
 +{
 +      struct task_struct *tsk;
 +      int err;
-+      struct net *net;
++      struct net *net=NULL;
 +      /* Look up the network namespace */
 +      err = -ESRCH;
 +      rcu_read_lock();
-+      tsk = find_task_by_real_pid(new_ns_pid);
++      tsk = find_task_by_pid(new_ns_pid);
 +      if (tsk) {
 +              task_lock(tsk);
 +              if (tsk->nsproxy) {
@@ -34,15 +35,15 @@ diff -Nurb linux-2.6.22-592/net/core/net-sysfs.c linux-2.6.22-594/net/core/net-s
 +      }
 +      return err;
 +}
-+static ssize_t store_new_ns_pid(struct class_device *cd, const char *buf, size_t len)
++static ssize_t store_new_ns_pid(struct device *cd, struct device_attribute *attr, const char *buf, size_t len)
 +{
-+      return netdev_store(cd, buf, len, change_new_ns_pid);
++      return netdev_store(cd, attr, buf, len, change_new_ns_pid);
 +}
 +
  NETDEVICE_SHOW(flags, fmt_hex);
  
  static int change_flags(struct net_device *dev, unsigned long new_flags)
-@@ -249,6 +283,7 @@
+@@ -249,6 +284,7 @@
        __ATTR(tx_queue_len, S_IRUGO | S_IWUSR, show_tx_queue_len,
               store_tx_queue_len),
        __ATTR(weight, S_IRUGO | S_IWUSR, show_weight, store_weight),