Merge branch 'upstream-merged'

1 files changed, 40 insertions, 0 deletions

diff --git a/libdde-linux26/libdde_linux26/include/dde26_net.h b/libdde-linux26/libdde_linux26/include/dde26_net.h
new file mode 100644
index 00000000..204f37dd
--- /dev/null
+++ b/libdde-linux26/libdde_linux26/include/dde26_net.h
@@ -0,0 +1,40 @@
+#ifndef __DDE_26_NET_H
+#define __DDE_26_NET_H
+
+#include <linux/skbuff.h>
+#include <linux/netdevice.h>
+
+/** rx callback function */
+typedef int (*linux_rx_callback)(char *, int, struct net_device *);
+
+extern linux_rx_callback l4dde26_rx_callback;
+
+/** Register rx callback function.
+ *
+ * This registers a function to be a rx callback. Whenever an ethernet packet
+ * arrives and is processed by a driver or a softirq, it will end up in either
+ * netif_rx() or netif_receive_skb(). Both will finally try to hand this to
+ * a DDE user using a previously registered callback.
+ *
+ * \param cb   new callback function
+ * \return     old callback function pointer
+ */
+linux_rx_callback l4dde26_register_rx_callback(linux_rx_callback cb);
+
+
+/** Run callback function.
+ */
+static inline int l4dde26_do_rx_callback(struct sk_buff *s)
+{
+	if (l4dde26_rx_callback != NULL) {
+		int ret;
+		skb_push(s, s->dev->hard_header_len);
+		ret = l4dde26_rx_callback(s->data, s->len, s->dev);
+		dev_kfree_skb_any(s);
+		return ret;
+	}
+
+	return 0;
+}
+
+#endif