changeset 29:1b7399e39afd

rathaxes: fix bad include name
author Thomas Sanchez <thomas.sanchz@gmail.com>
date Sat, 07 Jan 2012 20:53:40 +0100
parents ed3247946305
children b4ca25b88690
files rathaxes_start_to_implement_sk_buff_in_the_lkm.patch
diffstat 1 files changed, 22 insertions(+), 22 deletions(-) [+]
line wrap: on
line diff
--- a/rathaxes_start_to_implement_sk_buff_in_the_lkm.patch	Sat Jan 07 20:56:06 2012 +0100
+++ b/rathaxes_start_to_implement_sk_buff_in_the_lkm.patch	Sat Jan 07 20:53:40 2012 +0100
@@ -1,10 +1,10 @@
 # HG changeset patch
-# Parent 606e807b8bc7a3a7ea6f1b895bfe909cd7875c2e
+# Parent 86594bdb2ed616f9cbbafe8d78bccc676f832f49
 rathaxes: add sk_buff abstraction and add the implementation of the xmit function for the ethernet system. We have a fully (empty) functionnal ethernet driver
 
-diff -r 606e807b8bc7 rathaxes/samples/lkm/CMakeLists.txt
---- a/rathaxes/samples/lkm/CMakeLists.txt	Sat Jan 07 20:02:55 2012 +0100
-+++ b/rathaxes/samples/lkm/CMakeLists.txt	Sat Jan 07 20:48:23 2012 +0100
+diff -r 86594bdb2ed6 rathaxes/samples/lkm/CMakeLists.txt
+--- a/rathaxes/samples/lkm/CMakeLists.txt	Sat Jan 07 20:51:10 2012 +0100
++++ b/rathaxes/samples/lkm/CMakeLists.txt	Sat Jan 07 20:51:27 2012 +0100
 @@ -1,6 +1,6 @@
  ADD_RATHAXES_SOURCES(lkm lkm.rtx
 -                     RTI log.rti lkm.rti pci.rti ethernet.rti
@@ -14,9 +14,9 @@
  
  # We can't name lkm since it's already used as the target name to generate the
  # source (with ADD_RATHAXES_SOURCES).
-diff -r 606e807b8bc7 rathaxes/samples/lkm/e1000.blt
+diff -r 86594bdb2ed6 rathaxes/samples/lkm/e1000.blt
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/rathaxes/samples/lkm/e1000.blt	Sat Jan 07 20:48:23 2012 +0100
++++ b/rathaxes/samples/lkm/e1000.blt	Sat Jan 07 20:51:27 2012 +0100
 @@ -0,0 +1,72 @@
 +with e1000, Ethernet, Socket, PCI, LKM, Log
 +{
@@ -90,9 +90,9 @@
 +        }
 +    }
 +}
-diff -r 606e807b8bc7 rathaxes/samples/lkm/e1000.rti
+diff -r 86594bdb2ed6 rathaxes/samples/lkm/e1000.rti
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/rathaxes/samples/lkm/e1000.rti	Sat Jan 07 20:48:23 2012 +0100
++++ b/rathaxes/samples/lkm/e1000.rti	Sat Jan 07 20:51:27 2012 +0100
 @@ -0,0 +1,15 @@
 +interface e1000 : Socket, Ethernet, PCI, LKM
 +{
@@ -109,9 +109,9 @@
 +        provided chunk  ::CALL;
 +    }
 +}
-diff -r 606e807b8bc7 rathaxes/samples/lkm/ethernet.blt
---- a/rathaxes/samples/lkm/ethernet.blt	Sat Jan 07 20:02:55 2012 +0100
-+++ b/rathaxes/samples/lkm/ethernet.blt	Sat Jan 07 20:48:23 2012 +0100
+diff -r 86594bdb2ed6 rathaxes/samples/lkm/ethernet.blt
+--- a/rathaxes/samples/lkm/ethernet.blt	Sat Jan 07 20:51:10 2012 +0100
++++ b/rathaxes/samples/lkm/ethernet.blt	Sat Jan 07 20:51:27 2012 +0100
 @@ -18,8 +18,11 @@
                   * I think it's useless to use the ${PCI::Device} "abstraction"
                   * here, since we are already in a Linux specific context here.
@@ -170,9 +170,9 @@
              unregister_netdev(net_dev);
              /*
               * If we had some cleanup todo with struct rtx_ether_ctx we would
-diff -r 606e807b8bc7 rathaxes/samples/lkm/ethernet.rti
---- a/rathaxes/samples/lkm/ethernet.rti	Sat Jan 07 20:02:55 2012 +0100
-+++ b/rathaxes/samples/lkm/ethernet.rti	Sat Jan 07 20:48:23 2012 +0100
+diff -r 86594bdb2ed6 rathaxes/samples/lkm/ethernet.rti
+--- a/rathaxes/samples/lkm/ethernet.rti	Sat Jan 07 20:51:10 2012 +0100
++++ b/rathaxes/samples/lkm/ethernet.rti	Sat Jan 07 20:51:27 2012 +0100
 @@ -1,4 +1,4 @@
 -interface Ethernet : PCI, LKM
 +interface Ethernet : Socket, PCI, LKM
@@ -192,9 +192,9 @@
      required sequence   Ethernet::close(Ethernet::Device)
      {
          provided chunk  LKM::prototypes;
-diff -r 606e807b8bc7 rathaxes/samples/lkm/lkm.rtx
---- a/rathaxes/samples/lkm/lkm.rtx	Sat Jan 07 20:02:55 2012 +0100
-+++ b/rathaxes/samples/lkm/lkm.rtx	Sat Jan 07 20:48:23 2012 +0100
+diff -r 86594bdb2ed6 rathaxes/samples/lkm/lkm.rtx
+--- a/rathaxes/samples/lkm/lkm.rtx	Sat Jan 07 20:51:10 2012 +0100
++++ b/rathaxes/samples/lkm/lkm.rtx	Sat Jan 07 20:51:27 2012 +0100
 @@ -15,15 +15,22 @@
          Log::info("Got an interruption");
      }
@@ -231,9 +231,9 @@
  
      Ethernet::ifname = "rtx%d";
  }
-diff -r 606e807b8bc7 rathaxes/samples/lkm/socket.blt
+diff -r 86594bdb2ed6 rathaxes/samples/lkm/socket.blt
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/rathaxes/samples/lkm/socket.blt	Sat Jan 07 20:48:23 2012 +0100
++++ b/rathaxes/samples/lkm/socket.blt	Sat Jan 07 20:51:27 2012 +0100
 @@ -0,0 +1,27 @@
 +with Socket, LKM
 +{
@@ -241,7 +241,7 @@
 +    {
 +        chunk LKM::includes()
 +        {
-+            #include <linux/sk_buff.h>
++            #include <linux/skbuff.h>
 +        }
 +
 +        chunk ::decl()
@@ -262,9 +262,9 @@
 +        }
 +    }
 +}
-diff -r 606e807b8bc7 rathaxes/samples/lkm/socket.rti
+diff -r 86594bdb2ed6 rathaxes/samples/lkm/socket.rti
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/rathaxes/samples/lkm/socket.rti	Sat Jan 07 20:48:23 2012 +0100
++++ b/rathaxes/samples/lkm/socket.rti	Sat Jan 07 20:51:27 2012 +0100
 @@ -0,0 +1,4 @@
 +interface Socket : LKM
 +{