projects / openwrt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
merge netfilter kernel changes to 2.6.26 as well
[openwrt.git] / target / linux / generic-2.6 / patches-2.6.24 / 601-br2684-routed-support.patch
diff --git a/target/linux/generic-2.6/patches-2.6.24/601-br2684-routed-support.patch b/target/linux/generic-2.6/patches-2.6.24/601-br2684-routed-support.patch
index e53671a..3bc2e26 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.24/601-br2684-routed-support.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/601-br2684-routed-support.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.24.7/include/linux/atmbr2684.h
-===================================================================
---- linux-2.6.24.7.orig/include/linux/atmbr2684.h
-+++ linux-2.6.24.7/include/linux/atmbr2684.h
+--- a/include/linux/atmbr2684.h
++++ b/include/linux/atmbr2684.h
 @@ -14,6 +14,9 @@
  #define BR2684_MEDIA_FDDI     (3)
  #define BR2684_MEDIA_802_6    (4)     /* 802.6 */
 @@ -14,6 +14,9 @@
  #define BR2684_MEDIA_FDDI     (3)
  #define BR2684_MEDIA_802_6    (4)     /* 802.6 */
@@ -104,10 +102,8 @@ Index: linux-2.6.24.7/include/linux/atmbr2684.h
  
  #endif /* _LINUX_ATMBR2684_H */
 +
  
  #endif /* _LINUX_ATMBR2684_H */
 +
-Index: linux-2.6.24.7/net/atm/br2684.c
-===================================================================
---- linux-2.6.24.7.orig/net/atm/br2684.c
-+++ linux-2.6.24.7/net/atm/br2684.c
+--- a/net/atm/br2684.c
++++ b/net/atm/br2684.c
 @@ -1,8 +1,10 @@
  /*
 -Experimental ethernet netdevice using ATM AAL5 as underlying carrier
 @@ -1,8 +1,10 @@
  /*
 -Experimental ethernet netdevice using ATM AAL5 as underlying carrier
Personal OpenWRT clone
This page took 0.02539 seconds and 4 git commands to generate.