Merge branch 'master' into github-master

Author: giuseppelettieri

LINUX/bsd_glue.h

@@ -190,7 +190,7 @@ struct thread;
 #define	m_nextpkt		next			// chain of mbufs
 #define m_freem(m)		dev_kfree_skb_any(m)	// free a sk_buff
 
-#define GET_MBUF_REFCNT(m)	NM_ATOMIC_READ(&((m)->users))
+#define MBUF_REFCNT(m)			NM_ATOMIC_READ(&((m)->users))
 #define nm_os_get_mbuf(ifp, size)	alloc_skb(size, GFP_ATOMIC)
 /*
  * on tx we force skb->queue_mapping = ring_nr,
@@ -202,10 +202,14 @@ struct thread;
 #define SET_MBUF_DESTRUCTOR(m, f) m->destructor = (void *)&f
 
 /* Magic number for sk_buff.priority field, used to take decisions in
- * generic_ndo_start_xmit() and in linux_generic_rx_handler().
+ * generic_ndo_start_xmit(), linux_generic_rx_handler() and
+ * generic_qdisc_dequeue().
  */
-#define NM_MAGIC_PRIORITY_TX 0xad86d310U
-#define NM_MAGIC_PRIORITY_RX 0xad86d311U
+#define NM_MAGIC_PRIORITY_TX	0xad86d310U
+#define NM_MAGIC_PRIORITY_TXQE	0xad86d311U
+#define NM_MAGIC_PRIORITY_RX	0xad86d30fU
+
+#define MBUF_QUEUED(m)		((m->priority & (~0x1)) == NM_MAGIC_PRIORITY_TX)
 
 /*
  * m_copydata() copies from mbuf to buffer following the mbuf chain.

LINUX/configure

@@ -1079,6 +1079,20 @@ add_test 'have NNITD' <<-EOF
 	}
 EOF
 
+# arguments of qdisc_create_dflt (either 3 or 4)
+add_test 'define QDISC_CREATE_DFLT_3ARGS' <<-EOF
+	#include <net/sch_generic.h>
+
+	struct Qdisc *
+	dummy(struct netdev_queue *dev_queue,
+	      struct Qdisc_ops* ops,
+	      unsigned int parent_id)
+	{
+		return qdisc_create_dflt(dev_queue,
+					 ops, parent_id);
+	}
+EOF
+
 #####################################################
 # checks related to drivers                         #
 #####################################################
@@ -1257,7 +1271,16 @@ add_test 'define VIRTIO_SG' <<-EOF
 	}
 EOF
 
-fi
+add_test 'define VIRTIO_NOTIFY' <<-EOF
+	#include <linux/virtio.h>
+
+	void
+	dummy(struct virtqueue *_vq) {
+		(void)virtqueue_notify(_vq);
+	}
+EOF
+
+fi # virtio-net
 
 if drv enabled i40e; then
 add_test 'define I40E_PTR_ARRAY' <<-EOF