]> rtime.felk.cvut.cz Git - socketcan-devel.git/blobdiff - patches/2.6.21.diff
projects / socketcan-devel.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Updated patch to vanilla 2.6.21.
[socketcan-devel.git] / patches / 2.6.21.diff
diff --git a/patches/2.6.21-rc7.diff b/patches/2.6.21.diff
similarity index 70%
rename from patches/2.6.21-rc7.diff
rename to patches/2.6.21.diff
index e15e464804866bd4a09292e89d6ea46168e71f3b..797a65a0adcd4eb1034e54d0ba6da6eccf34cd47 100644 (file)
--- a/patches/2.6.21-rc7.diff
+++ b/patches/2.6.21.diff
@@ -1,5 +1,5 @@
-diff -ruN linux-2.6.21-rc7/CREDITS linux/CREDITS
---- linux-2.6.21-rc7/CREDITS   2007-04-25 08:17:49.000000000 +0000
+diff -ruN linux-2.6.21/CREDITS linux/CREDITS
+--- linux-2.6.21/CREDITS       2007-04-25 08:17:49.000000000 +0000
 +++ linux/CREDITS      2007-04-25 08:21:39.000000000 +0000
 @@ -1324,6 +1324,14 @@
  S: 5623 HZ Eindhoven
@@ -31,8 +31,8 @@ diff -ruN linux-2.6.21-rc7/CREDITS linux/CREDITS
  N: Jon Tombs
  E: jon@gte.esi.us.es
  W: http://www.esi.us.es/~jon
-diff -ruN linux-2.6.21-rc7/MAINTAINERS linux/MAINTAINERS
---- linux-2.6.21-rc7/MAINTAINERS       2007-04-25 08:17:49.000000000 +0000
+diff -ruN linux-2.6.21/MAINTAINERS linux/MAINTAINERS
+--- linux-2.6.21/MAINTAINERS   2007-04-25 08:17:49.000000000 +0000
 +++ linux/MAINTAINERS  2007-04-25 08:21:39.000000000 +0000
 @@ -871,6 +871,15 @@
  T:    git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git
@@ -50,8 +50,8 @@ diff -ruN linux-2.6.21-rc7/MAINTAINERS linux/MAINTAINERS
  CALGARY x86-64 IOMMU
  P:    Muli Ben-Yehuda
  M:    muli@il.ibm.com
-diff -ruN linux-2.6.21-rc7/drivers/net/Makefile linux/drivers/net/Makefile
---- linux-2.6.21-rc7/drivers/net/Makefile      2007-04-25 08:17:52.000000000 +0000
+diff -ruN linux-2.6.21/drivers/net/Makefile linux/drivers/net/Makefile
+--- linux-2.6.21/drivers/net/Makefile  2007-04-25 08:17:52.000000000 +0000
 +++ linux/drivers/net/Makefile 2007-04-25 08:21:39.000000000 +0000
 @@ -8,6 +8,7 @@
  obj-$(CONFIG_CHELSIO_T1) += chelsio/
@@ -61,8 +61,8 @@ diff -ruN linux-2.6.21-rc7/drivers/net/Makefile linux/drivers/net/Makefile
  obj-$(CONFIG_BONDING) += bonding/
  obj-$(CONFIG_ATL1) += atl1/
  obj-$(CONFIG_GIANFAR) += gianfar_driver.o
-diff -ruN linux-2.6.21-rc7/include/linux/if_arp.h linux/include/linux/if_arp.h
---- linux-2.6.21-rc7/include/linux/if_arp.h    2007-04-13 20:48:14.000000000 +0000
+diff -ruN linux-2.6.21/include/linux/if_arp.h linux/include/linux/if_arp.h
+--- linux-2.6.21/include/linux/if_arp.h        2007-04-13 20:48:14.000000000 +0000
 +++ linux/include/linux/if_arp.h       2007-04-25 08:21:39.000000000 +0000
 @@ -52,6 +52,7 @@
  #define ARPHRD_ROSE   270
@@ -72,8 +72,8 @@ diff -ruN linux-2.6.21-rc7/include/linux/if_arp.h linux/include/linux/if_arp.h
  #define ARPHRD_PPP    512
  #define ARPHRD_CISCO  513             /* Cisco HDLC                   */
  #define ARPHRD_HDLC   ARPHRD_CISCO
-diff -ruN linux-2.6.21-rc7/include/linux/if_ether.h linux/include/linux/if_ether.h
---- linux-2.6.21-rc7/include/linux/if_ether.h  2007-04-13 20:48:14.000000000 +0000
+diff -ruN linux-2.6.21/include/linux/if_ether.h linux/include/linux/if_ether.h
+--- linux-2.6.21/include/linux/if_ether.h      2007-04-13 20:48:14.000000000 +0000
 +++ linux/include/linux/if_ether.h     2007-04-25 08:21:39.000000000 +0000
 @@ -88,6 +88,7 @@
  #define ETH_P_WAN_PPP   0x0007          /* Dummy type for WAN PPP frames*/
@@ -83,8 +83,8 @@ diff -ruN linux-2.6.21-rc7/include/linux/if_ether.h linux/include/linux/if_ether
  #define ETH_P_PPPTALK 0x0010          /* Dummy type for Atalk over PPP*/
  #define ETH_P_TR_802_2        0x0011          /* 802.2 frames                 */
  #define ETH_P_MOBITEX 0x0015          /* Mobitex (kaz@cafe.net)       */
-diff -ruN linux-2.6.21-rc7/include/linux/socket.h linux/include/linux/socket.h
---- linux-2.6.21-rc7/include/linux/socket.h    2007-04-25 08:17:54.000000000 +0000
+diff -ruN linux-2.6.21/include/linux/socket.h linux/include/linux/socket.h
+--- linux-2.6.21/include/linux/socket.h        2007-04-25 08:17:54.000000000 +0000
 +++ linux/include/linux/socket.h       2007-04-25 08:21:39.000000000 +0000
 @@ -185,6 +185,7 @@
  #define AF_PPPOX      24      /* PPPoX sockets                */
@@ -102,8 +102,8 @@ diff -ruN linux-2.6.21-rc7/include/linux/socket.h linux/include/linux/socket.h
  #define PF_TIPC               AF_TIPC
  #define PF_BLUETOOTH  AF_BLUETOOTH
  #define PF_IUCV               AF_IUCV
-diff -ruN linux-2.6.21-rc7/include/linux/tty.h linux/include/linux/tty.h
---- linux-2.6.21-rc7/include/linux/tty.h       2007-04-25 08:17:54.000000000 +0000
+diff -ruN linux-2.6.21/include/linux/tty.h linux/include/linux/tty.h
+--- linux-2.6.21/include/linux/tty.h   2007-04-25 08:17:54.000000000 +0000
 +++ linux/include/linux/tty.h  2007-04-25 08:21:39.000000000 +0000
 @@ -24,7 +24,7 @@
  #define NR_PTYS       CONFIG_LEGACY_PTY_COUNT   /* Number of legacy ptys */
@@ -122,8 +122,8 @@ diff -ruN linux-2.6.21-rc7/include/linux/tty.h linux/include/linux/tty.h
  
  /*
   * This character is the same as _POSIX_VDISABLE: it cannot be used as
-diff -ruN linux-2.6.21-rc7/net/Kconfig linux/net/Kconfig
---- linux-2.6.21-rc7/net/Kconfig       2007-04-25 08:17:54.000000000 +0000
+diff -ruN linux-2.6.21/net/Kconfig linux/net/Kconfig
+--- linux-2.6.21/net/Kconfig   2007-04-25 08:17:54.000000000 +0000
 +++ linux/net/Kconfig  2007-04-25 08:21:39.000000000 +0000
 @@ -217,6 +217,7 @@
  endmenu
@@ -133,8 +133,8 @@ diff -ruN linux-2.6.21-rc7/net/Kconfig linux/net/Kconfig
  source "net/irda/Kconfig"
  source "net/bluetooth/Kconfig"
  source "net/ieee80211/Kconfig"
-diff -ruN linux-2.6.21-rc7/net/Makefile linux/net/Makefile
---- linux-2.6.21-rc7/net/Makefile      2007-04-25 08:17:54.000000000 +0000
+diff -ruN linux-2.6.21/net/Makefile linux/net/Makefile
+--- linux-2.6.21/net/Makefile  2007-04-25 08:17:54.000000000 +0000
 +++ linux/net/Makefile 2007-04-25 08:21:39.000000000 +0000
 @@ -34,6 +34,7 @@
  obj-$(CONFIG_NETROM)          += netrom/
@@ -144,17 +144,3 @@ diff -ruN linux-2.6.21-rc7/net/Makefile linux/net/Makefile
  obj-$(CONFIG_IRDA)            += irda/
  obj-$(CONFIG_BT)              += bluetooth/
  obj-$(CONFIG_SUNRPC)          += sunrpc/
-diff -ruN linux-2.6.21-rc7/net/ipv6/addrconf.c linux/net/ipv6/addrconf.c
---- linux-2.6.21-rc7/net/ipv6/addrconf.c       2007-04-25 08:17:54.000000000 +0000
-+++ linux/net/ipv6/addrconf.c  2007-04-25 08:21:39.000000000 +0000
-@@ -2177,6 +2177,10 @@
-       struct inet6_dev *idev = __in6_dev_get(dev);
-       int run_pending = 0;
- 
-+      /* more non ipv6 compatible dev types to skip here? */
-+      if (dev->type == ARPHRD_CAN)
-+              return NOTIFY_OK;
-+
-       switch(event) {
-       case NETDEV_REGISTER:
-               if (!idev) {
SocketCAN local development/experiments