aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.4/patches/226-atm_br2684.patch
diff options
context:
space:
mode:
authorAndy Boyett <agb@openwrt.org>2009-05-15 10:36:04 +0000
committerAndy Boyett <agb@openwrt.org>2009-05-15 10:36:04 +0000
commit88e632d853ac18fc82ef245486ed952ef124739c (patch)
tree21c2c051c41c9aa3cc6edb39362386b75b78643b /target/linux/generic-2.4/patches/226-atm_br2684.patch
parent94921686de5f1ded59d5b3bc79812b31bf4fca48 (diff)
downloadupstream-88e632d853ac18fc82ef245486ed952ef124739c.tar.gz
upstream-88e632d853ac18fc82ef245486ed952ef124739c.tar.bz2
upstream-88e632d853ac18fc82ef245486ed952ef124739c.zip
generic-2.4: refresh patches
SVN-Revision: 15860
Diffstat (limited to 'target/linux/generic-2.4/patches/226-atm_br2684.patch')
-rw-r--r--target/linux/generic-2.4/patches/226-atm_br2684.patch18
1 files changed, 6 insertions, 12 deletions
diff --git a/target/linux/generic-2.4/patches/226-atm_br2684.patch b/target/linux/generic-2.4/patches/226-atm_br2684.patch
index 9ec555ed33..bfff13afa6 100644
--- a/target/linux/generic-2.4/patches/226-atm_br2684.patch
+++ b/target/linux/generic-2.4/patches/226-atm_br2684.patch
@@ -1,7 +1,5 @@
-Index: linux-2.4.35.4/net/atm/br2684.c
-===================================================================
---- linux-2.4.35.4.orig/net/atm/br2684.c
-+++ linux-2.4.35.4/net/atm/br2684.c
+--- a/net/atm/br2684.c
++++ b/net/atm/br2684.c
@@ -55,36 +55,55 @@ static void skb_debug(const struct sk_bu
#define skb_debug(skb) do {} while (0)
#endif
@@ -486,10 +484,8 @@ Index: linux-2.4.35.4/net/atm/br2684.c
while (!list_empty(&br2684_devs)) {
brdev = list_entry_brdev(br2684_devs.next);
unregister_netdev(&brdev->net_dev);
-Index: linux-2.4.35.4/net/atm/common.c
-===================================================================
---- linux-2.4.35.4.orig/net/atm/common.c
-+++ linux-2.4.35.4/net/atm/common.c
+--- a/net/atm/common.c
++++ b/net/atm/common.c
@@ -158,6 +158,7 @@ void br2684_ioctl_set(int (*hook)(struct
}
#ifdef CONFIG_ATM_BR2684_MODULE
@@ -498,10 +494,8 @@ Index: linux-2.4.35.4/net/atm/common.c
#endif
#endif
-Index: linux-2.4.35.4/include/linux/atmbr2684.h
-===================================================================
---- linux-2.4.35.4.orig/include/linux/atmbr2684.h
-+++ linux-2.4.35.4/include/linux/atmbr2684.h
+--- a/include/linux/atmbr2684.h
++++ b/include/linux/atmbr2684.h
@@ -3,6 +3,7 @@
#include <linux/atm.h>