PERFORCE change 196400 for review

[Takuya ASADA]

http://p4web.freebsd.org/@@196400?ac=10

Change 196400 by syuu at kikurage on 2011/07/19 12:48:48

	unified variable name from rxq/txq to rxqueue/txqueue.

Affected files ...

.. //depot/projects/soc2011/mq_bpf/src/sys/dev/e1000/if_igb.c#12 edit
.. //depot/projects/soc2011/mq_bpf/src/sys/net/bpf.c#15 edit
.. //depot/projects/soc2011/mq_bpf/src/sys/net/if_ethersubr.c#8 edit
.. //depot/projects/soc2011/mq_bpf/src/sys/netinet/in_rss.c#5 edit
.. //depot/projects/soc2011/mq_bpf/src/sys/sys/mbuf.h#4 edit

Differences ...

==== //depot/projects/soc2011/mq_bpf/src/sys/dev/e1000/if_igb.c#12 (text+ko) ====

@@ -853,8 +853,8 @@
 			break;
 		}
 
-		m_head->m_pkthdr.rxqid = (uint32_t)-1;
-		m_head->m_pkthdr.txqid = txr->me;
+		m_head->m_pkthdr.rxqueue = (uint32_t)-1;
+		m_head->m_pkthdr.txqueue = txr->me;
 
 		/* Send a copy of the frame to the BPF listener */
 		ETHER_BPF_MTAP(ifp, m_head);
@@ -951,8 +951,8 @@
 		enq++;
 		drbr_stats_update(ifp, next->m_pkthdr.len, next->m_flags);
 
-		next->m_pkthdr.rxqid = (uint32_t)-1;
-		next->m_pkthdr.txqid = txr->me;
+		next->m_pkthdr.rxqueue = (uint32_t)-1;
+		next->m_pkthdr.txqueue = txr->me;
 
 		ETHER_BPF_MTAP(ifp, next);
 		if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0)
@@ -4524,8 +4524,8 @@
 				M_HASHTYPE_SET(rxr->fmp, M_HASHTYPE_NONE);
 			}
 #endif
-			rxr->fmp->m_pkthdr.rxqid = que->msix;
-			rxr->fmp->m_pkthdr.txqid = (uint32_t)-1;
+			rxr->fmp->m_pkthdr.rxqueue = que->msix;
+			rxr->fmp->m_pkthdr.txqueue = (uint32_t)-1;
 
 			sendmp = rxr->fmp;
 			/* Make sure to set M_PKTHDR. */

==== //depot/projects/soc2011/mq_bpf/src/sys/net/bpf.c#15 (text+ko) ====

@@ -2144,22 +2144,22 @@
 					continue;
 			} else {
 				log(LOG_DEBUG, "%s: ifp->if_get_rxqueue_len:%p\n", __func__, ifp->if_get_rxqueue_len);
-				if (m->m_pkthdr.rxqid != (uint32_t)-1 && m->m_pkthdr.rxqid >= ifp->if_get_rxqueue_len(ifp)) {
-					log(LOG_DEBUG, "rxqid is not vaild rxqid:%x rxq_num:%x\n", m->m_pkthdr.rxqid, ifp->if_get_rxqueue_len(ifp));
+				if (m->m_pkthdr.rxqueue != (uint32_t)-1 && m->m_pkthdr.rxqueue >= ifp->if_get_rxqueue_len(ifp)) {
+					log(LOG_DEBUG, "rxqueue is not vaild rxqueue:%x rxq_num:%x\n", m->m_pkthdr.rxqueue, ifp->if_get_rxqueue_len(ifp));
 					BPFIF_RUNLOCK(bp, &tracker);
 					return;
 				}
 				log(LOG_DEBUG, "%s: ifp->if_get_txqueue_len:%p\n", __func__, ifp->if_get_txqueue_len);
-				if (m->m_pkthdr.txqid != (uint32_t)-1 && m->m_pkthdr.txqid >= ifp->if_get_txqueue_len(ifp)) {
-					log(LOG_DEBUG, "txqid is not vaild txqid:%x txq_num:%x\n", m->m_pkthdr.txqid, ifp->if_get_txqueue_len(ifp));
+				if (m->m_pkthdr.txqueue != (uint32_t)-1 && m->m_pkthdr.txqueue >= ifp->if_get_txqueue_len(ifp)) {
+					log(LOG_DEBUG, "txqueue is not vaild txqueue:%x txq_num:%x\n", m->m_pkthdr.txqueue, ifp->if_get_txqueue_len(ifp));
 					BPFIF_RUNLOCK(bp, &tracker);
 					return;
 				}
-				if (m->m_pkthdr.rxqid != (uint32_t)-1 &&
-					!d->bd_qmask.qm_rxq_mask[m->m_pkthdr.rxqid])
+				if (m->m_pkthdr.rxqueue != (uint32_t)-1 &&
+					!d->bd_qmask.qm_rxq_mask[m->m_pkthdr.rxqueue])
 					continue;
-				if (m->m_pkthdr.txqid != (uint32_t)-1 &&
-					!d->bd_qmask.qm_txq_mask[m->m_pkthdr.txqid])
+				if (m->m_pkthdr.txqueue != (uint32_t)-1 &&
+					!d->bd_qmask.qm_txq_mask[m->m_pkthdr.txqueue])
 					continue;
 			}
 		}
@@ -2225,11 +2225,11 @@
 	BPFIF_RLOCK(bp, &tracker);
 	LIST_FOREACH(d, &bp->bif_dlist, bd_next) {
 		if (d->bd_qmask.qm_enabled) {
-			if (m->m_pkthdr.rxqid != (uint32_t)-1 &&
-				!d->bd_qmask.qm_rxq_mask[m->m_pkthdr.rxqid])
+			if (m->m_pkthdr.rxqueue != (uint32_t)-1 &&
+				!d->bd_qmask.qm_rxq_mask[m->m_pkthdr.rxqueue])
 				continue;
-			if (m->m_pkthdr.txqid != (uint32_t)-1 &&
-				!d->bd_qmask.qm_txq_mask[m->m_pkthdr.txqid])
+			if (m->m_pkthdr.txqueue != (uint32_t)-1 &&
+				!d->bd_qmask.qm_txq_mask[m->m_pkthdr.txqueue])
 				continue;
 		}
 		if (BPF_CHECK_DIRECTION(d, m->m_pkthdr.rcvif, bp->bif_ifp))

==== //depot/projects/soc2011/mq_bpf/src/sys/net/if_ethersubr.c#8 (text+ko) ====

@@ -454,9 +454,9 @@
 
 #ifdef SOFTRSS
 	if (ifp->if_capenable & IFCAP_SOFT_MULTIQUEUE) {
-		log(LOG_DEBUG, "%s SOFTRSS setting txqid:0\n", __func__);
-		m->m_pkthdr.rxqid = (uint32_t)-1;
-		m->m_pkthdr.txqid = 0;
+		log(LOG_DEBUG, "%s SOFTRSS setting txqueue:0\n", __func__);
+		m->m_pkthdr.rxqueue = (uint32_t)-1;
+		m->m_pkthdr.txqueue = 0;
 	}
 #endif
 

==== //depot/projects/soc2011/mq_bpf/src/sys/netinet/in_rss.c#5 (text+ko) ====

@@ -431,16 +431,16 @@
 	case M_HASHTYPE_RSS_TCP_IPV4:
 		*cpuid = rss_getcpu(rss_getbucket(m->m_pkthdr.flowid));
 #ifdef SOFTRSS
-		m->m_pkthdr.rxqid = *cpuid;
-		m->m_pkthdr.txqid = (uint32_t)-1;
+		m->m_pkthdr.rxqueue = *cpuid;
+		m->m_pkthdr.txqueue = (uint32_t)-1;
 #endif
 		return (m);
 
 	default:
 		*cpuid = NETISR_CPUID_NONE;
 #ifdef SOFTRSS
-		m->m_pkthdr.rxqid = curcpu;
-		m->m_pkthdr.txqid = (uint32_t)-1;
+		m->m_pkthdr.rxqueue = curcpu;
+		m->m_pkthdr.txqueue = (uint32_t)-1;
 #endif
 		return (m);
 	}

==== //depot/projects/soc2011/mq_bpf/src/sys/sys/mbuf.h#4 (text+ko) ====

@@ -118,8 +118,8 @@
 	uint32_t	 flowid;	/* packet's 4-tuple system 
 					 * flow identifier
 					 */
-	uint32_t	rxqid;
-	uint32_t	txqid;
+	uint32_t	rxqueue;
+	uint32_t	txqueue;
 	/* variables for hardware checksum */
 	int		 csum_flags;	/* flags regarding checksum */
 	int		 csum_data;	/* data field used by csum routines */